Make testlib use #include consistently.

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

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
 

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>

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
 

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

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>
 

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

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
 

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
 

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>
 

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)

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
 

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>

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>

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>

src/testlib/qtestelement.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtestelement.h"
+#include <QtTest/qtestelement.h>
 
 QT_BEGIN_NAMESPACE
 

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>

src/testlib/qtestlog.cpp

@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "QtTest/qtestassert.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 <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>
 

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>

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

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
 

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
 

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>