summaryrefslogtreecommitdiffstats
path: root/src/designer/src
diff options
context:
space:
mode:
Diffstat (limited to 'src/designer/src')
-rw-r--r--src/designer/src/components/lib/CMakeLists.txt9
-rw-r--r--src/designer/src/designer/CMakeLists.txt7
-rw-r--r--src/designer/src/lib/CMakeLists.txt14
-rw-r--r--src/designer/src/plugins/activeqt/CMakeLists.txt9
-rw-r--r--src/designer/src/plugins/qquickwidget/CMakeLists.txt8
-rw-r--r--src/designer/src/plugins/qwebview/CMakeLists.txt10
-rw-r--r--src/designer/src/plugins/tools/view3d/CMakeLists.txt6
-rw-r--r--src/designer/src/uitools/CMakeLists.txt11
8 files changed, 45 insertions, 29 deletions
diff --git a/src/designer/src/components/lib/CMakeLists.txt b/src/designer/src/components/lib/CMakeLists.txt
index da3f062ca..c094b756d 100644
--- a/src/designer/src/components/lib/CMakeLists.txt
+++ b/src/designer/src/components/lib/CMakeLists.txt
@@ -112,15 +112,12 @@ qt_add_module(DesignerComponents
../taskmenu
../widgetbox
LIBRARIES
- Qt::DesignerPrivate
- Qt::GuiPrivate
- Qt::WidgetsPrivate
Qt::Xml
PUBLIC_LIBRARIES
Qt::Core
- Qt::Designer
- Qt::Gui
- Qt::Widgets
+ Qt::DesignerPrivate
+ Qt::GuiPrivate
+ Qt::WidgetsPrivate
Qt::Xml
ENABLE_AUTOGEN_TOOLS
uic
diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt
index 2731cfa2d..be0ea16f1 100644
--- a/src/designer/src/designer/CMakeLists.txt
+++ b/src/designer/src/designer/CMakeLists.txt
@@ -33,13 +33,10 @@ qt_add_executable(designer
../lib/sdk
../lib/shared
extra
- LIBRARIES
+ PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::DesignerComponentsPrivate
Qt::DesignerPrivate
- PUBLIC_LIBRARIES
- Qt::Designer
- Qt::DesignerComponents
Qt::Gui
Qt::Network
Qt::Widgets
@@ -128,7 +125,7 @@ qt_extend_target(designer CONDITION QT_CONFIG___contains___static
# QMAKE_BUNDLE_DATA = "FILETYPES"
# QMAKE_INFO_PLIST = "Info_mac.plist"
-qt_extend_target(designer CONDITION UNIX AND NOT APPLE_OSX AND NOT HAIKU
+qt_extend_target(designer CONDITION UNIX AND NOT HAIKU AND NOT MACOS
PUBLIC_LIBRARIES
m
)
diff --git a/src/designer/src/lib/CMakeLists.txt b/src/designer/src/lib/CMakeLists.txt
index 323e190be..24df4582a 100644
--- a/src/designer/src/lib/CMakeLists.txt
+++ b/src/designer/src/lib/CMakeLists.txt
@@ -170,6 +170,10 @@ qt_add_module(Designer
Qt::UiPlugin
Qt::Widgets
Qt::Xml
+ PRIVATE_MODULE_INTERFACE
+ Qt::CorePrivate
+ Qt::GuiPrivate
+ Qt::WidgetsPrivate
ENABLE_AUTOGEN_TOOLS
uic
PRECOMPILED_HEADER
@@ -444,6 +448,11 @@ qt_add_resource(Designer "shared"
## Scopes:
#####################################################################
+qt_extend_target(Designer CONDITION TARGET Qt::OpenGLWidgets
+ PUBLIC_LIBRARIES
+ Qt::OpenGLWidgets
+)
+
qt_extend_target(Designer CONDITION static
DEFINES
QT_DESIGNER_STATIC
@@ -556,3 +565,8 @@ qt_extend_target(Designer CONDITION QT_BUILD_SHARED_LIBS
INCLUDE_DIRECTORIES
../../../shared/qtpropertybrowser
)
+
+qt_extend_target(Designer CONDITION QT_FEATURE_opengl
+ LIBRARIES
+ Qt::OpenGL
+)
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
diff --git a/src/designer/src/uitools/CMakeLists.txt b/src/designer/src/uitools/CMakeLists.txt
index 5babb212f..c377da211 100644
--- a/src/designer/src/uitools/CMakeLists.txt
+++ b/src/designer/src/uitools/CMakeLists.txt
@@ -5,7 +5,6 @@
#####################################################################
qt_add_module(UiTools
- STATIC
SOURCES
../lib/uilib/abstractformbuilder.cpp ../lib/uilib/abstractformbuilder.h
../lib/uilib/formbuilder.cpp ../lib/uilib/formbuilder.h
@@ -32,6 +31,16 @@ qt_add_module(UiTools
## Scopes:
#####################################################################
+
+qt_extend_target(UiTools CONDITION TARGET Qt::OpenGLWidgets
+ PUBLIC_LIBRARIES
+ Qt::OpenGLWidgets
+)
+
+qt_extend_target(UiTools CONDITION QT_FEATURE_opengl
+ LIBRARIES
+ Qt::OpenGL
+)
qt_add_docs(UiTools
doc/qtuitools.qdocconf
)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 11:19:14 +0000