diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:35:40 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 16:25:40 +0000 |
commit | 3b673994ea0311616db7022cef859705e25cdfab (patch) | |
tree | 7e637d7c5df75f121fce53ac8aeb59178e21981c /src/designer/src/plugins | |
parent | d9a3e03934076aea8852f1c4b142a5ecfeea0297 (diff) |
CMake: Regenerate projects after mergewip/cmake
Plus additional adjustments.
Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/designer/src/plugins')
4 files changed, 16 insertions, 17 deletions
diff --git a/src/designer/src/plugins/activeqt/CMakeLists.txt b/src/designer/src/plugins/activeqt/CMakeLists.txt index dbeef1cf5..f7e39b759 100644 --- a/src/designer/src/plugins/activeqt/CMakeLists.txt +++ b/src/designer/src/plugins/activeqt/CMakeLists.txt @@ -1,24 +1,23 @@ # Generated from activeqt.pro. ##################################################################### -## qaxwidget Plugin: +## QAxWidgetPlugin Plugin: ##################################################################### -qt_add_plugin(qaxwidget +qt_add_plugin(QAxWidgetPlugin + OUTPUT_NAME qaxwidget TYPE designer - CLASS_NAME QAxWidgetPlugin SOURCES qaxwidgetextrainfo.cpp qaxwidgetextrainfo.h qaxwidgetplugin.cpp qaxwidgetplugin.h qaxwidgetpropertysheet.cpp qaxwidgetpropertysheet.h qaxwidgettaskmenu.cpp qaxwidgettaskmenu.h qdesigneraxwidget.cpp qdesigneraxwidget.h - LIBRARIES - Qt::DesignerPrivate PUBLIC_LIBRARIES Qt::AxContainer Qt::Core Qt::Designer + Qt::DesignerPrivate Qt::Gui Qt::Widgets ) diff --git a/src/designer/src/plugins/qquickwidget/CMakeLists.txt b/src/designer/src/plugins/qquickwidget/CMakeLists.txt index f379e7a39..dc726733f 100644 --- a/src/designer/src/plugins/qquickwidget/CMakeLists.txt +++ b/src/designer/src/plugins/qquickwidget/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from qquickwidget.pro. ##################################################################### -## qquickwidget Plugin: +## QQuickWidgetPlugin Plugin: ##################################################################### -qt_add_plugin(qquickwidget +qt_add_plugin(QQuickWidgetPlugin + OUTPUT_NAME qquickwidget TYPE designer - CLASS_NAME QQuickWidgetPlugin SOURCES qquickwidget_plugin.cpp qquickwidget_plugin.h PUBLIC_LIBRARIES @@ -22,7 +22,7 @@ set(qquickwidget_plugin_resource_files "images/qquickwidget.png" ) -qt_add_resource(qquickwidget "qquickwidget_plugin" +qt_add_resource(QQuickWidgetPlugin "qquickwidget_plugin" PREFIX "/qt-project.org/qquickwidget" FILES diff --git a/src/designer/src/plugins/qwebview/CMakeLists.txt b/src/designer/src/plugins/qwebview/CMakeLists.txt index 120c9dcf3..a0bad48f2 100644 --- a/src/designer/src/plugins/qwebview/CMakeLists.txt +++ b/src/designer/src/plugins/qwebview/CMakeLists.txt @@ -1,20 +1,20 @@ # Generated from qwebview.pro. ##################################################################### -## qwebview Plugin: +## QWebViewPlugin Plugin: ##################################################################### -qt_add_plugin(qwebview +qt_add_plugin(QWebViewPlugin + OUTPUT_NAME qwebview TYPE designer - CLASS_NAME QWebViewPlugin SOURCES qwebview_plugin.cpp qwebview_plugin.h PUBLIC_LIBRARIES Qt::Core Qt::Designer Qt::Gui + Qt::WebKitWidgets Qt::Widgets - webkitwidgets ) # Resources: @@ -22,7 +22,7 @@ set(qwebview_plugin_resource_files "images/qwebview.png" ) -qt_add_resource(qwebview "qwebview_plugin" +qt_add_resource(QWebViewPlugin "qwebview_plugin" PREFIX "/qt-project.org/qwebview" FILES diff --git a/src/designer/src/plugins/tools/view3d/CMakeLists.txt b/src/designer/src/plugins/tools/view3d/CMakeLists.txt index b5424190f..89585683c 100644 --- a/src/designer/src/plugins/tools/view3d/CMakeLists.txt +++ b/src/designer/src/plugins/tools/view3d/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from view3d.pro. ##################################################################### -## view3d Plugin: +## QView3DPlugin Plugin: ##################################################################### -qt_add_plugin(view3d +qt_add_plugin(QView3DPlugin + OUTPUT_NAME view3d TYPE designer - CLASS_NAME QView3DPlugin SOURCES view3d.cpp view3d.h view3d_global.h |