8 files changed, 15 insertions, 27 deletions
diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt
index f42d6cc44b..51fd6648ca 100644
--- a/src/qmltest/CMakeLists.txt
+++ b/src/qmltest/CMakeLists.txt
@@ -49,6 +49,7 @@ qt_internal_add_qml_module(QuickTest
         Qt::Test
     PRIVATE_MODULE_INTERFACE
         Qt::TestPrivate
+    GENERATE_CPP_EXPORTS
 )
 
 qt_internal_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug
diff --git a/src/qmltest/quicktest.h b/src/qmltest/quicktest.h
index 7687282d2a..4dd9127b18 100644
--- a/src/qmltest/quicktest.h
+++ b/src/qmltest/quicktest.h
@@ -12,8 +12,8 @@ QT_BEGIN_NAMESPACE
 class QQuickItem;
 class QQuickWindow;
 
-Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name, const char *sourceDir);
-Q_QUICK_TEST_EXPORT int quick_test_main_with_setup(int argc, char **argv, const char *name, const char *sourceDir, QObject *setup);
+Q_QMLTEST_EXPORT int quick_test_main(int argc, char **argv, const char *name, const char *sourceDir);
+Q_QMLTEST_EXPORT int quick_test_main_with_setup(int argc, char **argv, const char *name, const char *sourceDir, QObject *setup);
 
 #ifdef QUICK_TEST_SOURCE_DIR
 
@@ -68,17 +68,17 @@ Q_QUICK_TEST_EXPORT int quick_test_main_with_setup(int argc, char **argv, const
 namespace QQuickTest {
 static const int defaultTimeout = 5000;
 
-Q_QUICK_TEST_EXPORT bool qIsPolishScheduled(const QQuickItem *item);
-Q_QUICK_TEST_EXPORT bool qIsPolishScheduled(const QQuickWindow *window);
+Q_QMLTEST_EXPORT bool qIsPolishScheduled(const QQuickItem *item);
+Q_QMLTEST_EXPORT bool qIsPolishScheduled(const QQuickWindow *window);
 
 #if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
 #if QT_DEPRECATED_SINCE(6, 4)
     QT_DEPRECATED_X("Use qWaitForPolish(QQuickItem *) instead")
-    Q_QUICK_TEST_EXPORT bool qWaitForItemPolished(const QQuickItem *item, int timeout = defaultTimeout);
+    Q_QMLTEST_EXPORT bool qWaitForItemPolished(const QQuickItem *item, int timeout = defaultTimeout);
 #endif
 #endif
-Q_QUICK_TEST_EXPORT bool qWaitForPolish(const QQuickItem *item, int timeout = defaultTimeout);
-Q_QUICK_TEST_EXPORT bool qWaitForPolish(const QQuickWindow *window, int timeout = defaultTimeout);
+Q_QMLTEST_EXPORT bool qWaitForPolish(const QQuickItem *item, int timeout = defaultTimeout);
+Q_QMLTEST_EXPORT bool qWaitForPolish(const QQuickWindow *window, int timeout = defaultTimeout);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qmltest/quicktest_p.h b/src/qmltest/quicktest_p.h
index 756ed78c4e..2deffab8ca 100644
--- a/src/qmltest/quicktest_p.h
+++ b/src/qmltest/quicktest_p.h
@@ -25,7 +25,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICK_TEST_EXPORT QTestRootObject : public QObject
+class Q_QMLTEST_EXPORT QTestRootObject : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool windowShown READ windowShown NOTIFY windowShownChanged)
diff --git a/src/qmltest/quicktestevent_p.h b/src/qmltest/quicktestevent_p.h
index f97f91c91f..8f75dc1dd9 100644
--- a/src/qmltest/quicktestevent_p.h
+++ b/src/qmltest/quicktestevent_p.h
@@ -25,7 +25,7 @@
 QT_BEGIN_NAMESPACE
 
 class QuickTestEvent;
-class Q_QUICK_TEST_EXPORT QQuickTouchEventSequence : public QObject
+class Q_QMLTEST_EXPORT QQuickTouchEventSequence : public QObject
 {
     Q_OBJECT
     QML_ANONYMOUS
@@ -45,7 +45,7 @@ private:
     QuickTestEvent * const m_testEvent;
 };
 
-class Q_QUICK_TEST_EXPORT QuickTestEvent : public QObject
+class Q_QMLTEST_EXPORT QuickTestEvent : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int defaultMouseDelay READ defaultMouseDelay FINAL)
diff --git a/src/qmltest/quicktestglobal.h b/src/qmltest/quicktestglobal.h
index 42f886dfac..3f8c5c3582 100644
--- a/src/qmltest/quicktestglobal.h
+++ b/src/qmltest/quicktestglobal.h
@@ -5,19 +5,6 @@
 #define TESTQUICKGLOBAL_H
 
 #include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_STATIC
-#  if defined(QT_BUILD_QMLTEST_LIB)
-#    define Q_QUICK_TEST_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_QUICK_TEST_EXPORT Q_DECL_IMPORT
-#  endif
-#else
-#  define Q_QUICK_TEST_EXPORT
-#endif
-
-QT_END_NAMESPACE
+#include <QtQuickTest/qtquicktestexports.h>
 
 #endif
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 9c7dc89f66..519bb7ba43 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -41,7 +41,7 @@ static const char *globalProgramName = nullptr;
 static bool loggingStarted = false;
 static QBenchmarkGlobalData globalBenchmarkData;
 
-class Q_QUICK_TEST_EXPORT QuickTestImageObject : public QObject
+class Q_QMLTEST_EXPORT QuickTestImageObject : public QObject
 {
     Q_OBJECT
 
diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h
index ea0e29898d..83e9397635 100644
--- a/src/qmltest/quicktestresult_p.h
+++ b/src/qmltest/quicktestresult_p.h
@@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE
 class QUrl;
 class QuickTestResultPrivate;
 
-class Q_QUICK_TEST_EXPORT QuickTestResult : public QObject
+class Q_QMLTEST_EXPORT QuickTestResult : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString testCaseName READ testCaseName WRITE setTestCaseName NOTIFY testCaseNameChanged)
diff --git a/src/qmltest/quicktestutil_p.h b/src/qmltest/quicktestutil_p.h
index 42f5f5c025..d9c0241cbe 100644
--- a/src/qmltest/quicktestutil_p.h
+++ b/src/qmltest/quicktestutil_p.h
@@ -24,7 +24,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICK_TEST_EXPORT QuickTestUtil : public QObject
+class Q_QMLTEST_EXPORT QuickTestUtil : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool printAvailableFunctions READ printAvailableFunctions NOTIFY printAvailableFunctionsChanged)