diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 13:02:23 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 13:50:14 +0000 |
| commit | f0d23d3ff9da26a71295a6abd356c8d366d17439 (patch) | |
| tree | c68f990a0fda40a16c484ffb6403c165c44a73ba /src/qmltest | |
| parent | 5f07a0e1149ed3df41f3ff5ef55f3f8bbad99909 (diff) | |
Regenerate qtdeclarative before merge
Change-Id: I5710110679220c4e22bc7f8b540f18a51b735ddf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/.prev_CMakeLists.txt | 52 | ||||
| -rw-r--r-- | src/qmltest/CMakeLists.txt | 13 |
2 files changed, 60 insertions, 5 deletions
diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt new file mode 100644 index 0000000000..0661a38709 --- /dev/null +++ b/src/qmltest/.prev_CMakeLists.txt @@ -0,0 +1,52 @@ +# Generated from qmltest.pro. + +##################################################################### +## QuickTest Module: +##################################################################### + +add_qt_module(QuickTest + QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} + SOURCES + qtestoptions_p.h + quicktest.cpp quicktest.h + quicktestevent.cpp quicktestevent_p.h + quicktestglobal.h + quicktestresult.cpp quicktestresult_p.h + DEFINES + QT_NO_FOREACH + QT_NO_URL_CAST_FROM_STRING + LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::Quick + Qt::QuickPrivate + Qt::TestPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::Test +) + +#### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>: +# MODULE_CONFIG = "$${QT.testlib.CONFIG}" +# _LOADED = "qt_module" + +## Scopes: +##################################################################### + +extend_target(QuickTest CONDITION TARGET Qt::Widgets + DEFINES + QT_QMLTEST_WITH_WIDGETS + PUBLIC_LIBRARIES + Qt::Widgets +) + +extend_target(QuickTest CONDITION QT_FEATURE_qml_debug + DEFINES + QT_QML_DEBUG_NO_WARNING +) +add_qt_docs(QuickTest + doc/qtqmltest.qdocconf +) + diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index b42f0aa552..55438e1ff4 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -17,10 +17,13 @@ add_qt_module(QuickTest QT_NO_URL_CAST_FROM_STRING QT_BUILD_QMLTEST_LIB # special case LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::QmlPrivate + Qt::Quick + Qt::QuickPrivate Qt::TestPrivate - Qt::Quick # special case - Qt::QuickPrivate # special case - Qt::QmlPrivate # special case PUBLIC_LIBRARIES Qt::Core Qt::Test @@ -28,7 +31,6 @@ add_qt_module(QuickTest #### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>: # MODULE_CONFIG = "$${QT.testlib.CONFIG}" -# QT_PRIVATE = "quick" "quick-private" "qml-private" "gui" "core-private" "gui-private" # _LOADED = "qt_module" ## Scopes: @@ -45,6 +47,7 @@ extend_target(QuickTest CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) -add_qt_docs( +add_qt_docs(QuickTest doc/qtqmltest.qdocconf ) + |