summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2018-02-13 12:25:10 +0100
committerUlf Hermann <ulf.hermann@qt.io>2018-03-21 10:31:01 +0000
commit4db38197c2bac8bcee9d08a0e20ed2c8d127b8f2 (patch)
tree6c897b10b4de4114306b769e4838e84469dd516b /src/testlib
parent4a56d86ee43bd6be23f70ef2d29ba4b4ebb17029 (diff)
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>
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qabstractitemmodeltester.h2
-rw-r--r--src/testlib/qbenchmark.h2
-rw-r--r--src/testlib/qbenchmark_p.h2
-rw-r--r--src/testlib/qbenchmarkmetric.h2
-rw-r--r--src/testlib/qbenchmarkmetric_p.h2
-rw-r--r--src/testlib/qtest.h2
-rw-r--r--src/testlib/qtestaccessible.h2
-rw-r--r--src/testlib/qtestblacklist_p.h2
-rw-r--r--src/testlib/qtestcase.h2
-rw-r--r--src/testlib/qtestdata.h2
-rw-r--r--src/testlib/qtestevent.h2
-rw-r--r--src/testlib/qtesteventloop.h2
-rw-r--r--src/testlib/qtestkeyboard.h2
-rw-r--r--src/testlib/qtestlog_p.h2
-rw-r--r--src/testlib/qtestmouse.cpp2
-rw-r--r--src/testlib/qtestmouse.h2
-rw-r--r--src/testlib/qtestresult_p.h2
-rw-r--r--src/testlib/qtesttable_p.h2
-rw-r--r--src/testlib/qtesttouch.h2
-rw-r--r--src/testlib/qttestglobal.h (renamed from src/testlib/qtest_global.h)5
-rw-r--r--src/testlib/testlib.pro4
21 files changed, 23 insertions, 24 deletions
diff --git a/src/testlib/qabstractitemmodeltester.h b/src/testlib/qabstractitemmodeltester.h
index 617e189817..e85d7522f7 100644
--- a/src/testlib/qabstractitemmodeltester.h
+++ b/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>
diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h
index 1340fd7715..4a55fcc23e 100644
--- a/src/testlib/qbenchmark.h
+++ b/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
diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h
index dbfa0127b6..3fa9c5f534 100644
--- a/src/testlib/qbenchmark_p.h
+++ b/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
diff --git a/src/testlib/qbenchmarkmetric.h b/src/testlib/qbenchmarkmetric.h
index 6e423473b1..6605606402 100644
--- a/src/testlib/qbenchmarkmetric.h
+++ b/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
diff --git a/src/testlib/qbenchmarkmetric_p.h b/src/testlib/qbenchmarkmetric_p.h
index a036c645bf..049b9711e2 100644
--- a/src/testlib/qbenchmarkmetric_p.h
+++ b/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
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index a5df27e3b9..1cb6a91d33 100644
--- a/src/testlib/qtest.h
+++ b/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>
diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h
index 0470d15ed7..d14dcec031 100644
--- a/src/testlib/qtestaccessible.h
+++ b/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)
diff --git a/src/testlib/qtestblacklist_p.h b/src/testlib/qtestblacklist_p.h
index df205fc77b..08ce052231 100644
--- a/src/testlib/qtestblacklist_p.h
+++ b/src/testlib/qtestblacklist_p.h
@@ -51,7 +51,7 @@
// We mean it.
//
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index cc666c365a..54669c11de 100644
--- a/src/testlib/qtestcase.h
+++ b/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>
diff --git a/src/testlib/qtestdata.h b/src/testlib/qtestdata.h
index c87236fcfc..cf10fed8f3 100644
--- a/src/testlib/qtestdata.h
+++ b/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>
diff --git a/src/testlib/qtestevent.h b/src/testlib/qtestevent.h
index 159e3e01ff..3f6bd20bd8 100644
--- a/src/testlib/qtestevent.h
+++ b/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>
diff --git a/src/testlib/qtesteventloop.h b/src/testlib/qtesteventloop.h
index 81c0b9126c..19ad22565e 100644
--- a/src/testlib/qtesteventloop.h
+++ b/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>
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h
index a7cf78f25a..63501ffb1e 100644
--- a/src/testlib/qtestkeyboard.h
+++ b/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>
diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
index f72c047c35..3d28795188 100644
--- a/src/testlib/qtestlog_p.h
+++ b/src/testlib/qtestlog_p.h
@@ -51,7 +51,7 @@
// We mean it.
//
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/testlib/qtestmouse.cpp b/src/testlib/qtestmouse.cpp
index eda7edbd89..76369e0490 100644
--- a/src/testlib/qtestmouse.cpp
+++ b/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
diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h
index e2835828a1..e3e446577d 100644
--- a/src/testlib/qtestmouse.h
+++ b/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>
diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h
index 061ca5f311..4df75b2805 100644
--- a/src/testlib/qtestresult_p.h
+++ b/src/testlib/qtestresult_p.h
@@ -51,7 +51,7 @@
// We mean it.
//
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/testlib/qtesttable_p.h b/src/testlib/qtesttable_p.h
index 53de9a2f43..d2f389a134 100644
--- a/src/testlib/qtesttable_p.h
+++ b/src/testlib/qtesttable_p.h
@@ -51,7 +51,7 @@
// We mean it.
//
-#include <QtTest/qtest_global.h>
+#include <QtTest/qttestglobal.h>
QT_BEGIN_NAMESPACE
diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h
index 83ca83602e..20a9476ee7 100644
--- a/src/testlib/qtesttouch.h
+++ b/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>
diff --git a/src/testlib/qtest_global.h b/src/testlib/qttestglobal.h
index 3fbb1d428c..d07464345d 100644
--- a/src/testlib/qtest_global.h
+++ b/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
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index 109feee630..1e1f21e740 100644
--- a/src/testlib/testlib.pro
+++ b/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 \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 07:48:07 +0000