diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-19 11:31:56 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-19 11:31:56 +0200 |
| commit | 017e8dbffe8919583bb9a3828f9cd8a61505659b (patch) | |
| tree | 8a03a4e1f62bfe010fb83af2687759b90c20c7c9 /qmake | |
| parent | 878533ff2cc26df398e586ba989b64919a49103c (diff) | |
| download | tqt3-017e8dbffe8919583bb9a3828f9cd8a61505659b.tar.gz tqt3-017e8dbffe8919583bb9a3828f9cd8a61505659b.zip | |
Fix FTBFS with stricter C++11
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'qmake')
| -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 | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index b7ca9c1a0..41666e3a0 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -386,7 +386,7 @@ BorlandMakefileGenerator::init() if(project->isEmpty("QMAKE_INSTALL_DIR")) project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); - bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "qtmt"TQTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "qtmt" TQTDLL_POSTFIX); TQStringList &configs = project->variables()["CONFIG"]; if (project->isActiveConfig("shared")) project->variables()["DEFINES"].append("QT_DLL"); diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 06cc0f764..a082a4aa7 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -397,7 +397,7 @@ MingwMakefileGenerator::init() if(project->isEmpty("QMAKE_INSTALL_DIR")) project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); - bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX); project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; // LIBS defined in Profile comes first for gcc diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp index 010007375..f28969be2 100644 --- a/qmake/generators/win32/msvc_dsp.cpp +++ b/qmake/generators/win32/msvc_dsp.cpp @@ -623,7 +623,7 @@ DspMakefileGenerator::init() if ( project->variables()["QMAKESPEC"].isEmpty() ) project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); - bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX); project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; TQStringList &configs = project->variables()["CONFIG"]; diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 2422a8a6d..75138b6ca 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -482,7 +482,7 @@ NmakeMakefileGenerator::init() if(project->isEmpty("QMAKE_INSTALL_DIR")) project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); - bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX); project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; TQString targetfilename = project->variables()["TARGET"].first(); diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index ae0657acb..625ccf379 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -459,8 +459,8 @@ void VcprojGenerator::init() // Are we building TQt? bool is_qt = - ( project->first("TARGET") == "qt"TQTDLL_POSTFIX || - project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX ); + ( project->first("TARGET") == "qt" TQTDLL_POSTFIX || + project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX ); // Are we using TQt? bool isTQtActive = project->isActiveConfig("qt"); @@ -1097,8 +1097,8 @@ void VcprojGenerator::initOld() project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); bool is_qt = - ( project->first("TARGET") == "qt"TQTDLL_POSTFIX || - project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX ); + ( project->first("TARGET") == "qt" TQTDLL_POSTFIX || + project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX ); TQStringList &configs = project->variables()["CONFIG"]; |