Fix FTBFS with stricter C++11

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 6 years ago
parent 878533ff2c
commit 017e8dbffe
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -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");

@ -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

@ -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"];

@ -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();

@ -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"];

@ -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="TQT_VERSION_STR"\n" \
"flags="Q_PLUGIN_FLAGS_STRING"\n" \
"buildkey="TQT_BUILD_KEY"\0";
"pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \
"version=" TQT_VERSION_STR "\n" \
"flags=" Q_PLUGIN_FLAGS_STRING "\n" \
"buildkey=" TQT_BUILD_KEY "\0";
#endif // Q_PLUGIN_VERIFICATION_DATA
#define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION ) \

@ -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="TQT_VERSION_STR"\n" \
"flags="Q_UCM_FLAGS_STRING"\n" \
"buildkey="TQT_BUILD_KEY"\0";
"pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \
"version=" TQT_VERSION_STR "\n" \
"flags=" Q_UCM_FLAGS_STRING "\n" \
"buildkey=" TQT_BUILD_KEY "\0";
#endif // Q_UCM_VERIFICATION_DATA
// This macro expands to the default implementation of ucm_instantiate.

Loading…
Cancel
Save