diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-19 11:30:37 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-19 11:30:37 +0200 |
| commit | 5431226296e2607b37b4f666ee970bddb5fd5707 (patch) | |
| tree | 6cb28e428c6dc56dc9a09f8059298ede5450547e /qmake/generators/win32 | |
| parent | 54809cd81b104eff743b46aa7fe8744cab46cf98 (diff) | |
| download | qt3-54312262.tar.gz qt3-54312262.zip | |
Fix FTBFS with stricter C++11
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
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 | 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 dae8a97..73adadd 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"QTDLL_POSTFIX || project->first("TARGET") == "qtmt"QTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qtmt" QTDLL_POSTFIX); QStringList &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 b2060c5..bafa671 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"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_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 1d82224..bdce792 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"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX); project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; QStringList &configs = project->variables()["CONFIG"]; diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index c5ffd44..a4e0389 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"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX); project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; QString targetfilename = project->variables()["TARGET"].first(); diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index f7fa84f..23edca6 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 Qt? bool is_qt = - ( project->first("TARGET") == "qt"QTDLL_POSTFIX || - project->first("TARGET") == "qt-mt"QTDLL_POSTFIX ); + ( project->first("TARGET") == "qt" QTDLL_POSTFIX || + project->first("TARGET") == "qt-mt" QTDLL_POSTFIX ); // Are we using Qt? bool isQtActive = project->isActiveConfig("qt"); @@ -1097,8 +1097,8 @@ void VcprojGenerator::initOld() project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); bool is_qt = - ( project->first("TARGET") == "qt"QTDLL_POSTFIX || - project->first("TARGET") == "qt-mt"QTDLL_POSTFIX ); + ( project->first("TARGET") == "qt" QTDLL_POSTFIX || + project->first("TARGET") == "qt-mt" QTDLL_POSTFIX ); QStringList &configs = project->variables()["CONFIG"]; |