diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-08-20 10:35:52 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2021-09-01 12:12:03 +0200 |
commit | a211a19950112a942275108f148aa46be061438a (patch) | |
tree | c027bcf8b520b78e40e1b2a33d8fc4aa02585536 | |
parent | 6a2352716dd223f2308eae6936885d9f9ba53060 (diff) |
Add desginer plugin to cmake build
Fixes: QTBUG-95668
Pick-to: 6.2
Change-Id: If3613043bfad00871b847c57a3e0961a67cec89b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-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 |
6 files changed, 28 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 34e67e618..03dbcc61c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ project(QtWebEngine find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS Gui Widgets Network OpenGL OpenGLWidgets Quick Qml PrintSupport - WebChannel Positioning QuickControls2 Test QuickWidgets QuickTest WebSockets + WebChannel Positioning QuickControls2 Test QuickWidgets QuickTest WebSockets Designer ) set(WEBENGINE_MODULE_BUILD TRUE) qt_build_repo() 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 |