Be consistent with the usage of QMAKE_C[XX]FLAGS

v3.5.13-sru
Timothy Pearson 14 years ago
parent ceb25d6938
commit 5584c3586a

@ -431,7 +431,7 @@ while [ "$#" -gt 0 ]; do
profile) profile)
if [ "$VAL" = "yes" ]; then if [ "$VAL" = "yes" ]; then
CFG_PROFILE=yes 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" QMAKE_VARS="$QMAKE_VARS QMAKE_LFLAGS+=-pg"
else else
UNKNOWN_OPT=yes UNKNOWN_OPT=yes
@ -2276,17 +2276,17 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
echo "########################################################################" >$mkfile echo "########################################################################" >$mkfile
echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile echo "## This file was autogenerated by configure, all changes will be lost ##" >>$mkfile
echo "########################################################################" >>$mkfile echo "########################################################################" >>$mkfile
EXTRA_CFLAGS="\$(QMAKE_CFLAGS)" EXTRA_CFLAGS="\$(TQMAKE_CFLAGS)"
EXTRA_CXXFLAGS="\$(TQMAKE_CXXFLAGS)" EXTRA_CXXFLAGS="\$(TQMAKE_CXXFLAGS)"
EXTRA_LFLAGS="\$(QMAKE_LFLAGS)" EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
grep "^QMAKE_CC[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,QMAKE_CC,CC," >>$mkfile 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_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_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_CXXFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$TQMAKE_CFLAGS,\$(TQMAKE_CFLAGS)," >>$mkfile
grep "^QMAKE_LFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile grep "^QMAKE_LFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
if [ "$CFG_DEBUG" = "yes" ]; then if [ "$CFG_DEBUG" = "yes" ]; then
grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile grep "TQMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)" EXTRA_CFLAGS="$EXTRA_CFLAGS \$(TQMAKE_CFLAGS_DEBUG)"
EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(TQMAKE_CXXFLAGS_DEBUG)" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(TQMAKE_CXXFLAGS_DEBUG)"
fi fi
if [ "$PLATFORM_MAC" = "yes" ]; then 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}" [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${TQT_INSTALL_PREFIX}"
echo >>$mkfile echo >>$mkfile
sed -e "s,@SOURCE_PATH@,$relpath,g" -e "s,@BUILD_PATH@,$outpath,g" \ 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,@TQMAKE_CXXFLAGS@,$EXTRA_CXXFLAGS,g" \
-e "s,@TQT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \ -e "s,@TQT_INSTALL_BINS@,\$(INSTALL_ROOT)$QMAKE_BIN_DIR,g" \
-e "s,@TQT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \ -e "s,@TQT_INSTALL_DATA@,\$(INSTALL_ROOT)$QMAKE_DATA_DIR,g" \
@ -2689,7 +2689,7 @@ if [ '!' -z "$R_FLAGS" ]; then
fi fi
if [ '!' -z "$I_FLAGS" ]; then 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\"" QMAKE_VARS="$QMAKE_VARS \"TQMAKE_CXXFLAGS+=$I_FLAGS\""
fi fi
@ -2708,14 +2708,14 @@ COMPILER=`echo $PLATFORM | cut -f 2- -d-`
if [ "$CFG_EXCEPTION_SUPPORT" = "no" ]; then if [ "$CFG_EXCEPTION_SUPPORT" = "no" ]; then
case "$COMPILER" in case "$COMPILER" in
g++*) 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 \"TQMAKE_CXXFLAGS+=-fno-exceptions\""
QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-fno-exceptions\"" QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-fno-exceptions\""
;; ;;
cc*) cc*)
case "$PLATFORM" in case "$PLATFORM" in
irix-cc*) 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 \"TQMAKE_CXXFLAGS+=-LANG:exceptions=off\""
QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-LANG:exceptions=off\"" QMAKE_VARS="$QMAKE_VARS \"QMAKE_LFLAGS+=-LANG:exceptions=off\""
;; ;;

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "$$MSVCDSP_WINCONDEF" /D "_MBCS" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "$$MSVCDSP_WINCONDEF" /D "_MBCS" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_RELEASE
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -62,7 +62,7 @@ $$MSVCDSP_REGSVR_REL
# PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "$$MSVCDSP_WINCONDEF" /D "_MBCS" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG # ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "$$MSVCDSP_WINCONDEF" /D "_MBCS" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_DEBUG
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe

@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
# PROP Ignore_Export_Lib 1 # PROP Ignore_Export_Lib 1
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_RELEASE
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -64,7 +64,7 @@ $$MSVCDSP_COPY_DLL_REL
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
# PROP Ignore_Export_Lib 1 # PROP Ignore_Export_Lib 1
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG # ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_DEBUG
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe

@ -40,7 +40,7 @@ RSC=rc.exe
# PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_RELEASE
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
@ -59,7 +59,7 @@ LIB32=link.exe -lib
# PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG # ADD CPP $$MSVCDSP_MTDEFD /W3 /Gm $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_DEBUG
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "$$MSVCDSP_WINCONDEF" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "$$MSVCDSP_WINCONDEF" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -62,7 +62,7 @@ $$MSVCDSP_POST_LINK_REL
# PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "$$MSVCDSP_WINCONDEF" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG $$PRECOMPILED_FLAGS_DEB # ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "$$MSVCDSP_WINCONDEF" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_DEBUG $$PRECOMPILED_FLAGS_DEB
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe

@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
# PROP Ignore_Export_Lib 1 # PROP Ignore_Export_Lib 1
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -64,7 +64,7 @@ $$MSVCDSP_POST_LINK_REL
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
# PROP Ignore_Export_Lib 1 # PROP Ignore_Export_Lib 1
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG $$PRECOMPILED_FLAGS_DEB # ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_DEBUG $$PRECOMPILED_FLAGS_DEB
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe

@ -40,7 +40,7 @@ RSC=rc.exe
# PROP Output_Dir "$$MSVCDSP_TARGETDIRREL" # PROP Output_Dir "$$MSVCDSP_TARGETDIRREL"
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRREL"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_LIB" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL # ADD CPP $$MSVCDSP_MTDEF /W3 $$MSVCDSP_INCPATH /D "WIN32" /D "NDEBUG" /D "_LIB" $$MSVCDSP_DEFINES $$MSVCDSP_RELDEFS /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_RELEASE $$PRECOMPILED_FLAGS_REL
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
@ -60,7 +60,7 @@ $$MSVCDSP_POST_LINK_REL
# PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB" # PROP Output_Dir "$$MSVCDSP_TARGETDIRDEB"
# PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB" # PROP Intermediate_Dir "$$MSVCDSP_OBJECTSDIRDEB"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$QMAKE_CXXFLAGS_DEBUG $$PRECOMPILED_FLAGS_DEB # ADD CPP $$MSVCDSP_MTDEFD /W3 $$MSVCDSP_DEBUG_OPT /Od $$MSVCDSP_INCPATH /D "WIN32" /D "_DEBUG" /D "_LIB" $$MSVCDSP_DEFINES /FD /c $$MSVCDSP_CXXFLAGS $$TQMAKE_CXXFLAGS_DEBUG $$PRECOMPILED_FLAGS_DEB
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo

@ -10,8 +10,8 @@ REQUIRES = !no-mng !mng
SOURCES += main.cpp SOURCES += main.cpp
win32-borland { win32-borland {
QMAKE_CFLAGS_WARN_ON += -w-par TQMAKE_CFLAGS_WARN_ON += -w-par
QMAKE_CXXFLAGS_WARN_ON += -w-par TQMAKE_CXXFLAGS_WARN_ON += -w-par
} }
win32: CONFIG-=zlib system-zlib jpeg system-jpeg win32: CONFIG-=zlib system-zlib jpeg system-jpeg

@ -758,8 +758,8 @@ and rarely needs to be modified.
\target QMAKE_CFLAGS_DEBUG \target TQMAKE_CFLAGS_DEBUG
\section3 QMAKE_CFLAGS_DEBUG \section3 TQMAKE_CFLAGS_DEBUG
This variable tqcontains the flags for the C compiler in debug mode.The value of this variable is This variable tqcontains the flags for the C compiler in debug mode.The value of this variable is
typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink
@ -768,8 +768,8 @@ and rarely needs to be modified.
\target QMAKE_CFLAGS_MT \target TQMAKE_CFLAGS_MT
\section3 QMAKE_CFLAGS_MT \section3 TQMAKE_CFLAGS_MT
This variable tqcontains the compiler flags for creating a This variable tqcontains the compiler flags for creating a
multi-threaded application or when the version of Qt that you link multi-threaded application or when the version of Qt that you link
@ -780,8 +780,8 @@ this variable is typically handled by \e qmake or
\target QMAKE_CFLAGS_MT_DBG \target TQMAKE_CFLAGS_MT_DBG
\section3 QMAKE_CFLAGS_MT_DBG \section3 TQMAKE_CFLAGS_MT_DBG
This variable tqcontains the compiler flags for creating a debuggable This variable tqcontains the compiler flags for creating a debuggable
multi-threaded application or when the version of Qt that you link multi-threaded application or when the version of Qt that you link
@ -792,8 +792,8 @@ value of this variable is typically handled by \e qmake or
\target QMAKE_CFLAGS_MT_DLL \target TQMAKE_CFLAGS_MT_DLL
\section3 QMAKE_CFLAGS_MT_DLL \section3 TQMAKE_CFLAGS_MT_DLL
\e {This is used on Windows only} \e {This is used on Windows only}
@ -806,8 +806,8 @@ rarely needs to be modified.
\target QMAKE_CFLAGS_MT_DLLDBG \target TQMAKE_CFLAGS_MT_DLLDBG
\section3 QMAKE_CFLAGS_MT_DLLDBG \section3 TQMAKE_CFLAGS_MT_DLLDBG
\e {This is used on Windows only} \e {This is used on Windows only}
@ -820,8 +820,8 @@ The value of this variable is typically handled by \e qmake or
\target QMAKE_CFLAGS_RELEASE \target TQMAKE_CFLAGS_RELEASE
\section3 QMAKE_CFLAGS_RELEASE \section3 TQMAKE_CFLAGS_RELEASE
This variable tqcontains the compiler flags for creating a non-debuggable This variable tqcontains the compiler flags for creating a non-debuggable
application. The value of this variable is typically application. The value of this variable is typically
@ -831,8 +831,8 @@ rarely needs to be modified.
\target QMAKE_CFLAGS_SHLIB \target TQMAKE_CFLAGS_SHLIB
\section3 QMAKE_CFLAGS_SHLIB \section3 TQMAKE_CFLAGS_SHLIB
\e {This is used on Unix platforms only} \e {This is used on Unix platforms only}
@ -844,8 +844,8 @@ to be modified.
\target QMAKE_CFLAGS_THREAD \target TQMAKE_CFLAGS_THREAD
\section3 QMAKE_CFLAGS_THREAD \section3 TQMAKE_CFLAGS_THREAD
This variable tqcontains the compiler flags for creating a multi-threaded This variable tqcontains the compiler flags for creating a multi-threaded
application. The value of this variable is typically handled by application. The value of this variable is typically handled by
@ -855,8 +855,8 @@ to be modified.
\target QMAKE_CFLAGS_WARN_OFF \target TQMAKE_CFLAGS_WARN_OFF
\section3 QMAKE_CFLAGS_WARN_OFF \section3 TQMAKE_CFLAGS_WARN_OFF
This variable is not empty if the warn_off This variable is not empty if the warn_off
\link #TEMPLATE TEMPLATE \endlink option is specified. The value of this \link #TEMPLATE TEMPLATE \endlink option is specified. The value of this
@ -865,8 +865,8 @@ and rarely needs to be modified.
\target QMAKE_CFLAGS_WARN_ON \target TQMAKE_CFLAGS_WARN_ON
\section3 QMAKE_CFLAGS_WARN_ON \section3 TQMAKE_CFLAGS_WARN_ON
This variable is not empty if the warn_on This variable is not empty if the warn_on
\link #TEMPLATE TEMPLATE \endlink option is specified. \link #TEMPLATE TEMPLATE \endlink option is specified.
@ -885,8 +885,8 @@ generated files) and object files that should be removed when using "make clean"
\target QMAKE_CXXFLAGS_DEBUG \target TQMAKE_CXXFLAGS_DEBUG
\section3 QMAKE_CXXFLAGS_DEBUG \section3 TQMAKE_CXXFLAGS_DEBUG
This variable tqcontains the C++ compiler flags for creating a debuggable This variable tqcontains the C++ compiler flags for creating a debuggable
application. The value of this variable is typically handled by application. The value of this variable is typically handled by
@ -895,8 +895,8 @@ to be modified.
\target QMAKE_CXXFLAGS_MT \target TQMAKE_CXXFLAGS_MT
\section3 QMAKE_CXXFLAGS_MT \section3 TQMAKE_CXXFLAGS_MT
This variable tqcontains the C++ compiler flags for creating a multi-threaded This variable tqcontains the C++ compiler flags for creating a multi-threaded
application. The value of this variable is typically handled by application. The value of this variable is typically handled by
@ -906,8 +906,8 @@ to be modified.
\target QMAKE_CXXFLAGS_MT_DBG \target TQMAKE_CXXFLAGS_MT_DBG
\section3 QMAKE_CXXFLAGS_MT_DBG \section3 TQMAKE_CXXFLAGS_MT_DBG
This variable tqcontains the C++ compiler flags for creating a debuggable multi-threaded This variable tqcontains the C++ compiler flags for creating a debuggable multi-threaded
application. The value of this variable is typically handled by application. The value of this variable is typically handled by
@ -917,8 +917,8 @@ to be modified.
\target QMAKE_CXXFLAGS_MT_DLL \target TQMAKE_CXXFLAGS_MT_DLL
\section3 QMAKE_CXXFLAGS_MT_DLL \section3 TQMAKE_CXXFLAGS_MT_DLL
\c {This is used on Windows only} \c {This is used on Windows only}
@ -930,8 +930,8 @@ to be modified.
\target QMAKE_CXXFLAGS_MT_DLLDBG \target TQMAKE_CXXFLAGS_MT_DLLDBG
\section3 QMAKE_CXXFLAGS_MT_DLLDBG \section3 TQMAKE_CXXFLAGS_MT_DLLDBG
\c {This is used on Windows only} \c {This is used on Windows only}
@ -943,8 +943,8 @@ to be modified.
\target QMAKE_CXXFLAGS_RELEASE \target TQMAKE_CXXFLAGS_RELEASE
\section3 QMAKE_CXXFLAGS_RELEASE \section3 TQMAKE_CXXFLAGS_RELEASE
This variable tqcontains the C++ compiler flags for creating an This variable tqcontains the C++ compiler flags for creating an
application. The value of this variable is typically handled by application. The value of this variable is typically handled by
@ -954,8 +954,8 @@ to be modified.
\target QMAKE_CXXFLAGS_SHLIB \target TQMAKE_CXXFLAGS_SHLIB
\section3 QMAKE_CXXFLAGS_SHLIB \section3 TQMAKE_CXXFLAGS_SHLIB
This variable tqcontains the C++ compiler flags for creating a This variable tqcontains the C++ compiler flags for creating a
shared library. The value of this variable is typically handled by shared library. The value of this variable is typically handled by
@ -965,8 +965,8 @@ to be modified.
\target QMAKE_CXXFLAGS_THREAD \target TQMAKE_CXXFLAGS_THREAD
\section3 QMAKE_CXXFLAGS_THREAD \section3 TQMAKE_CXXFLAGS_THREAD
This variable tqcontains the C++ compiler flags for creating a This variable tqcontains the C++ compiler flags for creating a
multi-threaded application. The value of this variable is typically handled by multi-threaded application. The value of this variable is typically handled by
@ -976,8 +976,8 @@ to be modified.
\target QMAKE_CXXFLAGS_WARN_OFF \target TQMAKE_CXXFLAGS_WARN_OFF
\section3 QMAKE_CXXFLAGS_WARN_OFF \section3 TQMAKE_CXXFLAGS_WARN_OFF
This variable tqcontains the C++ compiler flags for suppressing compiler warnings. This variable tqcontains the C++ compiler flags for suppressing compiler warnings.
The value of this variable is typically handled by \e qmake or The value of this variable is typically handled by \e qmake or
@ -985,8 +985,8 @@ This variable tqcontains the C++ compiler flags for suppressing compiler warning
\target QMAKE_CXXFLAGS_WARN_ON \target TQMAKE_CXXFLAGS_WARN_ON
\section3 QMAKE_CXXFLAGS_WARN_ON \section3 TQMAKE_CXXFLAGS_WARN_ON
This variable tqcontains C++ compiler flags for generating compiler warnings. This variable tqcontains C++ compiler flags for generating compiler warnings.
The value of this variable is typically handled by \e qmake or The value of this variable is typically handled by \e qmake or

@ -12,11 +12,11 @@ CONFIG += qmake_cache
win32:!shared:CONFIG += staticlib win32:!shared:CONFIG += staticlib
win32-borland { win32-borland {
mng:QMAKE_CFLAGS_WARN_ON += -w-par mng:TQMAKE_CFLAGS_WARN_ON += -w-par
mng:TQMAKE_CXXFLAGS_WARN_ON += -w-par mng:TQMAKE_CXXFLAGS_WARN_ON += -w-par
# Keep the size of the .tds file for the Qt library smaller than # Keep the size of the .tds file for the Qt library smaller than
# 34 Mbytes to avoid linking problems # 34 Mbytes to avoid linking problems
QMAKE_CFLAGS_DEBUG += -vi -y- TQMAKE_CFLAGS_DEBUG += -vi -y-
TQMAKE_CXXFLAGS_DEBUG += -vi -y- TQMAKE_CXXFLAGS_DEBUG += -vi -y-
} }
@ -106,7 +106,7 @@ unix {
} }
aix-g++ { aix-g++ {
QMAKE_CFLAGS += -mminimal-toc TQMAKE_CFLAGS += -mminimal-toc
TQMAKE_CXXFLAGS += -mminimal-toc TQMAKE_CXXFLAGS += -mminimal-toc
} }

@ -4,7 +4,7 @@ xml {
HEADERS += $$XML_H/tqxml.h $$XML_H/tqdom.h $$XML_CPP/tqsvgdevice_p.h HEADERS += $$XML_H/tqxml.h $$XML_H/tqdom.h $$XML_CPP/tqsvgdevice_p.h
SOURCES += $$XML_CPP/tqxml.cpp $$XML_CPP/tqdom.cpp $$XML_CPP/tqsvgdevice.cpp SOURCES += $$XML_CPP/tqxml.cpp $$XML_CPP/tqdom.cpp $$XML_CPP/tqsvgdevice.cpp
win32-borland { win32-borland {
QMAKE_CFLAGS_WARN_ON += -w-use TQMAKE_CFLAGS_WARN_ON += -w-use
TQMAKE_CXXFLAGS_WARN_ON += -w-use TQMAKE_CXXFLAGS_WARN_ON += -w-use
} }
} }

@ -17,7 +17,7 @@ DESTDIR = ../../../lib
unix { unix {
target.path=$$libs.path target.path=$$libs.path
QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB TQMAKE_CFLAGS += $$TQMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB TQMAKE_CXXFLAGS += $$TQMAKE_CXXFLAGS_SHLIB
INSTALLS += target INSTALLS += target
} }

@ -17,8 +17,8 @@ DEFINES += QT_INTERNAL_TABLE
table:win32-msvc:DEFINES+=QM_TEMPLATE_EXTERN_TABLE=extern table:win32-msvc:DEFINES+=QM_TEMPLATE_EXTERN_TABLE=extern
unix { unix {
QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB TQMAKE_CFLAGS += $$TQMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB TQMAKE_CXXFLAGS += $$TQMAKE_CXXFLAGS_SHLIB
} }
include( ../../../src/qt_professional.pri ) include( ../../../src/qt_professional.pri )
@ -400,8 +400,8 @@ VERSION = 1.0.0
DESTDIR = $$QT_BUILD_TREE/lib DESTDIR = $$QT_BUILD_TREE/lib
aix-g++ { aix-g++ {
QMAKE_CFLAGS += -mminimal-toc TQMAKE_CFLAGS += -mminimal-toc
QMAKE_CXXFLAGS += -mminimal-toc TQMAKE_CXXFLAGS += -mminimal-toc
} }
sql { sql {

@ -35,6 +35,6 @@ target.path=$$libs.path
INSTALLS += target INSTALLS += target
unix { unix {
QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB TQMAKE_CFLAGS += $$TQMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_SHLIB TQMAKE_CXXFLAGS += $$TQMAKE_CXXFLAGS_SHLIB
} }

Loading…
Cancel
Save