diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-16 22:30:57 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-16 22:30:57 +0900 |
| commit | 02964eb384e1b5a73a198d04262497607d81e38f (patch) | |
| tree | 56b694b9d973c7906f9960a2029068dc44791c2b /qmake/generators/win32 | |
| parent | 1fb89fa15488ff396623fc275242b8ed149f4c1e (diff) | |
| download | tqt3-02964eb384e1b5a73a198d04262497607d81e38f.tar.gz tqt3-02964eb384e1b5a73a198d04262497607d81e38f.zip | |
Conversion QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT. This is part of the
qt->tqt conversion and is required to align to corresponding patch for
common/admin module.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/borland_bmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_dsp.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index 41666e3a0..8a565822b 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -427,7 +427,7 @@ BorlandMakefileGenerator::init() } if(project->isActiveConfig("qt")) { if ( project->isActiveConfig("thread") ) - project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); + project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT"); if ( project->isActiveConfig("accessibility" ) ) project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); if ( project->isActiveConfig("tablet") ) diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index a082a4aa7..3c4c33c61 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -428,7 +428,7 @@ MingwMakefileGenerator::init() project->variables()["CONFIG"].append("dll"); } if ( project->isActiveConfig("thread") ) { - project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); + project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT"); project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"]; project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"]; project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"]; diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp index f28969be2..4e51417d6 100644 --- a/qmake/generators/win32/msvc_dsp.cpp +++ b/qmake/generators/win32/msvc_dsp.cpp @@ -747,7 +747,7 @@ DspMakefileGenerator::init() } if ( thread ) { if(project->isActiveConfig("qt")) - project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" ); + project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" ); if ( project->isActiveConfig("dll") || project->first("TARGET") == "qtmain" || !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 75138b6ca..f813b4cb4 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -512,7 +512,7 @@ NmakeMakefileGenerator::init() project->variables()["CONFIG"].append("dll"); } if ( project->isActiveConfig("thread") ) - project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT"); + project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT"); if ( project->isActiveConfig("accessibility" ) ) project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); if ( project->isActiveConfig("tablet") ) diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 625ccf379..b294e1c38 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -483,7 +483,7 @@ void VcprojGenerator::init() } if( project->isActiveConfig("thread") ) { - project->variables()["DEFINES"] += "QT_THREAD_SUPPORT"; + project->variables()["DEFINES"] += "TQT_THREAD_SUPPORT"; project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; } else { project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; @@ -1209,7 +1209,7 @@ void VcprojGenerator::initOld() // THREAD -------------------------------------------------------- if ( project->isActiveConfig("thread") ) { if(project->isActiveConfig("qt")) - project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" ); + project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" ); if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt && project->first("TARGET") != "qtmain" ) project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:libc"); |