From 0f6a33782b8b52a18bd390552386ce145ea5c972 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 8 Aug 2023 11:34:18 +0300 Subject: [PATCH] export the test component event classes Signed-off-by: Ivailo Monev --- src/test/qbenchmarkmetric_p.h | 3 --- src/test/qtest_gui.h | 2 -- src/test/qtestassert.h | 3 --- src/test/qtestbasicstreamer.h | 1 - src/test/qtestcase.h | 2 -- src/test/qtestevent.h | 12 ++++++------ src/test/qtestkeyboard.h | 1 - 7 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/test/qbenchmarkmetric_p.h b/src/test/qbenchmarkmetric_p.h index 89a698cf4..07252895d 100644 --- a/src/test/qbenchmarkmetric_p.h +++ b/src/test/qbenchmarkmetric_p.h @@ -25,10 +25,8 @@ #include "qtest_global.h" #include "qbenchmarkmetric.h" - QT_BEGIN_NAMESPACE - namespace QTest { const char * benchmarkMetricName(QBenchmarkMetric metric); const char * benchmarkMetricUnit(QBenchmarkMetric metric); @@ -36,5 +34,4 @@ namespace QTest { QT_END_NAMESPACE - #endif // QBENCHMARK_H diff --git a/src/test/qtest_gui.h b/src/test/qtest_gui.h index 2550f493e..2b99b36c9 100644 --- a/src/test/qtest_gui.h +++ b/src/test/qtest_gui.h @@ -38,7 +38,6 @@ QT_BEGIN_NAMESPACE - namespace QTest { @@ -66,5 +65,4 @@ extern void qt_x11_wait_for_window_manager(QWidget *w); QT_END_NAMESPACE - #endif diff --git a/src/test/qtestassert.h b/src/test/qtestassert.h index 4121b2378..c537a9158 100644 --- a/src/test/qtestassert.h +++ b/src/test/qtestassert.h @@ -24,15 +24,12 @@ #include - QT_BEGIN_NAMESPACE - #define QTEST_ASSERT(cond) do {if(!(cond))qt_assert(#cond,__FILE__,__LINE__);} while (0) #define QTEST_ASSERT_X(cond, where, what) do {if(!(cond))qt_assert_x(where, what,__FILE__,__LINE__);} while (0) QT_END_NAMESPACE - #endif diff --git a/src/test/qtestbasicstreamer.h b/src/test/qtestbasicstreamer.h index 31a361291..c1752df51 100644 --- a/src/test/qtestbasicstreamer.h +++ b/src/test/qtestbasicstreamer.h @@ -63,5 +63,4 @@ private: QT_END_NAMESPACE - #endif diff --git a/src/test/qtestcase.h b/src/test/qtestcase.h index 74d238f1a..e2a8b8e56 100644 --- a/src/test/qtestcase.h +++ b/src/test/qtestcase.h @@ -27,10 +27,8 @@ #include #include - QT_BEGIN_NAMESPACE - #define QVERIFY(statement) \ do {\ if (!QTest::qVerify((statement), #statement, "", __FILE__, __LINE__))\ diff --git a/src/test/qtestevent.h b/src/test/qtestevent.h index fa1e372f8..fd913ee6b 100644 --- a/src/test/qtestevent.h +++ b/src/test/qtestevent.h @@ -34,7 +34,7 @@ QT_BEGIN_NAMESPACE -class QTestEvent +class Q_TEST_EXPORT QTestEvent { public: virtual void simulate(QWidget *w) = 0; @@ -44,7 +44,7 @@ public: }; #ifdef QT_GUI_LIB -class QTestKeyEvent: public QTestEvent +class Q_TEST_EXPORT QTestKeyEvent : public QTestEvent { public: inline QTestKeyEvent(QTest::KeyAction action, Qt::Key key, Qt::KeyboardModifiers modifiers, int delay) @@ -70,7 +70,7 @@ protected: Qt::Key _key; }; -class QTestKeyClicksEvent: public QTestEvent +class Q_TEST_EXPORT QTestKeyClicksEvent : public QTestEvent { public: inline QTestKeyClicksEvent(const QString &keys, Qt::KeyboardModifiers modifiers, int delay) @@ -88,7 +88,7 @@ private: int _delay; }; -class QTestMouseEvent: public QTestEvent +class Q_TEST_EXPORT QTestMouseEvent : public QTestEvent { public: inline QTestMouseEvent(QTest::MouseAction action, Qt::MouseButton button, @@ -111,7 +111,7 @@ private: #endif //QT_GUI_LIB -class QTestDelayEvent: public QTestEvent +class Q_TEST_EXPORT QTestDelayEvent : public QTestEvent { public: inline QTestDelayEvent(int msecs): _delay(msecs) {} @@ -123,7 +123,7 @@ private: int _delay; }; -class QTestEventList: public QList +class Q_TEST_EXPORT QTestEventList : public QList { public: inline QTestEventList() : QList() {} diff --git a/src/test/qtestkeyboard.h b/src/test/qtestkeyboard.h index a12364f34..8b42cdfee 100644 --- a/src/test/qtestkeyboard.h +++ b/src/test/qtestkeyboard.h @@ -163,7 +163,6 @@ namespace QTest QT_END_NAMESPACE - #endif // QT_GUI_LIB #endif // QTESTKEYBOARD_H -- 2.11.0