diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-01-04 18:45:18 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-01-12 20:58:41 +0100 |
| commit | 843be43f18ecb007a0bb5fbb9034b8643a28b196 (patch) | |
| tree | 107ee060136fdbf717cf9ca94f5e1deffd106901 /src/qmltest/quicktestresult_p.h | |
| parent | 06ab8d790dfab32472bcc20736c7486bf43beeba (diff) | |
Merge the QtTest and Qt.test.qtestroot QML modules
There is no point in having them separate and this way the plugin can be
optional.
Fixes: QTBUG-89804
Change-Id: Ic7de35f6ee7abde4840841e17d21c2b709f6db7d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src/qmltest/quicktestresult_p.h')
| -rw-r--r-- | src/qmltest/quicktestresult_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h index 7ebfb21186..54799e40aa 100644 --- a/src/qmltest/quicktestresult_p.h +++ b/src/qmltest/quicktestresult_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtQuickTest/quicktestglobal.h> +#include <QtQuickTest/private/quicktestglobal_p.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> #include <QtCore/qstringlist.h> @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE class QUrl; class QuickTestResultPrivate; -class Q_QUICK_TEST_EXPORT QuickTestResult : public QObject +class Q_QUICK_TEST_PRIVATE_EXPORT QuickTestResult : public QObject { Q_OBJECT Q_PROPERTY(QString testCaseName READ testCaseName WRITE setTestCaseName NOTIFY testCaseNameChanged) @@ -77,6 +77,9 @@ class Q_QUICK_TEST_EXPORT QuickTestResult : public QObject Q_PROPERTY(QStringList functionsToRun READ functionsToRun) Q_PROPERTY(QStringList tagsToRun READ tagsToRun) + QML_NAMED_ELEMENT(TestResult) + QML_ADDED_IN_VERSION(1, 0) + public: QuickTestResult(QObject *parent = nullptr); ~QuickTestResult() override; |