diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-06-02 13:45:56 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-06-19 12:52:39 +0200 |
| commit | 4e92dc14b86655154f70e8a1093cc9f3aae1604f (patch) | |
| tree | c66970069855bc0b06f8e88b7698ea870187ce1f /src/webenginequick | |
| parent | 0ddaf1cebd2ae1df3733bc056296428287aaefd7 (diff) | |
Add 'testsupport' to cmake builds
This enables running more tests.
Fix issues with tst_qquickwebengineviewgraphics.
Pick-to: 6.2
Change-Id: Ib223b4e723a7192c18202e8d5dd65d83872f3336
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginequick')
| -rw-r--r-- | src/webenginequick/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/webenginequick/configure.cmake | 2 | ||||
| -rw-r--r-- | src/webenginequick/testsupport/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/webenginequick/testsupport/plugin.cpp | 1 |
4 files changed, 31 insertions, 2 deletions
diff --git a/src/webenginequick/CMakeLists.txt b/src/webenginequick/CMakeLists.txt index dd4c8cd39..26cfdeec0 100644 --- a/src/webenginequick/CMakeLists.txt +++ b/src/webenginequick/CMakeLists.txt @@ -1,9 +1,12 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS Gui Qml Quick) -find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS PrintSupport WebChannel Positioning) +find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS PrintSupport WebChannel Positioning Test) get_configure_mode(configureMode) add_subdirectory(plugin) +if(QT_FEATURE_webenginequick_testsupport) + add_subdirectory(testsupport) +endif() qt_internal_add_module(WebEngineQuick ${configureMode} SOURCES @@ -43,4 +46,12 @@ qt_internal_add_module(WebEngineQuick Qt::Quick Qt::WebEngineCore ) + +qt_internal_extend_target(WebEngineQuick CONDITION QT_FEATURE_webenginequick_testsupport + SOURCES + api/qquickwebenginetestsupport.cpp api/qquickwebenginetestsupport_p.h + LIBRARIES + Qt::TestPrivate +) + make_install_only(WebEngineQuick) diff --git a/src/webenginequick/configure.cmake b/src/webenginequick/configure.cmake index 5f095ca51..19dded637 100644 --- a/src/webenginequick/configure.cmake +++ b/src/webenginequick/configure.cmake @@ -8,7 +8,7 @@ qt_feature("webenginequick-ui-delegates" PRIVATE ) qt_feature("webenginequick-testsupport" PRIVATE LABEL "Test Support" - AUTODETECT FALSE + AUTODETECT QT_FEATURE_webengine_developer_build ) qt_configure_add_summary_section(NAME "Qt WebEngineQuick") qt_configure_add_summary_entry(ARGS "webenginequick-qml") diff --git a/src/webenginequick/testsupport/CMakeLists.txt b/src/webenginequick/testsupport/CMakeLists.txt new file mode 100644 index 000000000..57805a450 --- /dev/null +++ b/src/webenginequick/testsupport/CMakeLists.txt @@ -0,0 +1,17 @@ +qt_internal_add_qml_module(qtwebenginetestsupportplugin + URI "QtWebEngine.testsupport" + VERSION "${PROJECT_VERSION}" + CLASS_NAME QtWebEngineTestSupportPlugin + PLUGIN_TARGET qtwebenginetestsupportplugin + NO_GENERATE_PLUGIN_SOURCE + NO_PLUGIN_OPTIONAL + NO_GENERATE_QMLTYPES + INSTALL_SOURCE_QMLTYPES "plugins.qmltypes" + SOURCES + plugin.cpp + LIBRARIES + Qt::GuiPrivate + Qt::Qml + Qt::WebEngineQuickPrivate +) +make_install_only(qtwebenginetestsupportplugin) diff --git a/src/webenginequick/testsupport/plugin.cpp b/src/webenginequick/testsupport/plugin.cpp index 02e6d66c4..1880c2733 100644 --- a/src/webenginequick/testsupport/plugin.cpp +++ b/src/webenginequick/testsupport/plugin.cpp @@ -39,6 +39,7 @@ #include <QtQml> +#include <QtQml/qqmlextensionplugin.h> #include <QtWebEngineQuick/private/qquickwebenginetestsupport_p.h> QT_BEGIN_NAMESPACE |