Changeset 846 for trunk/mkspecs/common/g++.conf

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• mkspecs/common/g++.conf (modified) (3 diffs)

trunk/mkspecs/common/g++.conf

@@ -9 +9 @@
 QMAKE_CFLAGS_WARN_OFF   += -w
 QMAKE_CFLAGS_RELEASE    += -O2
+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g
 QMAKE_CFLAGS_DEBUG      += -g
 QMAKE_CFLAGS_SHLIB      += -fPIC
@@ -23 +24 @@
 QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
 QMAKE_CXXFLAGS_RELEASE  += $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
 QMAKE_CXXFLAGS_DEBUG    += $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_SHLIB    += $$QMAKE_CFLAGS_SHLIB
@@ -44 +46 @@
 QMAKE_LFLAGS_THREAD     +=
 QMAKE_LFLAGS_NOUNDEF    += -Wl,--no-undefined
-QMAKE_RPATH             = -Wl,-rpath,
+QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
 
 QMAKE_PCH_OUTPUT_EXT    = .gch