Compile .cpp files with CXXFLAGS the same as CFLAGS used for compiling .c files.

svn path=/trunk/; revision=40781

diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro
index ab4fba0e4c3515187d820a5e8bf7626f7f1d1646..737d1dafc32123a098eb0080ed2ca02cdf6c3c6b 100644 (file)
--- a/ui/qt/QtShark.pro
+++ b/ui/qt/QtShark.pro
@@ -30,6 +30,11 @@ message(  $$QMAKE_CFLAGS)
 message(  $$QMAKE_CFLAGS_RELEASE)
 message(  $$QMAKE_CFLAGS_DEBUG)
 message( )
+message(CXXFLAGS:)
+message(  $$QMAKE_CXXFLAGS)
+message(  $$QMAKE_CXXFLAGS_RELEASE)
+message(  $$QMAKE_CXXFLAGS_DEBUG)
+message( )
 message(LFLAGS:)
 message(  $$QMAKE_LFLAGS)
 message(  $$QMAKE_LFLAGS_RELEASE)
@@ -67,8 +72,9 @@ win32 {
     # Use only Wireshark CFLAGS and LDFLAGS from config.nmake (as provided via config.pri)
     #  for building the "release" version of Wireshark-Qt
     # (e.g., so we don't get the Qt release CFLAGS [specifically /O2]
-    QMAKE_CFLAGS_RELEASE = ""
-    QMAKE_LFLAGS_RELEASE = ""
+    QMAKE_CFLAGS_RELEASE   = ""
+    QMAKE_CXXFLAGS_RELEASE = ""
+    QMAKE_LFLAGS_RELEASE   = ""
 
     # XXX We need to figure out how to pull this in from config.nmake.
     !include( config.pri ) {
@@ -88,6 +94,11 @@ message(  $$QMAKE_CFLAGS)
 message(  $$QMAKE_CFLAGS_RELEASE)
 message(  $$QMAKE_CFLAGS_DEBUG)
 message( )
+message(CXXFLAGS:)
+message(  $$QMAKE_CXXFLAGS)
+message(  $$QMAKE_CXXFLAGS_RELEASE)
+message(  $$QMAKE_CXXFLAGS_DEBUG)
+message( )
 message(LFLAGS:)
 message(  $$QMAKE_LFLAGS)
 message(  $$QMAKE_LFLAGS_RELEASE)