29 lines
795 B
Diff
29 lines
795 B
Diff
|
--- qtbase/configure 2012/05/24 14:10:06 1.1
|
||
|
|
+++ qtbase/configure 2012/05/24 14:11:09
|
||
|
|
@@ -65,7 +65,6 @@
|
||
|
|
|
||
|
|
# initialize global variables
|
||
|
|
QMAKE_SWITCHES=
|
||
|
|
-QMAKE_VARS=
|
||
|
|
QMAKE_CONFIG=
|
||
|
|
QTCONFIG_CONFIG=
|
||
|
|
QT_CONFIG=
|
||
|
|
@@ -1199,7 +1198,7 @@
|
||
|
|
QMakeVar add QMAKE_CFLAGS -pg
|
||
|
|
QMakeVar add QMAKE_CXXFLAGS -pg
|
||
|
|
QMakeVar add QMAKE_LFLAGS -pg
|
||
|
|
- QMAKE_VARS="$QMAKE_VARS CONFIG+=nostrip"
|
||
|
|
+ QMakeVar add CONFIG nostrip
|
||
|
|
else
|
||
|
|
UNKNOWN_OPT=yes
|
||
|
|
fi
|
||
|
|
@@ -2426,6 +2425,8 @@
|
||
|
|
esac
|
||
|
|
fi
|
||
|
|
|
||
|
|
+QMakeVar add CONFIG nostrip
|
||
|
|
+
|
||
|
|
#-------------------------------------------------------------------------------
|
||
|
|
# tests that don't need qmake (must be run before displaying help)
|
||
|
|
#-------------------------------------------------------------------------------
|