TDE
/
qt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/qt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS with stricter C++11

Browse Source 
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 5431226296)
v3.5.13-sru
Slávek Banko 6 years ago
parent 38fcc7cf0f
commit a1fe96cf6e
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
qmake/generators/win32/borland_bmake.cpp
Unescape View File

@ -386,7 +386,7 @@ BorlandMakefileGenerator::init()
if(project->isEmpty("QMAKE_INSTALL_DIR")) if(project->isEmpty("QMAKE_INSTALL_DIR"))
project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_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"]; QStringList &configs = project->variables()["CONFIG"];
if (project->isActiveConfig("shared")) if (project->isActiveConfig("shared"))
project->variables()["DEFINES"].append("QT_DLL"); project->variables()["DEFINES"].append("QT_DLL");

2
qmake/generators/win32/mingw_make.cpp
Unescape View File

@ -397,7 +397,7 @@ MingwMakefileGenerator::init()
if(project->isEmpty("QMAKE_INSTALL_DIR")) if(project->isEmpty("QMAKE_INSTALL_DIR"))
project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_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"]; project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
// LIBS defined in Profile comes first for gcc // LIBS defined in Profile comes first for gcc

2
qmake/generators/win32/msvc_dsp.cpp
Unescape View File

@ -623,7 +623,7 @@ DspMakefileGenerator::init()
if ( project->variables()["QMAKESPEC"].isEmpty() ) if ( project->variables()["QMAKESPEC"].isEmpty() )
project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); 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"]; project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
QStringList &configs = project->variables()["CONFIG"]; QStringList &configs = project->variables()["CONFIG"];

2
qmake/generators/win32/msvc_nmake.cpp
Unescape View File

@ -482,7 +482,7 @@ NmakeMakefileGenerator::init()
if(project->isEmpty("QMAKE_INSTALL_DIR")) if(project->isEmpty("QMAKE_INSTALL_DIR"))
project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_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"]; project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
QString targetfilename = project->variables()["TARGET"].first(); QString targetfilename = project->variables()["TARGET"].first();

8
qmake/generators/win32/msvc_vcproj.cpp
Unescape View File

@ -459,8 +459,8 @@ void VcprojGenerator::init()
// Are we building Qt? // Are we building Qt?
bool is_qt = bool is_qt =
( project->first("TARGET") == "qt"QTDLL_POSTFIX || ( project->first("TARGET") == "qt" QTDLL_POSTFIX ||
project->first("TARGET") == "qt-mt"QTDLL_POSTFIX ); project->first("TARGET") == "qt-mt" QTDLL_POSTFIX );
// Are we using Qt? // Are we using Qt?
bool isQtActive = project->isActiveConfig("qt"); bool isQtActive = project->isActiveConfig("qt");
@ -1097,8 +1097,8 @@ void VcprojGenerator::initOld()
project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") );
bool is_qt = bool is_qt =
( project->first("TARGET") == "qt"QTDLL_POSTFIX || ( project->first("TARGET") == "qt" QTDLL_POSTFIX ||
project->first("TARGET") == "qt-mt"QTDLL_POSTFIX ); project->first("TARGET") == "qt-mt" QTDLL_POSTFIX );
QStringList &configs = project->variables()["CONFIG"]; QStringList &configs = project->variables()["CONFIG"];

8
src/kernel/qgplugin.h
Unescape View File

@ -81,10 +81,10 @@
#ifndef Q_PLUGIN_VERIFICATION_DATA #ifndef Q_PLUGIN_VERIFICATION_DATA
# define Q_PLUGIN_VERIFICATION_DATA \ # define Q_PLUGIN_VERIFICATION_DATA \
static const char *qt_ucm_verification_data = \ static const char *qt_ucm_verification_data = \
"pattern=""QT_UCM_VERIFICATION_DATA""\n" \ "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \
"version="QT_VERSION_STR"\n" \ "version=" QT_VERSION_STR "\n" \
"flags="Q_PLUGIN_FLAGS_STRING"\n" \ "flags=" Q_PLUGIN_FLAGS_STRING "\n" \
"buildkey="QT_BUILD_KEY"\0"; "buildkey=" QT_BUILD_KEY "\0";
#endif // Q_PLUGIN_VERIFICATION_DATA #endif // Q_PLUGIN_VERIFICATION_DATA
#define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION ) \ #define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION ) \

8
src/tools/qcom_p.h
Unescape View File

@ -296,10 +296,10 @@ public: \
#ifndef Q_UCM_VERIFICATION_DATA #ifndef Q_UCM_VERIFICATION_DATA
# define Q_UCM_VERIFICATION_DATA \ # define Q_UCM_VERIFICATION_DATA \
static const char *qt_ucm_verification_data = \ static const char *qt_ucm_verification_data = \
"pattern=""QT_UCM_VERIFICATION_DATA""\n" \ "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \
"version="QT_VERSION_STR"\n" \ "version=" QT_VERSION_STR "\n" \
"flags="Q_UCM_FLAGS_STRING"\n" \ "flags=" Q_UCM_FLAGS_STRING "\n" \
"buildkey="QT_BUILD_KEY"\0"; "buildkey=" QT_BUILD_KEY "\0";
#endif // Q_UCM_VERIFICATION_DATA #endif // Q_UCM_VERIFICATION_DATA
// This macro expands to the default implementation of ucm_instantiate. // This macro expands to the default implementation of ucm_instantiate.

Write Preview
Loading…
Cancel
Save