From 4ecf82795de54fba530ac9c386f3afff2174edbd Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 9 Jan 2012 08:53:17 +0100 Subject: Remove use of QT_MODULE from library These defines were there to aid in the commercial licensing scheme we used long ago, and are no longer needed. Keep a QT_MODULE(x) define so other modules continue compiling. Change-Id: I8fd76cd5270df8f14aee746b6cf32ebf7c23fec7 Reviewed-by: Lars Knoll --- src/testlib/qbenchmark.h | 1 - src/testlib/qbenchmarkmetric.h | 1 - src/testlib/qbenchmarkmetric_p.h | 1 - src/testlib/qsignalspy.h | 1 - src/testlib/qtest.h | 1 - src/testlib/qtest_global.h | 1 - src/testlib/qtest_gui.h | 1 - src/testlib/qtestaccessible.h | 1 - src/testlib/qtestassert.h | 1 - src/testlib/qtestcase.h | 1 - src/testlib/qtestcoreelement_p.h | 1 - src/testlib/qtestcorelist_p.h | 1 - src/testlib/qtestdata.h | 1 - src/testlib/qtestelement_p.h | 1 - src/testlib/qtestelementattribute_p.h | 1 - src/testlib/qtestevent.h | 1 - src/testlib/qtesteventloop.h | 1 - src/testlib/qtestkeyboard.h | 1 - src/testlib/qtestmouse.h | 1 - src/testlib/qtestspontaneevent.h | 1 - src/testlib/qtestsystem.h | 1 - src/testlib/qtesttouch.h | 1 - src/testlib/qtestxunitstreamer_p.h | 1 - 23 files changed, 23 deletions(-) (limited to 'src/testlib') diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h index 93ac011a73..d91fcf8f38 100644 --- a/src/testlib/qbenchmark.h +++ b/src/testlib/qbenchmark.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qbenchmarkmetric.h b/src/testlib/qbenchmarkmetric.h index 9ec7389b3b..56f62f9479 100644 --- a/src/testlib/qbenchmarkmetric.h +++ b/src/testlib/qbenchmarkmetric.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qbenchmarkmetric_p.h b/src/testlib/qbenchmarkmetric_p.h index c0a9c1e2b4..c2a5dd40a6 100644 --- a/src/testlib/qbenchmarkmetric_p.h +++ b/src/testlib/qbenchmarkmetric_p.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { const char * benchmarkMetricName(QBenchmarkMetric metric); diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index 9534fafc06..d6673667b9 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QVariant; diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index d67d3f0d34..aade9529d3 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -64,7 +64,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h index 4207493f29..d86c5e12e6 100644 --- a/src/testlib/qtest_global.h +++ b/src/testlib/qtest_global.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) #if !defined(QT_SHARED) && !defined(QT_DLL) # define Q_TESTLIB_EXPORT diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index 346b3ec653..32502cc9a5 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -73,7 +73,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h index d20742157b..de9fcc6e42 100644 --- a/src/testlib/qtestaccessible.h +++ b/src/testlib/qtestaccessible.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QObject; diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h index ee989d1dbd..c5f9efdd3d 100644 --- a/src/testlib/qtestassert.h +++ b/src/testlib/qtestassert.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (0) diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 20e7bc9baf..04b75e386b 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) #define QVERIFY(statement) \ do {\ diff --git a/src/testlib/qtestcoreelement_p.h b/src/testlib/qtestcoreelement_p.h index f7db07ac88..f5e04d66c5 100644 --- a/src/testlib/qtestcoreelement_p.h +++ b/src/testlib/qtestcoreelement_p.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) template class QTestCoreElement: public QTestCoreList diff --git a/src/testlib/qtestcorelist_p.h b/src/testlib/qtestcorelist_p.h index 9723502d69..32a5faaa97 100644 --- a/src/testlib/qtestcorelist_p.h +++ b/src/testlib/qtestcorelist_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) template class QTestCoreList diff --git a/src/testlib/qtestdata.h b/src/testlib/qtestdata.h index 654744acf0..31843bf0be 100644 --- a/src/testlib/qtestdata.h +++ b/src/testlib/qtestdata.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QTestTable; class QTestDataPrivate; diff --git a/src/testlib/qtestelement_p.h b/src/testlib/qtestelement_p.h index 0e35592274..bff88ce276 100644 --- a/src/testlib/qtestelement_p.h +++ b/src/testlib/qtestelement_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QTestElement: public QTestCoreElement { diff --git a/src/testlib/qtestelementattribute_p.h b/src/testlib/qtestelementattribute_p.h index 52fa1a2c23..310193607c 100644 --- a/src/testlib/qtestelementattribute_p.h +++ b/src/testlib/qtestelementattribute_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtestevent.h b/src/testlib/qtestevent.h index 4a0dfbef7f..d51a30353a 100644 --- a/src/testlib/qtestevent.h +++ b/src/testlib/qtestevent.h @@ -62,7 +62,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QTestEvent { diff --git a/src/testlib/qtesteventloop.h b/src/testlib/qtesteventloop.h index ab79368e1b..92a8c1c505 100644 --- a/src/testlib/qtesteventloop.h +++ b/src/testlib/qtesteventloop.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class Q_TESTLIB_EXPORT QTestEventLoop : public QObject { diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index e6db251a02..f2e516a22f 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -67,7 +67,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index 429fab0b29..04ae113513 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -65,7 +65,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtestspontaneevent.h b/src/testlib/qtestspontaneevent.h index b86f222eaf..295042e1c3 100644 --- a/src/testlib/qtestspontaneevent.h +++ b/src/testlib/qtestspontaneevent.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) #ifndef QTEST_NO_SIZEOF_CHECK template diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h index 189f7b7dd8..a2eee8b8a0 100644 --- a/src/testlib/qtestsystem.h +++ b/src/testlib/qtestsystem.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QWidget; #ifdef Q_WS_X11 diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h index 308697ecfa..ffbd7b22bd 100644 --- a/src/testlib/qtesttouch.h +++ b/src/testlib/qtesttouch.h @@ -62,7 +62,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtestxunitstreamer_p.h b/src/testlib/qtestxunitstreamer_p.h index f2c583770c..64e138423f 100644 --- a/src/testlib/qtestxunitstreamer_p.h +++ b/src/testlib/qtestxunitstreamer_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QTestElement; class QTestElementAttribute; -- cgit v1.2.3