Merge remote-tracking branch 'origin/api_changes'

Conflicts:
	dist/changes-5.0.0
	mkspecs/features/qt_module_config.prf
	qmake/project.cpp
	qmake/property.cpp

Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296

7 files changed, 20 insertions, 20 deletions

diff --git a/tests/benchmarks/corelib/tools/containers-associative/main.cpp b/tests/benchmarks/corelib/tools/containers-associative/main.cpp
index 7f2e7b68ca..ab1c406708 100644
--- a/tests/benchmarks/corelib/tools/containers-associative/main.cpp
+++ b/tests/benchmarks/corelib/tools/containers-associative/main.cpp
@@ -72,8 +72,8 @@ void tst_associative_containers::insert_data()
     
         const QByteArray sizeString = QByteArray::number(size);
 
-        QTest::newRow(("hash--" + sizeString).constData()) << true << size;
-        QTest::newRow(("map--" + sizeString).constData()) << false << size;
+        QTest::newRow(QByteArray("hash--" + sizeString).constData()) << true << size;
+        QTest::newRow(QByteArray("map--" + sizeString).constData()) << false << size;
     }
 }
 
@@ -104,8 +104,8 @@ void tst_associative_containers::lookup_data()
     
         const QByteArray sizeString = QByteArray::number(size);
 
-        QTest::newRow(("hash--" + sizeString).constData()) << true << size;
-        QTest::newRow(("map--" + sizeString).constData()) << false << size;
+        QTest::newRow(QByteArray("hash--" + sizeString).constData()) << true << size;
+        QTest::newRow(QByteArray("map--" + sizeString).constData()) << false << size;
     }
 }
 
diff --git a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp
index e42a40b110..43eadb6633 100644
--- a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp
+++ b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp
@@ -176,8 +176,8 @@ void tst_vector_vs_std::insert_int_data()
 
     for (int size = 10; size < 20000; size += 100) {
         const QByteArray sizeString = QByteArray::number(size);
-        QTest::newRow(("std::vector-int--" + sizeString).constData()) << true << size;
-        QTest::newRow(("QVector-int--" + sizeString).constData()) << false << size;
+        QTest::newRow(QByteArray("std::vector-int--" + sizeString).constData()) << true << size;
+        QTest::newRow(QByteArray("QVector-int--" + sizeString).constData()) << false << size;
     }
 }
 
@@ -199,8 +199,8 @@ void tst_vector_vs_std::insert_Large_data()
 
     for (int size = 10; size < LARGE_MAX_SIZE; size += 100) {
         const QByteArray sizeString = QByteArray::number(size);
-        QTest::newRow(("std::vector-Large--" + sizeString).constData()) << true << size;
-        QTest::newRow(("QVector-Large--" + sizeString).constData()) << false << size;
+        QTest::newRow(QByteArray("std::vector-Large--" + sizeString).constData()) << true << size;
+        QTest::newRow(QByteArray("QVector-Large--" + sizeString).constData()) << false << size;
     }
 }
 
@@ -222,8 +222,8 @@ void tst_vector_vs_std::lookup_int_data()
 
     for (int size = 10; size < 20000; size += 100) {
         const QByteArray sizeString = QByteArray::number(size);
-        QTest::newRow(("std::vector-int--" + sizeString).constData()) << true << size;
-        QTest::newRow(("QVector-int--" + sizeString).constData()) << false << size;
+        QTest::newRow(QByteArray("std::vector-int--" + sizeString).constData()) << true << size;
+        QTest::newRow(QByteArray("QVector-int--" + sizeString).constData()) << false << size;
     }
 }
 
@@ -245,8 +245,8 @@ void tst_vector_vs_std::lookup_Large_data()
 
     for (int size = 10; size < LARGE_MAX_SIZE; size += 100) {
         const QByteArray sizeString = QByteArray::number(size);
-        QTest::newRow(("std::vector-Large--" + sizeString).constData()) << true << size;
-        QTest::newRow(("QVector-Large--" + sizeString).constData()) << false << size;
+        QTest::newRow(QByteArray("std::vector-Large--" + sizeString).constData()) << true << size;
+        QTest::newRow(QByteArray("QVector-Large--" + sizeString).constData()) << false << size;
     }
 }
 
diff --git a/tests/benchmarks/dbus/qdbustype/main.cpp b/tests/benchmarks/dbus/qdbustype/main.cpp
index 0e0ce358bb..b0f6988425 100644
--- a/tests/benchmarks/dbus/qdbustype/main.cpp
+++ b/tests/benchmarks/dbus/qdbustype/main.cpp
@@ -56,7 +56,7 @@ private Q_SLOTS:
 
 static inline void benchmarkAddRow(const char *name, const char *data)
 {
-    QTest::newRow(QByteArray("native-") + name) << data << true;
+    QTest::newRow(QByteArray(QByteArray("native-") + name)) << data << true;
     QTest::newRow(name) << data << false;
 }
 
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp
index 1ebdf2e0bb..3ce3d5c2c1 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp
@@ -41,7 +41,7 @@
 
 #include "themeevent.h"
 
-ThemeEvent::ThemeEvent( QString newTheme, Type type) : QEvent(type),
+ThemeEvent::ThemeEvent( const QString &newTheme, Type type) : QEvent(type),
     m_theme(newTheme)
 {
     
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h
index c98f90da55..3603b5966f 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h
@@ -50,7 +50,7 @@ static QEvent::Type ThemeEventType = (QEvent::Type) 1010;
 class ThemeEvent : public QEvent
 {
 public:
-    ThemeEvent(QString newTheme, QEvent::Type type = ThemeEventType );
+    explicit ThemeEvent(const QString &newTheme, QEvent::Type type = ThemeEventType );
     ~ThemeEvent();
 
 public:
diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
index fcddf5ed90..45acd41749 100644
--- a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
+++ b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
@@ -153,9 +153,9 @@ void tst_qstylesheetstyle::grid_data()
         QTest::addColumn<int>("N");
         for (int n = 5; n <= 25; n += 5) {
            const QByteArray nString = QByteArray::number(n*n);
-            QTest::newRow(("simple--" + nString).constData()) << false << false << n;
-            QTest::newRow(("events--" + nString).constData()) << true << false << n;
-            QTest::newRow(("show--" + nString).constData()) << true << true << n;
+            QTest::newRow(QByteArray("simple--" + nString).constData()) << false << false << n;
+            QTest::newRow(QByteArray("events--" + nString).constData()) << true << false << n;
+            QTest::newRow(QByteArray("show--" + nString).constData()) << true << true << n;
         }
 }
 
diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
index fe9efa55b7..16f9625eba 100644
--- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -530,7 +530,7 @@ void tst_qnetworkreply::downloadPerformance()
     // unlike the above function, this one tries to send as fast as possible
     // and measures how fast it was.
     TimedSender sender(5000);
-    QNetworkRequest request("debugpipe://127.0.0.1:" + QString::number(sender.serverPort()) + "/?bare=1");
+    QNetworkRequest request(QUrl(QStringLiteral("debugpipe://127.0.0.1:") + QString::number(sender.serverPort()) + QStringLiteral("/?bare=1")));
     QNetworkReplyPtr reply = manager.get(request);
     DataReader reader(reply, false);
 
@@ -552,7 +552,7 @@ void tst_qnetworkreply::uploadPerformance()
       DataGenerator generator;
 
 
-      QNetworkRequest request("debugpipe://127.0.0.1:" + QString::number(reader.serverPort()) + "/?bare=1");
+      QNetworkRequest request(QUrl(QStringLiteral("debugpipe://127.0.0.1:") + QString::number(reader.serverPort()) + QStringLiteral("/?bare=1")));
       QNetworkReplyPtr reply = manager.put(request, &generator);
       generator.start();
       connect(&reader, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));