Merge remote-tracking branch 'gerrit/master' into containers

Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c

30 files changed, 56 insertions, 96 deletions

diff --git a/tests/benchmarks/corelib/io/qdir/10000/10000.pro b/tests/benchmarks/corelib/io/qdir/10000/10000.pro
index 0319f2c195..196b3b5b30 100644
--- a/tests/benchmarks/corelib/io/qdir/10000/10000.pro
+++ b/tests/benchmarks/corelib/io/qdir/10000/10000.pro
@@ -1,9 +1,6 @@
 TEMPLATE = app
 TARGET = bench_qdir_10000
-DEPENDPATH += .
-INCLUDEPATH += .
 
-# Input
 SOURCES += bench_qdir_10000.cpp
 
 QT = core testlib
diff --git a/tests/benchmarks/corelib/io/qdir/tree/tree.pro b/tests/benchmarks/corelib/io/qdir/tree/tree.pro
index 415580cc46..2998a13b57 100644
--- a/tests/benchmarks/corelib/io/qdir/tree/tree.pro
+++ b/tests/benchmarks/corelib/io/qdir/tree/tree.pro
@@ -1,9 +1,6 @@
 TEMPLATE = app
 TARGET = bench_qdir_tree
-DEPENDPATH += .
-INCLUDEPATH += .
 
-# Input
 SOURCES += bench_qdir_tree.cpp
 RESOURCES += bench_qdir_tree.qrc
 
diff --git a/tests/benchmarks/corelib/io/qfile/main.cpp b/tests/benchmarks/corelib/io/qfile/main.cpp
index 3d16921b7f..02922e0bbd 100644
--- a/tests/benchmarks/corelib/io/qfile/main.cpp
+++ b/tests/benchmarks/corelib/io/qfile/main.cpp
@@ -41,10 +41,11 @@
 
 #include <QDebug>
 #include <QTemporaryFile>
-#include <QFSFileEngine>
 #include <QString>
 #include <QDirIterator>
 
+#include <private/qfsfileengine_p.h>
+
 #include <qtest.h>
 
 #include <stdio.h>
@@ -79,7 +80,9 @@ Q_OBJECT
 public:
     enum BenchmarkType {
         QFileBenchmark = 1,
+#ifdef QT_BUILD_INTERNAL
         QFSFileEngineBenchmark,
+#endif
         Win32Benchmark,
         PosixBenchmark,
         QFileFromPosixBenchmark
@@ -173,7 +176,14 @@ void tst_qfile::cleanupTestCase()
 }
 
 void tst_qfile::readBigFile_QFile() { readBigFile(); }
-void tst_qfile::readBigFile_QFSFileEngine() { readBigFile(); }
+void tst_qfile::readBigFile_QFSFileEngine()
+{
+#ifdef QT_BUILD_INTERNAL
+    readBigFile();
+#else
+    QSKIP("This test requires -developer-build.");
+#endif
+}
 void tst_qfile::readBigFile_posix() 
 { 
     readBigFile(); 
@@ -191,10 +201,15 @@ void tst_qfile::readBigFile_QFile_data()
 
 void tst_qfile::readBigFile_QFSFileEngine_data()
 {
+#ifdef QT_BUILD_INTERNAL
     readBigFile_data(QFSFileEngineBenchmark, QIODevice::NotOpen, QIODevice::NotOpen);
     readBigFile_data(QFSFileEngineBenchmark, QIODevice::NotOpen, QIODevice::Unbuffered);
     readBigFile_data(QFSFileEngineBenchmark, QIODevice::Text, QIODevice::NotOpen);
     readBigFile_data(QFSFileEngineBenchmark, QIODevice::Text, QIODevice::Unbuffered);
+#else
+    QTest::addColumn<int>("dummy");
+    QTest::newRow("Test will be skipped") << -1;
+#endif
 }
 
 void tst_qfile::readBigFile_posix_data()
@@ -255,6 +270,7 @@ void tst_qfile::readBigFile()
             file.close();
         }
         break;
+#ifdef QT_BUILD_INTERNAL
         case(QFSFileEngineBenchmark): {
             QFSFileEngine fse(filename);
             fse.open(QIODevice::ReadOnly|textMode|bufferedMode);
@@ -266,6 +282,7 @@ void tst_qfile::readBigFile()
             fse.close();
         }
         break;
+#endif
         case(PosixBenchmark): {
             QByteArray data = filename.toLocal8Bit();
             const char* cfilename = data.constData();
@@ -317,7 +334,9 @@ void tst_qfile::seek_data()
 {
     QTest::addColumn<tst_qfile::BenchmarkType>("testType");
     QTest::newRow("QFile") << QFileBenchmark;
+#ifdef QT_BUILD_INTERNAL
     QTest::newRow("QFSFileEngine") << QFSFileEngineBenchmark;
+#endif
     QTest::newRow("Posix FILE*") << PosixBenchmark;
 #ifdef Q_OS_WIN
     QTest::newRow("Win32 API") << Win32Benchmark;
@@ -343,6 +362,7 @@ void tst_qfile::seek()
             file.close();
         }
         break;
+#ifdef QT_BUILD_INTERNAL
         case(QFSFileEngineBenchmark): {
             QFSFileEngine fse(filename);
             fse.open(QIODevice::ReadOnly);
@@ -353,6 +373,7 @@ void tst_qfile::seek()
             fse.close();
         }
         break;
+#endif
         case(PosixBenchmark): {
             QByteArray data = filename.toLocal8Bit();
             const char* cfilename = data.constData();
@@ -396,7 +417,9 @@ void tst_qfile::open_data()
 {
     QTest::addColumn<tst_qfile::BenchmarkType>("testType");
     QTest::newRow("QFile") << QFileBenchmark;
+#ifdef QT_BUILD_INTERNAL
     QTest::newRow("QFSFileEngine") << QFSFileEngineBenchmark;
+#endif
     QTest::newRow("Posix FILE*") << PosixBenchmark;
     QTest::newRow("QFile from FILE*") << QFileFromPosixBenchmark;
 #ifdef Q_OS_WIN
@@ -419,6 +442,7 @@ void tst_qfile::open()
             }
         }
         break;
+#ifdef QT_BUILD_INTERNAL
         case(QFSFileEngineBenchmark): {
             QBENCHMARK {
                 QFSFileEngine fse(filename);
@@ -427,7 +451,7 @@ void tst_qfile::open()
             }
         }
         break;
-
+#endif
         case(PosixBenchmark): {
             // ensure we don't account toLocal8Bit()
             QByteArray data = filename.toLocal8Bit();
@@ -477,7 +501,14 @@ void tst_qfile::open()
 
 
 void tst_qfile::readSmallFiles_QFile() { readSmallFiles(); }
-void tst_qfile::readSmallFiles_QFSFileEngine() { readSmallFiles(); }
+void tst_qfile::readSmallFiles_QFSFileEngine()
+{
+#ifdef QT_BUILD_INTERNAL
+    readSmallFiles();
+#else
+    QSKIP("This test requires -developer-build.");
+#endif
+}
 void tst_qfile::readSmallFiles_posix() 
 {
     readSmallFiles(); 
@@ -498,10 +529,15 @@ void tst_qfile::readSmallFiles_QFile_data()
 
 void tst_qfile::readSmallFiles_QFSFileEngine_data()
 {
+#ifdef QT_BUILD_INTERNAL
     readSmallFiles_data(QFSFileEngineBenchmark, QIODevice::NotOpen, QIODevice::NotOpen);
     readSmallFiles_data(QFSFileEngineBenchmark, QIODevice::NotOpen, QIODevice::Unbuffered);
     readSmallFiles_data(QFSFileEngineBenchmark, QIODevice::Text, QIODevice::NotOpen);
     readSmallFiles_data(QFSFileEngineBenchmark, QIODevice::Text, QIODevice::Unbuffered);
+#else
+    QTest::addColumn<int>("dummy");
+    QTest::newRow("Test will be skipped") << -1;
+#endif
 }
 
 void tst_qfile::readSmallFiles_posix_data()
@@ -606,6 +642,7 @@ void tst_qfile::readSmallFiles()
             }
         }
         break;
+#ifdef QT_BUILD_INTERNAL
         case(QFSFileEngineBenchmark): {
             QList<QFSFileEngine*> fileList;
             Q_FOREACH(QString file, files) {
@@ -626,6 +663,7 @@ void tst_qfile::readSmallFiles()
             }
         }
         break;
+#endif
         case(PosixBenchmark): {
             QList<FILE*> fileList;
             Q_FOREACH(QString file, files) {
diff --git a/tests/benchmarks/corelib/io/qfile/qfile.pro b/tests/benchmarks/corelib/io/qfile/qfile.pro
index 933469071d..5f7b9af73f 100644
--- a/tests/benchmarks/corelib/io/qfile/qfile.pro
+++ b/tests/benchmarks/corelib/io/qfile/qfile.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = tst_bench_qfile
-QT = core testlib
+QT = core core-private testlib
 win32: DEFINES+= _CRT_SECURE_NO_WARNINGS
 
 SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro
index 0dca21c1a8..42e8708b02 100644
--- a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro
+++ b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro
@@ -1,13 +1,9 @@
 TEMPLATE = app
 TARGET = tst_bench_qfileinfo
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
-
 QT += core-private testlib
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro
index 0dff0ce86e..20b02d190a 100644
--- a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro
+++ b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro
@@ -1,12 +1,9 @@
 TEMPLATE = app
 TARGET = tst_bench_qiodevice
 TARGET.EPOCHEAPSIZE = 0x100000 0x2000000
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT = core testlib
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro
index 6ebee8a659..758930c139 100644
--- a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro
+++ b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro
@@ -1,11 +1,8 @@
 TEMPLATE = app
 TARGET = tst_bench_qtemporaryfile
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT = core testlib
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/kernel/events/events.pro b/tests/benchmarks/corelib/kernel/events/events.pro
index fb50116495..798a880e5b 100644
--- a/tests/benchmarks/corelib/kernel/events/events.pro
+++ b/tests/benchmarks/corelib/kernel/events/events.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 TARGET = tst_bench_events
-DEPENDPATH += .
-INCLUDEPATH += .
-# Input
-SOURCES += main.cpp
+
 QT = core testlib
+
+SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro b/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro
index 2c29fafca4..6896b3ff55 100644
--- a/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro
+++ b/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro
@@ -2,8 +2,5 @@ QT += testlib
 
 TEMPLATE = app
 TARGET = tst_bench_qcoreapplication
-DEPENDPATH += .
-INCLUDEPATH += .
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/kernel/qobject/qobject.pro b/tests/benchmarks/corelib/kernel/qobject/qobject.pro
index 8edd038b0d..e611eff0a2 100644
--- a/tests/benchmarks/corelib/kernel/qobject/qobject.pro
+++ b/tests/benchmarks/corelib/kernel/qobject/qobject.pro
@@ -2,9 +2,6 @@ QT += widgets testlib
 
 TEMPLATE = app
 TARGET = tst_bench_qobject
-DEPENDPATH += .
-INCLUDEPATH += .
 
-# Input
 HEADERS += object.h
 SOURCES += main.cpp object.cpp
diff --git a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro
index 940973d8db..49edcbee70 100644
--- a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro
+++ b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro
@@ -1,8 +1,6 @@
 TEMPLATE = app
 TARGET = tst_bench_containers-associative
-DEPENDPATH += .
-INCLUDEPATH += .
 
-# Input
-SOURCES += main.cpp
 QT = core testlib
+
+SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro
index 0ae83d70f7..6f731cb6d8 100644
--- a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro
+++ b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro
@@ -1,8 +1,6 @@
 TEMPLATE = app
 TARGET = tst_bench_containers-sequential
-DEPENDPATH += .
-INCLUDEPATH += .
 
-# Input
-SOURCES += main.cpp
 QT = core testlib
+
+SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro
index 10fdc7261e..23d8dae18f 100644
--- a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro
+++ b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro
@@ -1,11 +1,7 @@
 TEMPLATE = app
 TARGET = tst_bench_qbytearray
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT = core testlib
-
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/tools/qrect/qrect.pro b/tests/benchmarks/corelib/tools/qrect/qrect.pro
index b05483599e..42cfcd8924 100644
--- a/tests/benchmarks/corelib/tools/qrect/qrect.pro
+++ b/tests/benchmarks/corelib/tools/qrect/qrect.pro
@@ -1,11 +1,7 @@
 TEMPLATE = app
 TARGET = tst_bench_qrect
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT = core testlib
-
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro
index b427150041..59e7d19244 100644
--- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro
+++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro
@@ -1,14 +1,10 @@
 TEMPLATE = app
 TARGET = tst_bench_qregexp
-DEPENDPATH += .
-INCLUDEPATH += .
-RESOURCES+=qregexp.qrc
 QT = core testlib
-
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
+RESOURCES += qregexp.qrc
 
 !isEmpty(QT.webkit.sources):exists($${QT.webkit.sources}/../JavaScriptCore/JavaScriptCore.pri) {
     include( $${QT.webkit.sources}/../JavaScriptCore/JavaScriptCore.pri )
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
index 3c880eeb4d..00becec216 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
@@ -2,6 +2,5 @@ QT += widgets testlib
 
 TEMPLATE = app
 TARGET = tst_bench_qgraphicswidget
-TEMPLATE = app
-# Input
+
 SOURCES += tst_qgraphicswidget.cpp
diff --git a/tests/benchmarks/gui/image/blendbench/blendbench.pro b/tests/benchmarks/gui/image/blendbench/blendbench.pro
index 74ba0a5920..17c18301bb 100644
--- a/tests/benchmarks/gui/image/blendbench/blendbench.pro
+++ b/tests/benchmarks/gui/image/blendbench/blendbench.pro
@@ -1,7 +1,5 @@
 TEMPLATE = app
 TARGET = tst_bench_blendbench
-DEPENDPATH += .
-INCLUDEPATH += .
 QT += testlib
-# Input
+
 SOURCES += main.cpp
diff --git a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro
index 7f5d829b26..074c764e50 100644
--- a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro
+++ b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro
@@ -1,5 +1,5 @@
 TARGET = tst_bench_qpixmapcache
 TEMPLATE = app
 QT += testlib
-# Input
+
 SOURCES += tst_qpixmapcache.cpp
diff --git a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro
index 19ca697102..86a016d42e 100644
--- a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro
+++ b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro
@@ -2,10 +2,7 @@ QT += widgets testlib
 
 TEMPLATE = app
 TARGET = tst_bench_qapplication
-DEPENDPATH += .
-INCLUDEPATH += .
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/gui/painting/qregion/qregion.pro b/tests/benchmarks/gui/painting/qregion/qregion.pro
index 99bbd39043..1ff55080c5 100644
--- a/tests/benchmarks/gui/painting/qregion/qregion.pro
+++ b/tests/benchmarks/gui/painting/qregion/qregion.pro
@@ -1,9 +1,6 @@
 TEMPLATE = app
 TARGET = tst_bench_qregion
-DEPENDPATH += .
-INCLUDEPATH += .
 QT += testlib
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro
index 82558e7ec9..5aef3520c0 100644
--- a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro
+++ b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro
@@ -1,11 +1,7 @@
 TEMPLATE = app
 QT += widgets testlib
 TARGET = tst_bench_qstylesheetstyle
-DEPENDPATH += .
-INCLUDEPATH += .
-
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro
index bee2adafa1..eccabd5d89 100644
--- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro
+++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro
@@ -1,12 +1,9 @@
 TEMPLATE = app
 TARGET = tst_bench_qfile_vs_qnetworkaccessmanager
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
 QT += network testlib
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
index fe2204bb16..9de05b5e65 100644
--- a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
+++ b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
@@ -1,14 +1,9 @@
 TEMPLATE = app
 TARGET = tst_bench_qnetworkdiskcache
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT += gui # for QDesktopServices
 QT += network testlib
 
 CONFIG += release
 
-# Input
 SOURCES += tst_qnetworkdiskcache.cpp
-
-
diff --git a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro
index 36eeb23fd0..1618728295 100644
--- a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro
+++ b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro
@@ -1,12 +1,9 @@
 TEMPLATE = app
 TARGET = tst_bench_qnetworkreply
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
 QT += network testlib
 
 CONFIG += release
 
-# Input
 SOURCES += tst_qnetworkreply.cpp
diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 829bba5c5d..fe9efa55b7 100644
--- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -457,7 +457,7 @@ private slots:
     void initTestCase();
     void httpLatency();
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
     void echoPerformance_data();
     void echoPerformance();
 #endif
@@ -491,7 +491,7 @@ void tst_qnetworkreply::httpLatency()
     }
 }
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 void tst_qnetworkreply::echoPerformance_data()
 {
      QTest::addColumn<bool>("ssl");
diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro
index e26406fe74..41dae0051b 100644
--- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro
+++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro
@@ -1,12 +1,9 @@
 TEMPLATE = app
 TARGET = tst_bench_qhostinfo
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
 QT += core-private network network-private testlib
 
 CONFIG += release
 
-# Input
 SOURCES += main.cpp
diff --git a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro
index 1ea2f96d78..ebf1891433 100644
--- a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro
+++ b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro
@@ -1,12 +1,9 @@
 TEMPLATE = app
 TARGET = tst_bench_qtcpserver
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
 QT += network testlib
 
 CONFIG += release
 
-# Input
 SOURCES += tst_qtcpserver.cpp
diff --git a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro
index d71fd86316..a67c0d66df 100644
--- a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro
+++ b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro
@@ -1,12 +1,9 @@
 TEMPLATE = app
 TARGET = tst_bench_qsslsocket
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
 QT += network testlib
 
 CONFIG += release
 
-# Input
 SOURCES += tst_qsslsocket.cpp
diff --git a/tests/benchmarks/opengl/opengl.pro b/tests/benchmarks/opengl/opengl.pro
index 2866dbc650..1a81571a3f 100644
--- a/tests/benchmarks/opengl/opengl.pro
+++ b/tests/benchmarks/opengl/opengl.pro
@@ -1,11 +1,8 @@
 TEMPLATE = app
 TARGET = tst_bench_opengl
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT += core-private gui-private opengl opengl-private testlib
 
-# Input
 SOURCES += main.cpp
 
 include(../trusted-benchmarks.pri)
diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro
index 1db78e332d..d278e9e721 100644
--- a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro
+++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro
@@ -1,7 +1,5 @@
 TEMPLATE = app
 TARGET = jpeg
-DEPENDPATH += .
-INCLUDEPATH += .
 QT += testlib
 CONFIG += release
 
@@ -11,5 +9,4 @@ wince*: {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
 
-# Input
 SOURCES += jpeg.cpp