diff --git a/src/testlib/qabstractitemmodeltester.h b/src/testlib/qabstractitemmodeltester.h index 617e1898178..e85d7522f7e 100644 --- a/src/testlib/qabstractitemmodeltester.h +++ b/src/testlib/qabstractitemmodeltester.h @@ -30,7 +30,7 @@ #define QABSTRACTITEMMODELTESTER_H #include -#include +#include #ifdef QT_GUI_LIB #include diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h index 1340fd77150..4a55fcc23ec 100644 --- a/src/testlib/qbenchmark.h +++ b/src/testlib/qbenchmark.h @@ -40,7 +40,7 @@ #ifndef QBENCHMARK_H #define QBENCHMARK_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h index dbfa0127b68..3fa9c5f5348 100644 --- a/src/testlib/qbenchmark_p.h +++ b/src/testlib/qbenchmark_p.h @@ -69,7 +69,7 @@ #include #include -#include +#include #ifdef QTESTLIB_USE_VALGRIND #include #endif diff --git a/src/testlib/qbenchmarkmetric.h b/src/testlib/qbenchmarkmetric.h index 6e423473b1e..66056064022 100644 --- a/src/testlib/qbenchmarkmetric.h +++ b/src/testlib/qbenchmarkmetric.h @@ -41,7 +41,7 @@ #ifndef QBENCHMARKMETRIC_H #define QBENCHMARKMETRIC_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/testlib/qbenchmarkmetric_p.h b/src/testlib/qbenchmarkmetric_p.h index a036c645bfb..049b9711e2f 100644 --- a/src/testlib/qbenchmarkmetric_p.h +++ b/src/testlib/qbenchmarkmetric_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index a5df27e3b9f..1cb6a91d333 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -41,7 +41,7 @@ #ifndef QTEST_H #define QTEST_H -#include +#include #include #include #include diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h index 0470d15ed73..d14dcec0311 100644 --- a/src/testlib/qtestaccessible.h +++ b/src/testlib/qtestaccessible.h @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #if QT_CONFIG(accessibility) diff --git a/src/testlib/qtestblacklist_p.h b/src/testlib/qtestblacklist_p.h index df205fc77bc..08ce0522319 100644 --- a/src/testlib/qtestblacklist_p.h +++ b/src/testlib/qtestblacklist_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index cc666c365ad..54669c11de0 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -40,7 +40,7 @@ #ifndef QTESTCASE_H #define QTESTCASE_H -#include +#include #include #include diff --git a/src/testlib/qtestdata.h b/src/testlib/qtestdata.h index c87236fcfca..cf10fed8f3b 100644 --- a/src/testlib/qtestdata.h +++ b/src/testlib/qtestdata.h @@ -40,7 +40,7 @@ #ifndef QTESTDATA_H #define QTESTDATA_H -#include +#include #include #include diff --git a/src/testlib/qtestevent.h b/src/testlib/qtestevent.h index 159e3e01fff..3f6bd20bd85 100644 --- a/src/testlib/qtestevent.h +++ b/src/testlib/qtestevent.h @@ -45,7 +45,7 @@ #pragma qt_no_master_include #endif -#include +#include #ifdef QT_GUI_LIB #include #include diff --git a/src/testlib/qtesteventloop.h b/src/testlib/qtesteventloop.h index 81c0b9126ca..19ad22565ea 100644 --- a/src/testlib/qtesteventloop.h +++ b/src/testlib/qtesteventloop.h @@ -40,7 +40,7 @@ #ifndef QTESTEVENTLOOP_H #define QTESTEVENTLOOP_H -#include +#include #include #include diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index a7cf78f25a3..63501ffb1e9 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -46,7 +46,7 @@ #endif #include -#include +#include #include #include diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index f72c047c352..3d287951884 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtestmouse.cpp b/src/testlib/qtestmouse.cpp index eda7edbd896..76369e04908 100644 --- a/src/testlib/qtestmouse.cpp +++ b/src/testlib/qtestmouse.cpp @@ -39,7 +39,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index e2835828a17..e3e446577d8 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -45,7 +45,7 @@ #pragma qt_no_master_include #endif -#include +#include #include #include #include diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h index 061ca5f311d..4df75b2805f 100644 --- a/src/testlib/qtestresult_p.h +++ b/src/testlib/qtestresult_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtesttable_p.h b/src/testlib/qtesttable_p.h index 53de9a2f434..d2f389a1343 100644 --- a/src/testlib/qtesttable_p.h +++ b/src/testlib/qtesttable_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h index 83ca83602ed..20a9476ee7f 100644 --- a/src/testlib/qtesttouch.h +++ b/src/testlib/qtesttouch.h @@ -45,7 +45,7 @@ #pragma qt_no_master_include #endif -#include +#include #include #include #include diff --git a/src/testlib/qtest_global.h b/src/testlib/qttestglobal.h similarity index 98% rename from src/testlib/qtest_global.h rename to src/testlib/qttestglobal.h index 3fbb1d428c2..d07464345d2 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 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 109feee630f..1e1f21e7400 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 \ diff --git a/sync.profile b/sync.profile index 6a50e311029..c674aab2f37 100644 --- a/sync.profile +++ b/sync.profile @@ -73,6 +73,9 @@ }, "QtDBus" => { "qdbusmacros.h" => "QtDbus/qtdbusglobal.h" + }, + "QtTest" => { + "qtest_global.h" => "QtTest/qttestglobal.h" } );