From 5431226296e2607b37b4f666ee970bddb5fd5707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 19 Aug 2018 11:30:37 +0200 Subject: [PATCH] Fix FTBFS with stricter C++11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- qmake/generators/win32/borland_bmake.cpp | 2 +- qmake/generators/win32/mingw_make.cpp | 2 +- qmake/generators/win32/msvc_dsp.cpp | 2 +- qmake/generators/win32/msvc_nmake.cpp | 2 +- qmake/generators/win32/msvc_vcproj.cpp | 8 ++++---- src/kernel/qgplugin.h | 8 ++++---- src/tools/qcom_p.h | 8 ++++---- 7 files changed, 16 insertions(+), 16 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"]; diff --git a/src/kernel/qgplugin.h b/src/kernel/qgplugin.h index ba0914b..5ebcc5d 100644 --- a/src/kernel/qgplugin.h +++ b/src/kernel/qgplugin.h @@ -81,10 +81,10 @@ #ifndef Q_PLUGIN_VERIFICATION_DATA # define Q_PLUGIN_VERIFICATION_DATA \ static const char *qt_ucm_verification_data = \ - "pattern=""QT_UCM_VERIFICATION_DATA""\n" \ - "version="QT_VERSION_STR"\n" \ - "flags="Q_PLUGIN_FLAGS_STRING"\n" \ - "buildkey="QT_BUILD_KEY"\0"; + "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \ + "version=" QT_VERSION_STR "\n" \ + "flags=" Q_PLUGIN_FLAGS_STRING "\n" \ + "buildkey=" QT_BUILD_KEY "\0"; #endif // Q_PLUGIN_VERIFICATION_DATA #define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION ) \ diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h index 2d53c15..f563d4f 100644 --- a/src/tools/qcom_p.h +++ b/src/tools/qcom_p.h @@ -296,10 +296,10 @@ public: \ #ifndef Q_UCM_VERIFICATION_DATA # define Q_UCM_VERIFICATION_DATA \ static const char *qt_ucm_verification_data = \ - "pattern=""QT_UCM_VERIFICATION_DATA""\n" \ - "version="QT_VERSION_STR"\n" \ - "flags="Q_UCM_FLAGS_STRING"\n" \ - "buildkey="QT_BUILD_KEY"\0"; + "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \ + "version=" QT_VERSION_STR "\n" \ + "flags=" Q_UCM_FLAGS_STRING "\n" \ + "buildkey=" QT_BUILD_KEY "\0"; #endif // Q_UCM_VERIFICATION_DATA // This macro expands to the default implementation of ucm_instantiate.