diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-08-20 10:35:52 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-03 10:43:40 +0000 |
commit | ae890def175bfc0f002cc0fcc3aa1bd1fbf2c854 (patch) | |
tree | a775572db1b8984c14648b3add906b483b589ed6 /src | |
parent | 8634976c3088241ce930e21f4f9288e60b56fad8 (diff) |
Add desginer plugin to cmake build
Fixes: QTBUG-95668
Change-Id: If3613043bfad00871b847c57a3e0961a67cec89b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit a211a19950112a942275108f148aa46be061438a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/webenginewidgets/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/webenginewidgets/plugins/qwebengineview/CMakeLists.txt | 22 | ||||
-rw-r--r-- | src/webenginewidgets/plugins/qwebengineview/images/qwebengineview.png (renamed from src/plugins/qwebengineview/images/qwebengineview.png) | bin | 1473 -> 1473 bytes | |||
-rw-r--r-- | src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.cpp (renamed from src/plugins/qwebengineview/qwebengineview_plugin.cpp) | 0 | ||||
-rw-r--r-- | src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.h (renamed from src/plugins/qwebengineview/qwebengineview_plugin.h) | 0 |
5 files changed, 27 insertions, 1 deletions
diff --git a/src/webenginewidgets/CMakeLists.txt b/src/webenginewidgets/CMakeLists.txt index 6dedf2187..6a25e7297 100644 --- a/src/webenginewidgets/CMakeLists.txt +++ b/src/webenginewidgets/CMakeLists.txt @@ -1,4 +1,8 @@ - +if(TARGET Qt::Designer) + add_subdirectory(plugins/qwebengineview) +else() + message(WARNING "Qt tools Designer is required to compile designer plugin") +endif() qt_internal_add_module(WebEngineWidgets SOURCES api/qtwebenginewidgetsglobal.h diff --git a/src/webenginewidgets/plugins/qwebengineview/CMakeLists.txt b/src/webenginewidgets/plugins/qwebengineview/CMakeLists.txt new file mode 100644 index 000000000..3e6f324da --- /dev/null +++ b/src/webenginewidgets/plugins/qwebengineview/CMakeLists.txt @@ -0,0 +1,22 @@ +qt_internal_add_plugin(QWebEngineViewPlugin + OUTPUT_NAME qwebengineview + PLUGIN_TYPE designer + SOURCES + qwebengineview_plugin.cpp qwebengineview_plugin.h + LIBRARIES + Qt::Core + Qt::Designer + Qt::Gui + Qt::WebEngineWidgets +) + +set(qwebengineview_plugin_resource_files + "images/qwebengineview.png" +) + +qt_internal_add_resource(QWebEngineViewPlugin "qwebengineview_plugin" + PREFIX + "/qt-project.org/qwebengineview" + FILES + ${qwebengineview_plugin_resource_files} +) diff --git a/src/plugins/qwebengineview/images/qwebengineview.png b/src/webenginewidgets/plugins/qwebengineview/images/qwebengineview.png Binary files differindex 01a0920c9..01a0920c9 100644 --- a/src/plugins/qwebengineview/images/qwebengineview.png +++ b/src/webenginewidgets/plugins/qwebengineview/images/qwebengineview.png diff --git a/src/plugins/qwebengineview/qwebengineview_plugin.cpp b/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.cpp index dff041800..dff041800 100644 --- a/src/plugins/qwebengineview/qwebengineview_plugin.cpp +++ b/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.cpp diff --git a/src/plugins/qwebengineview/qwebengineview_plugin.h b/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.h index 8c0960adc..8c0960adc 100644 --- a/src/plugins/qwebengineview/qwebengineview_plugin.h +++ b/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.h |