Make testlib use #include consistently.

Change-Id: I36b5da3f832d2588072405d93143173edc29f4af
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

22 files changed, 81 insertions, 85 deletions

diff --git a/src/testlib/qasciikey.cpp b/src/testlib/qasciikey.cpp
index 80e94acd0b..bcbbddff63 100644
--- a/src/testlib/qasciikey.cpp
+++ b/src/testlib/qasciikey.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "QtTest/qtestcase.h"
-#include "QtTest/qtestassert.h"
+#include <QtTest/qtestcase.h>
+#include <QtTest/qtestassert.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index 02b3566f01..ae15ef259e 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "QtTest/qbenchmark.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
+#include <QtTest/qbenchmark.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
 
 #include <QtCore/qprocess.h>
 #include <QtCore/qdir.h>
diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h
index 36e4b35493..38f34c416b 100644
--- a/src/testlib/qbenchmark_p.h
+++ b/src/testlib/qbenchmark_p.h
@@ -63,14 +63,14 @@
 #undef QTESTLIB_USE_VALGRIND
 #endif
 
-#include "QtTest/private/qbenchmarkmeasurement_p.h"
+#include <QtTest/private/qbenchmarkmeasurement_p.h>
 #include <QtCore/QMap>
 #include <QtTest/qtest_global.h>
 #ifdef QTESTLIB_USE_VALGRIND
-#include "QtTest/private/qbenchmarkvalgrind_p.h"
+#include <QtTest/private/qbenchmarkvalgrind_p.h>
 #endif
-#include "QtTest/private/qbenchmarkevent_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
+#include <QtTest/private/qbenchmarkevent_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qbenchmarkevent.cpp b/src/testlib/qbenchmarkevent.cpp
index 86957d44b9..05d00156c8 100644
--- a/src/testlib/qbenchmarkevent.cpp
+++ b/src/testlib/qbenchmarkevent.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qbenchmarkevent_p.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
+#include <QtTest/private/qbenchmarkevent_p.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
 #include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/testlib/qbenchmarkevent_p.h b/src/testlib/qbenchmarkevent_p.h
index 2cf17ea6a2..3773aea7e7 100644
--- a/src/testlib/qbenchmarkevent_p.h
+++ b/src/testlib/qbenchmarkevent_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qbenchmarkmeasurement_p.h"
+#include <QtTest/private/qbenchmarkmeasurement_p.h>
 #include <QAbstractEventDispatcher>
 #include <QObject>
 
diff --git a/src/testlib/qbenchmarkmeasurement.cpp b/src/testlib/qbenchmarkmeasurement.cpp
index 2c14f5d3fe..be52b4f211 100644
--- a/src/testlib/qbenchmarkmeasurement.cpp
+++ b/src/testlib/qbenchmarkmeasurement.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qbenchmarkmeasurement_p.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
-#include "qbenchmark.h"
+#include <QtTest/private/qbenchmarkmeasurement_p.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
+#include <QtTest/qbenchmark.h>
 #include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h
index 6ca954a619..e19a05be50 100644
--- a/src/testlib/qbenchmarkmeasurement_p.h
+++ b/src/testlib/qbenchmarkmeasurement_p.h
@@ -55,9 +55,9 @@
 
 #include <QtCore/qelapsedtimer.h>
 #ifdef HAVE_TICK_COUNTER
-#include "3rdparty/cycle_p.h"
+#include <QtTest/private/cycle_p.h>
 #endif
-#include "qbenchmark.h"
+#include <QtTest/qbenchmark.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp
index 7e43d555e0..c511796884 100644
--- a/src/testlib/qbenchmarkvalgrind.cpp
+++ b/src/testlib/qbenchmarkvalgrind.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qbenchmark_p.h"
+#include <QtTest/private/qbenchmark_p.h>
 
 #ifdef QTESTLIB_USE_VALGRIND
 
-#include "QtTest/private/qbenchmarkvalgrind_p.h"
+#include <QtTest/private/qbenchmarkvalgrind_p.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qprocess.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qset.h>
-#include "3rdparty/callgrind_p.h"
+#include <QtTest/private/callgrind_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qbenchmarkvalgrind_p.h b/src/testlib/qbenchmarkvalgrind_p.h
index 02abbcd267..e6a0720a37 100644
--- a/src/testlib/qbenchmarkvalgrind_p.h
+++ b/src/testlib/qbenchmarkvalgrind_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "QtTest/private/qbenchmarkmeasurement_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
+#include <QtTest/private/qbenchmarkmeasurement_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qstring.h>
 
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index 14fa752c40..b9ede07704 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/qtestassert.h"
-#include "QtTest/private/qtestlog_p.h"
-#include "QtTest/private/qplaintestlogger_p.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/qtestassert.h>
+#include <QtTest/private/qtestlog_p.h>
+#include <QtTest/private/qplaintestlogger_p.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -52,7 +52,7 @@
 #include <string.h>
 
 #ifdef Q_OS_WIN
-#include "windows.h"
+#include <windows.h>
 #endif
 
 #if defined(Q_OS_SYMBIAN)
diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp
index 71d0e8806b..18a505066f 100644
--- a/src/testlib/qsignaldumper.cpp
+++ b/src/testlib/qsignaldumper.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qsignaldumper_p.h"
+#include <QtTest/private/qsignaldumper_p.h>
 
 #include <QtCore/qlist.h>
 #include <QtCore/qmetaobject.h>
@@ -47,7 +47,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
 
-#include "QtTest/private/qtestlog_p.h"
+#include <QtTest/private/qtestlog_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 35ab5a31e8..950b5d537b 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -45,7 +45,6 @@
 #include <QtTest/qtest_global.h>
 #include <QtTest/qtestcase.h>
 #include <QtTest/qtestdata.h>
-#include <QtTest/qtestdata.h>
 #include <QtTest/qbenchmark.h>
 
 #include <QtCore/qbytearray.h>
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 50f395a60e..ff67820f15 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "QtTest/qtestcase.h"
-#include "QtTest/qtestassert.h"
+#include <QtTest/qtestcase.h>
+#include <QtTest/qtestassert.h>
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetaobject.h>
@@ -55,13 +55,13 @@
 #include <QtCore/qprocess.h>
 #include <QtCore/qdebug.h>
 
-#include "QtTest/private/qtestlog_p.h"
-#include "QtTest/private/qtesttable_p.h"
-#include "QtTest/qtestdata.h"
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/private/qsignaldumper_p.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "3rdparty/cycle_p.h"
+#include <QtTest/private/qtestlog_p.h>
+#include <QtTest/private/qtesttable_p.h>
+#include <QtTest/qtestdata.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qsignaldumper_p.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/cycle_p.h>
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/testlib/qtestdata.cpp b/src/testlib/qtestdata.cpp
index 404f2ce855..6ee0063738 100644
--- a/src/testlib/qtestdata.cpp
+++ b/src/testlib/qtestdata.cpp
@@ -41,9 +41,9 @@
 
 #include <QtCore/qmetaobject.h>
 
-#include "QtTest/qtestassert.h"
-#include "QtTest/qtestdata.h"
-#include "QtTest/private/qtesttable_p.h"
+#include <QtTest/qtestassert.h>
+#include <QtTest/qtestdata.h>
+#include <QtTest/private/qtesttable_p.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/testlib/qtestelement.cpp b/src/testlib/qtestelement.cpp
index a3c002f964..5f10947010 100644
--- a/src/testlib/qtestelement.cpp
+++ b/src/testlib/qtestelement.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtestelement.h"
+#include <QtTest/qtestelement.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index 9799ade577..dda40b13fc 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtestelementattribute.h"
+#include <QtTest/qtestelementattribute.h>
 #include <QtCore/qbytearray.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index c812f6c69b..58de622126 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "QtTest/qtestassert.h"
-
-#include "QtTest/private/qtestlog_p.h"
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/private/qabstracttestlogger_p.h"
-#include "QtTest/private/qplaintestlogger_p.h"
-#include "QtTest/private/qxunittestlogger_p.h"
-#include "QtTest/private/qxmltestlogger_p.h"
+#include <QtTest/qtestassert.h>
+
+#include <QtTest/private/qtestlog_p.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qabstracttestlogger_p.h>
+#include <QtTest/private/qplaintestlogger_p.h>
+#include <QtTest/private/qxunittestlogger_p.h>
+#include <QtTest/private/qxmltestlogger_p.h>
 #include <QtCore/qatomic.h>
 #include <QtCore/qbytearray.h>
 
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 4a6764b115..35a3f042ad 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qtestresult_p.h"
+#include <QtTest/private/qtestresult_p.h>
 #include <QtCore/qglobal.h>
 
-#include "QtTest/private/qtestlog_p.h"
-#include "QtTest/qtestdata.h"
-#include "QtTest/qtestassert.h"
+#include <QtTest/private/qtestlog_p.h>
+#include <QtTest/qtestdata.h>
+#include <QtTest/qtestassert.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/testlib/qtesttable.cpp b/src/testlib/qtesttable.cpp
index 20894e572b..0c76076b88 100644
--- a/src/testlib/qtesttable.cpp
+++ b/src/testlib/qtesttable.cpp
@@ -39,15 +39,14 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qtesttable_p.h"
-#include "QtTest/qtestdata.h"
+#include <QtTest/private/qtesttable_p.h>
+#include <QtTest/qtestdata.h>
+#include <QtTest/qtestassert.h>
 
 #include <QtCore/qmetaobject.h>
 
 #include <string.h>
 
-#include "QtTest/qtestassert.h"
-
 QT_BEGIN_NAMESPACE
 
 class QTestTablePrivate
diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestxunitstreamer.cpp
index 3e9c2feffc..b4ff109b00 100644
--- a/src/testlib/qtestxunitstreamer.cpp
+++ b/src/testlib/qtestxunitstreamer.cpp
@@ -39,15 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qtestxunitstreamer.h"
-#include "qxunittestlogger_p.h"
-#include "qtestelement.h"
-#include "qtestelementattribute.h"
-#include "qtestassert.h"
-
-#include "QtTest/private/qtestlog_p.h"
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/private/qxmltestlogger_p.h"
+#include <QtTest/qtestxunitstreamer.h>
+#include <QtTest/private/qxunittestlogger_p.h>
+#include <QtTest/qtestelement.h>
+#include <QtTest/qtestelementattribute.h>
+#include <QtTest/qtestassert.h>
+#include <QtTest/private/qtestlog_p.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qxmltestlogger_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp
index 304cd0a0ef..fd18d1de30 100644
--- a/src/testlib/qxmltestlogger.cpp
+++ b/src/testlib/qxmltestlogger.cpp
@@ -43,11 +43,11 @@
 #include <string.h>
 #include <QtCore/qglobal.h>
 
-#include "QtTest/private/qxmltestlogger_p.h"
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
-#include "QtTest/qtestcase.h"
+#include <QtTest/private/qxmltestlogger_p.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
+#include <QtTest/qtestcase.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qxunittestlogger.cpp b/src/testlib/qxunittestlogger.cpp
index f923b2334b..56ae43b311 100644
--- a/src/testlib/qxunittestlogger.cpp
+++ b/src/testlib/qxunittestlogger.cpp
@@ -39,13 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qxunittestlogger_p.h"
-#include "qtestelement.h"
-#include "qtestxunitstreamer.h"
-
-#include "QtTest/qtestcase.h"
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/private/qbenchmark_p.h"
+#include <QtTest/private/qxunittestlogger_p.h>
+#include <QtTest/qtestelement.h>
+#include <QtTest/qtestxunitstreamer.h>
+#include <QtTest/qtestcase.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qbenchmark_p.h>
 
 #include <string.h>