diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/configure')
| -rwxr-xr-x | experimental/tqtinterface/qt4/configure | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/experimental/tqtinterface/qt4/configure b/experimental/tqtinterface/qt4/configure index 5db81e632..3d7e39f0d 100755 --- a/experimental/tqtinterface/qt4/configure +++ b/experimental/tqtinterface/qt4/configure @@ -431,7 +431,7 @@ while [ "$#" -gt 0 ]; do profile) if [ "$VAL" = "yes" ]; then CFG_PROFILE=yes - QMAKE_VARS="$QMAKE_VARS QMAKE_CFLAGS+=-pg TQMAKE_CXXFLAGS+=-pg" + QMAKE_VARS="$QMAKE_VARS TQMAKE_CFLAGS+=-pg TQMAKE_CXXFLAGS+=-pg" QMAKE_VARS="$QMAKE_VARS QMAKE_LFLAGS+=-pg" else UNKNOWN_OPT=yes @@ -2276,17 +2276,17 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "########################################################################" >$mkfile echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile echo "########################################################################" >>$mkfile - EXTRA_CFLAGS="\$(QMAKE_CFLAGS)" + EXTRA_CFLAGS="\$(TQMAKE_CFLAGS)" EXTRA_CXXFLAGS="\$(TQMAKE_CXXFLAGS)" EXTRA_LFLAGS="\$(QMAKE_LFLAGS)" grep "^QMAKE_CC[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CC,CC," >>$mkfile grep "^QMAKE_CXX[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CXX,CXX," >>$mkfile - grep "^QMAKE_CFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile - grep "^TQMAKE_CXXFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$QMAKE_CFLAGS,\$(QMAKE_CFLAGS)," >>$mkfile + grep "^TQMAKE_CFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile + grep "^TQMAKE_CXXFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$TQMAKE_CFLAGS,\$(TQMAKE_CFLAGS)," >>$mkfile grep "^QMAKE_LFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile if [ "$CFG_DEBUG" = "yes" ]; then - grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)" + grep "TQMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile + EXTRA_CFLAGS="$EXTRA_CFLAGS \$(TQMAKE_CFLAGS_DEBUG)" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(TQMAKE_CXXFLAGS_DEBUG)" fi if [ "$PLATFORM_MAC" = "yes" ]; then @@ -2320,7 +2320,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${TQT_INSTALL_PREFIX}" echo >>$mkfile sed -e "s,@SOURCE_PATH@,$relpath,g" -e "s,@BUILD_PATH@,$outpath,g" \ - -e "s,@QMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \ + -e "s,@TQMAKE_CFLAGS@,$EXTRA_CFLAGS,g" -e "s,@QMAKE_LFLAGS@,$EXTRA_LFLAGS,g" \ -e "s,@TQMAKE_CXXFLAGS@,$EXTRA_CXXFLAGS,g" \ -e "s,@TQT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \ -e "s,@TQT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \ @@ -2689,7 +2689,7 @@ if [ '!' -z "$R_FLAGS" ]; then fi if [ '!' -z "$I_FLAGS" ]; then - QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS+=$I_FLAGS\"" + QMAKE_VARS="$QMAKE_VARS \"TQMAKE_CFLAGS+=$I_FLAGS\"" QMAKE_VARS="$QMAKE_VARS \"TQMAKE_CXXFLAGS+=$I_FLAGS\"" fi @@ -2708,14 +2708,14 @@ COMPILER=`echo $PLATFORM | cut -f 2- -d-` if [ "$CFG_EXCEPTION_SUPPORT" = "no" ]; then case "$COMPILER" in g++*) - QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS+=-fno-exceptions\"" + QMAKE_VARS="$QMAKE_VARS \"TQMAKE_CFLAGS+=-fno-exceptions\"" QMAKE_VARS="$QMAKE_VARS \"TQMAKE_CXXFLAGS+=-fno-exceptions\"" QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-fno-exceptions\"" ;; cc*) case "$PLATFORM" in irix-cc*) - QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS+=-LANG:exceptions=off\"" + QMAKE_VARS="$QMAKE_VARS \"TQMAKE_CFLAGS+=-LANG:exceptions=off\"" QMAKE_VARS="$QMAKE_VARS \"TQMAKE_CXXFLAGS+=-LANG:exceptions=off\"" QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-LANG:exceptions=off\"" ;; |