summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.unix4
-rw-r--r--qmake/Makefile.win32-g++2
-rw-r--r--qmake/generators/mac/metrowerks_xml.cpp2
-rw-r--r--qmake/generators/unix/unixmake.cpp2
-rw-r--r--qmake/generators/win32/borland_bmake.cpp2
-rw-r--r--qmake/generators/win32/mingw_make.cpp2
-rw-r--r--qmake/generators/win32/msvc_dsp.cpp2
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp2
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp8
9 files changed, 13 insertions, 13 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index c6a3906da..8e94d388a 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -35,8 +35,8 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef
CXXFLAGS= @QMAKE_CXXFLAGS@ \
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \
- -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DTQT_NO_STL \
- -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
+ -DTQT_NO_TEXTCODEC -DTQT_NO_UNICODETABLES -DTQT_NO_COMPONENT -DTQT_NO_STL \
+ -DTQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
LFLAGS=@QMAKE_LFLAGS@
tqmake: $(OBJS) $(QOBJS)
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 564bfa2be..a25b8f35f 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -5,7 +5,7 @@ CXX = g++
CFLAGS = -c -o$@ -O \
-I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -I..\include -I..\src\tools \
-I..\mkspecs\win32-g++ \
- -DUNICODE -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DTQT_NO_STL -DQT_NO_COMPRESS
+ -DUNICODE -DTQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DTQT_NO_STL -DTQT_NO_COMPRESS
CXXFLAGS = $(CFLAGS)
LFLAGS =
LIBS = -lole32 -luuid
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 5b8802a0a..22cc89b33 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -534,7 +534,7 @@ MetrowerksMakefileGenerator::init()
if(configs.findIndex("moc"))
configs.append("moc");
if ( !project->isActiveConfig("debug") )
- project->variables()["DEFINES"].append("QT_NO_DEBUG");
+ project->variables()["DEFINES"].append("TQT_NO_DEBUG");
}
//version handling
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 758634b34..7779a7307 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -177,7 +177,7 @@ UnixMakefileGenerator::init()
if(configs.findIndex("moc")) configs.append("moc");
project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
if ( !project->isActiveConfig("debug") )
- project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
+ project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG");
if ( !is_qt ) {
if ( !project->isEmpty("QMAKE_RPATH") ) {
if ( !project->isEmpty("QMAKE_RTLDIR_QT") )
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index 0acae966a..9d8dc7cb6 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -480,7 +480,7 @@ BorlandMakefileGenerator::init()
project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"];
if ( !project->isActiveConfig("debug") )
- project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
+ project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG");
if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) {
project->variables()["DEFINES"].append("QT_MAKEDLL");
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 2a3ab3e02..069524314 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -494,7 +494,7 @@ MingwMakefileGenerator::init()
project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"];
if ( !project->isActiveConfig("debug") )
- project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
+ project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG");
if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) {
project->variables()["DEFINES"].append("QT_MAKEDLL");
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index fabdd7232..6b6b8fdbd 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -918,7 +918,7 @@ DspMakefileGenerator::init()
project->variables()["MSVCDSP_INCPATH"].append("/I \"" + specdir() + "\"");
if ( project->isActiveConfig("qt") ) {
- project->variables()["MSVCDSP_RELDEFS"].append("/D \"QT_NO_DEBUG\"");
+ project->variables()["MSVCDSP_RELDEFS"].append("/D \"TQT_NO_DEBUG\"");
} else {
project->variables()["MSVCDSP_RELDEFS"].clear();
}
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index a9e08a855..a1ada25f5 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -580,7 +580,7 @@ NmakeMakefileGenerator::init()
project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"];
if ( !project->isActiveConfig("debug") )
- project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
+ project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG");
if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) {
project->variables()["DEFINES"].append("QT_MAKEDLL");
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 40034ace5..999b05f04 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -648,8 +648,8 @@ void VcprojGenerator::initConfiguration()
if (!project->variables()["QMAKE_CXXFLAGS_RELEASE"].contains("Gm")
&& project->variables()["QMAKE_CXXFLAGS_DEBUG"].contains("Gm"))
RConf.compiler.parseOption("-Gm-");
- if (RConf.compiler.PreprocessorDefinitions.findIndex("QT_NO_DEBUG") == -1)
- RConf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
+ if (RConf.compiler.PreprocessorDefinitions.findIndex("TQT_NO_DEBUG") == -1)
+ RConf.compiler.PreprocessorDefinitions += "TQT_NO_DEBUG";
} else {
DConf.IntermediateDirectory =
DConf.compiler.AssemblerListingLocation =
@@ -659,7 +659,7 @@ void VcprojGenerator::initConfiguration()
DConf.linker.DelayLoadDLLs.clear();
DConf.compiler.parseOptions(project->variables()["QMAKE_CFLAGS_DEBUG"]);
DConf.compiler.parseOptions(project->variables()["QMAKE_CXXFLAGS_DEBUG"]);
- DConf.compiler.PreprocessorDefinitions.remove("QT_NO_DEBUG");
+ DConf.compiler.PreprocessorDefinitions.remove("TQT_NO_DEBUG");
}
// Add Debug configuration to project
@@ -704,7 +704,7 @@ void VcprojGenerator::initCompilerTool()
// Release version
RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS"] );
RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_RELEASE"] );
- RConf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG";
+ RConf.compiler.PreprocessorDefinitions += "TQT_NO_DEBUG";
RConf.compiler.PreprocessorDefinitions += "NDEBUG";
if ( project->isActiveConfig("thread") ) {
if ( (projectTarget == Application) || (projectTarget == StaticLib) )
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 22:41:46 +0000