Testlib: Rename qtest_global.h to qttestglobal.h

This follows the naming convention for global headers and causes
qttestglobal.h to be added to the top of the generated QtTest header. It
is necessary to have it there when other headers depend on features
defined in configure.json.

[ChangeLog][QtTest] The qtest_global.h header is now deprecated. Include
qttestglobal.h instead.

Change-Id: Iaed639d4e13dd99cee6387fce9d15d6e55b0b1e8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

src/testlib/qabstractitemmodeltester.h

@@ -30,7 +30,7 @@
 #define QABSTRACTITEMMODELTESTER_H
 
 #include <QtCore/QObject>
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 
 #ifdef QT_GUI_LIB
 #include <QtGui/QFont>

src/testlib/qbenchmark.h

@@ -40,7 +40,7 @@
 #ifndef QBENCHMARK_H
 #define QBENCHMARK_H
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 #include <QtTest/qbenchmarkmetric.h>
 
 QT_BEGIN_NAMESPACE

src/testlib/qbenchmark_p.h

@@ -69,7 +69,7 @@
 
 #include <QtTest/private/qbenchmarkmeasurement_p.h>
 #include <QtCore/QMap>
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 #ifdef QTESTLIB_USE_VALGRIND
 #include <QtTest/private/qbenchmarkvalgrind_p.h>
 #endif

src/testlib/qbenchmarkmetric.h

@@ -41,7 +41,7 @@
 #ifndef QBENCHMARKMETRIC_H
 #define QBENCHMARKMETRIC_H
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qbenchmarkmetric_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 #include <QtTest/qbenchmarkmetric.h>
 
 QT_BEGIN_NAMESPACE

src/testlib/qtest.h

@@ -41,7 +41,7 @@
 #ifndef QTEST_H
 #define QTEST_H
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 #include <QtTest/qtestcase.h>
 #include <QtTest/qtestdata.h>
 #include <QtTest/qbenchmark.h>

src/testlib/qtestaccessible.h

@@ -54,7 +54,7 @@
 #include <QtCore/qdebug.h>
 #include <QtGui/qaccessible.h>
 #include <QtGui/qguiapplication.h>
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 #include <QtTest/qtestsystem.h>
 
 #if QT_CONFIG(accessibility)

src/testlib/qtestblacklist_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qtestcase.h

@@ -40,7 +40,7 @@
 #ifndef QTESTCASE_H
 #define QTESTCASE_H
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 
 #include <QtCore/qstring.h>
 #include <QtCore/qnamespace.h>

src/testlib/qtestdata.h

@@ -40,7 +40,7 @@
 #ifndef QTESTDATA_H
 #define QTESTDATA_H
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 
 #include <QtCore/qmetatype.h>
 #include <QtCore/qstring.h>

src/testlib/qtestevent.h

@@ -45,7 +45,7 @@
 #pragma qt_no_master_include
 #endif
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 #ifdef QT_GUI_LIB
 #include <QtTest/qtestkeyboard.h>
 #include <QtTest/qtestmouse.h>

src/testlib/qtesteventloop.h

@@ -40,7 +40,7 @@
 #ifndef QTESTEVENTLOOP_H
 #define QTESTEVENTLOOP_H
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qeventloop.h>

src/testlib/qtestkeyboard.h

@@ -46,7 +46,7 @@
 #endif
 
 #include <QtTest/qtestassert.h>
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 #include <QtTest/qtestsystem.h>
 #include <QtTest/qtestspontaneevent.h>
 

src/testlib/qtestlog_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qtestmouse.cpp

@@ -39,7 +39,7 @@
 
 #include <QtCore/QtGlobal>
 #include <QtCore/qnamespace.h>
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qtestmouse.h

@@ -45,7 +45,7 @@
 #pragma qt_no_master_include
 #endif
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 #include <QtTest/qtestassert.h>
 #include <QtTest/qtestsystem.h>
 #include <QtTest/qtestspontaneevent.h>

src/testlib/qtestresult_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qtesttable_p.h

@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 
 QT_BEGIN_NAMESPACE
 

src/testlib/qtesttouch.h

@@ -45,7 +45,7 @@
 #pragma qt_no_master_include
 #endif
 
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
 #include <QtTest/qtestassert.h>
 #include <QtTest/qtestsystem.h>
 #include <QtTest/qtestspontaneevent.h>

src/testlib/qttestglobal.h

@@ -37,14 +37,13 @@
 **
 ****************************************************************************/
 
-#ifndef QTEST_GLOBAL_H
-#define QTEST_GLOBAL_H
+#ifndef QTTESTGLOBAL_H
+#define QTTESTGLOBAL_H
 
 #include <QtCore/qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-
 #if defined(QT_STATIC)
 # define Q_TESTLIB_EXPORT
 #else

src/testlib/testlib.pro

@@ -29,7 +29,6 @@ HEADERS = \
     qtestdata.h \
     qtestevent.h \
     qtesteventloop.h \
-    qtest_global.h \
     qtest_gui.h \
     qtest_network.h \
     qtest_widgets.h \
@@ -40,7 +39,8 @@ HEADERS = \
     qtestsystem.h \
     qtesttouch.h \
     qtestblacklist_p.h \
-    qtesthelpers_p.h
+    qtesthelpers_p.h \
+    qttestglobal.h
 
 SOURCES = \
     qabstractitemmodeltester.cpp \

sync.profile

@@ -73,6 +73,9 @@
     },
     "QtDBus" => {
         "qdbusmacros.h" => "QtDbus/qtdbusglobal.h"
+    },
+    "QtTest" => {
+        "qtest_global.h" => "QtTest/qttestglobal.h"
     }
 );