Fix compilation with GCC 4.7 (C++11)

The error was:
error: unable to find string literal operator ‘operator"" STR_PORT’

Change-Id: Id4b4e64e296ffc3624be15c20f74a964e6cd1087
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
index de34ba9..13fb053 100644 (file)
--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
+++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp
@@ -105,7 +105,7 @@ QmlDebugObjectReference tst_QQmlEngineDebugInspectorIntegration::findRootObject(
 
 void tst_QQmlEngineDebugInspectorIntegration::init()
 {
-    const QString argument = "-qmljsdebugger=port:"STR_PORT",block";
+    const QString argument = "-qmljsdebugger=port:" STR_PORT ",block";
 
     m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath)
                                      + "/qmlscene");

diff --git a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
index 291939d..b38f54a 100644 (file)
--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
@@ -84,7 +84,7 @@ private slots:
 
 void tst_QQmlInspector::init()
 {
-    const QString argument = "-qmljsdebugger=port:"STR_PORT",block";
+    const QString argument = "-qmljsdebugger=port:" STR_PORT ",block";
 
     m_process = new QQmlDebugProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene");
     m_process->start(QStringList() << argument << testFile("qtquick2.qml"));

diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index bb17d1d..8dc583a 100644 (file)
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -234,9 +234,9 @@ void tst_QQmlProfilerService::connect(bool block, const QString &testFile)
     QStringList arguments;
 
     if (block)
-        arguments << QString("-qmljsdebugger=port:"STR_PORT",block");
+        arguments << QString("-qmljsdebugger=port:" STR_PORT ",block");
     else
-        arguments << QString("-qmljsdebugger=port:"STR_PORT);
+        arguments << QString("-qmljsdebugger=port:" STR_PORT);
 
     arguments << QQmlDataTest::instance()->testFile(testFile);
 

diff --git a/tests/auto/qml/debugger/qv8profilerservice/tst_qv8profilerservice.cpp b/tests/auto/qml/debugger/qv8profilerservice/tst_qv8profilerservice.cpp
index 0c35d10..7be3adf 100644 (file)
--- a/tests/auto/qml/debugger/qv8profilerservice/tst_qv8profilerservice.cpp
+++ b/tests/auto/qml/debugger/qv8profilerservice/tst_qv8profilerservice.cpp
@@ -208,9 +208,9 @@ bool tst_QV8ProfilerService::connect(bool block, const QString &testFile,
     QStringList arguments;
 
     if (block)
-        arguments << QString("-qmljsdebugger=port:"STR_PORT",block");
+        arguments << QString("-qmljsdebugger=port:" STR_PORT ",block");
     else
-        arguments << QString("-qmljsdebugger=port:"STR_PORT);
+        arguments << QString("-qmljsdebugger=port:" STR_PORT);
 
     arguments << QQmlDataTest::instance()->testFile(testFile);