diff options
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/.prev_CMakeLists.txt | 52 | ||||
| -rw-r--r-- | src/qmltest/CMakeLists.txt | 53 | ||||
| -rw-r--r-- | src/qmltest/quicktest.cpp | 4 | ||||
| -rw-r--r-- | src/qmltest/quicktestresult_p.h | 6 |
4 files changed, 110 insertions, 5 deletions
diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt new file mode 100644 index 0000000000..db3f568a7b --- /dev/null +++ b/src/qmltest/.prev_CMakeLists.txt @@ -0,0 +1,52 @@ +# Generated from qmltest.pro. + +##################################################################### +## QuickTest Module: +##################################################################### + +qt_add_module(QuickTest + GENERATE_METATYPES + QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} + SOURCES + qtestoptions_p.h + quicktest.cpp quicktest.h + quicktestglobal.h + quicktestresult.cpp quicktestresult_p.h + DEFINES + QT_NO_FOREACH + QT_NO_URL_CAST_FROM_STRING + LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::QmlPrivate + Qt::Quick + Qt::QuickPrivate + Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Test + PRIVATE_MODULE_INTERFACE + Qt::TestPrivate +) + +#### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>: +# MODULE_CONFIG = "$${QT.testlib.CONFIG}" + +## Scopes: +##################################################################### + +qt_extend_target(QuickTest CONDITION TARGET Qt::Widgets + DEFINES + QT_QMLTEST_WITH_WIDGETS + PUBLIC_LIBRARIES + Qt::Widgets +) + +qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug + DEFINES + QT_QML_DEBUG_NO_WARNING +) +qt_add_docs(QuickTest + doc/qtqmltest.qdocconf +) + diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt new file mode 100644 index 0000000000..4ad0d84928 --- /dev/null +++ b/src/qmltest/CMakeLists.txt @@ -0,0 +1,53 @@ +# Generated from qmltest.pro. + +##################################################################### +## QuickTest Module: +##################################################################### + +qt_add_module(QuickTest + GENERATE_METATYPES + QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} + SOURCES + qtestoptions_p.h + quicktest.cpp quicktest.h + quicktestglobal.h + quicktestresult.cpp quicktestresult_p.h + DEFINES + QT_NO_FOREACH + QT_NO_URL_CAST_FROM_STRING + QT_BUILD_QMLTEST_LIB # special case + LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::QmlPrivate + Qt::Quick + Qt::QuickPrivate + Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Test + PRIVATE_MODULE_INTERFACE + Qt::TestPrivate +) + +#### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>: +# MODULE_CONFIG = "$${QT.testlib.CONFIG}" + +## Scopes: +##################################################################### + +qt_extend_target(QuickTest CONDITION TARGET Qt::Widgets + DEFINES + QT_QMLTEST_WITH_WIDGETS + PUBLIC_LIBRARIES + Qt::Widgets +) + +qt_extend_target(QuickTest CONDITION QT_FEATURE_qml_debug + DEFINES + QT_QML_DEBUG_NO_WARNING +) +qt_add_docs(QuickTest + doc/qtqmltest.qdocconf +) + diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index cfc9221b20..63e51fa4ba 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -52,7 +52,7 @@ #include <QtQml/qqmlpropertymap.h> #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/qquickitem.h> -#include <QtGui/qopengl.h> +#include <qopengl.h> #include <QtCore/qurl.h> #include <QtCore/qfileinfo.h> #include <QtCore/qdir.h> @@ -70,7 +70,7 @@ #include <QtQml/QQmlFileSelector> #include <private/qqmlcomponent_p.h> -#include <private/qv4executablecompilationunit_p.h> +#include <private/qv4resolvedtypereference_p.h> #ifdef QT_QMLTEST_WITH_WIDGETS #include <QtWidgets/QApplication> diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h index 81b9d78830..7ebfb21186 100644 --- a/src/qmltest/quicktestresult_p.h +++ b/src/qmltest/quicktestresult_p.h @@ -158,10 +158,10 @@ public Q_SLOTS: QObject *grabImage(QQuickItem *item); - Q_REVISION(1) QObject *findChild(QObject *parent, const QString &objectName); + Q_REVISION(1, 1) QObject *findChild(QObject *parent, const QString &objectName); - Q_REVISION(13) bool isPolishScheduled(QQuickItem *item) const; - Q_REVISION(13) bool waitForItemPolished(QQuickItem *item, int timeout); + Q_REVISION(1, 13) bool isPolishScheduled(QQuickItem *item) const; + Q_REVISION(1, 13) bool waitForItemPolished(QQuickItem *item, int timeout); public: // Helper functions for the C++ main() shell. |