diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-18 01:19:46 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-18 01:19:46 +0900 |
| commit | 2df70f03d493f5226821dd2e1da3759e3abceb02 (patch) | |
| tree | f105d7829be7401bd27b833e0e26cf64c6a62ad1 /qmake/generators/win32/msvc_vcproj.cpp | |
| parent | f849f22528ee9eb5eeb1f9aa92822846b2b3e01f (diff) | |
| download | qt3-2df70f03d493f5226821dd2e1da3759e3abceb02.tar.gz qt3-2df70f03d493f5226821dd2e1da3759e3abceb02.zip | |
Revert "QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT conversion to align to updated admin module"
The original commit was a mistake and should not have been pushed.
This reverts commit f849f22528ee9eb5eeb1f9aa92822846b2b3e01f.
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index e503e04..23edca6 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"] += "TQT_THREAD_SUPPORT"; + project->variables()["DEFINES"] += "QT_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("TQT_THREAD_SUPPORT" ); + project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT" ); if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt && project->first("TARGET") != "qtmain" ) project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:libc"); |