summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-10-17 19:46:30 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-10-17 19:46:30 +0900
commit69d87202cb139ffe9e4b3ce92e434523b7b09b64 (patch)
tree7b133311a4d5e5394f2612dced305f815c04847b /qmake/generators/win32
parente07baa10b7b8e7105e02a621efadac67216c61ed (diff)
downloadtqt3-69d87202cb139ffe9e4b3ce92e434523b7b09b64.tar.gz
tqt3-69d87202cb139ffe9e4b3ce92e434523b7b09b64.zip
QT_NO_* -> TQT_NO_* renaming.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'qmake/generators/win32')
-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
5 files changed, 8 insertions, 8 deletions
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) )