[QTBUG-22847] Compile with C++11 compiler
C++11 supports user-defined string literals, which makes the C++98-accepted literal string concatenation sequence "foo"MACRO illegal under C++11. The solution is to add whitespace between the string literal and the macro. For symmetry, this patch adds it on both sides. Change-Id: Ie0c698f610986c4d1b12dc2083489043b696936d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
03cbcab184
commit
d94ab97b77
@ -154,9 +154,9 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin);
|
||||
# endif
|
||||
# define Q_PLUGIN_VERIFICATION_DATA \
|
||||
static const char qt_plugin_verification_data[] = \
|
||||
"pattern=""QT_PLUGIN_VERIFICATION_DATA""\n" \
|
||||
"version="QT_VERSION_STR"\n" \
|
||||
"debug="QPLUGIN_DEBUG_STR;
|
||||
"pattern=" "QT_PLUGIN_VERIFICATION_DATA" "\n" \
|
||||
"version=" QT_VERSION_STR "\n" \
|
||||
"debug=" QPLUGIN_DEBUG_STR;
|
||||
|
||||
|
||||
# define Q_EXPORT_PLUGIN2(PLUGIN, PLUGINCLASS) \
|
||||
|
@ -118,7 +118,7 @@ void QXmlTestLogger::startLogging()
|
||||
QTest::qt_asprintf(&buf,
|
||||
"<Environment>\n"
|
||||
" <QtVersion>%s</QtVersion>\n"
|
||||
" <QTestVersion>"QTEST_VERSION_STR"</QTestVersion>\n"
|
||||
" <QTestVersion>" QTEST_VERSION_STR "</QTestVersion>\n"
|
||||
"</Environment>\n", qVersion());
|
||||
outputString(buf.constData());
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user