From 719cfa565566e3b9d384068d732eb8cacad24f8d Mon Sep 17 00:00:00 2001 From: Maximilian Goldstein Date: Thu, 18 Mar 2021 13:35:43 +0100 Subject: Generate and install qmltypes for all plugins Pick-to: 6.1 Change-Id: Ib6f0aa7d2fe663f8d1ba090d2c62d57e0073a526 Reviewed-by: Ulf Hermann Reviewed-by: Mitch Curtis --- src/imports/controls/basic/CMakeLists.txt | 1 + src/imports/controls/fusion/CMakeLists.txt | 1 + src/imports/controls/imagine/CMakeLists.txt | 1 + src/imports/controls/material/CMakeLists.txt | 1 + src/imports/controls/universal/CMakeLists.txt | 1 + src/imports/platform/CMakeLists.txt | 3 ++- 6 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/imports') diff --git a/src/imports/controls/basic/CMakeLists.txt b/src/imports/controls/basic/CMakeLists.txt index 28c0d398..805ef1f1 100644 --- a/src/imports/controls/basic/CMakeLists.txt +++ b/src/imports/controls/basic/CMakeLists.txt @@ -9,6 +9,7 @@ qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin VERSION "${CMAKE_PROJECT_VERSION}" CLASSNAME QtQuickControls2BasicStylePlugin GENERATE_QMLTYPES + INSTALL_QMLTYPES SOURCES qquickbasicstyle.cpp qquickbasicstyle_p.h qquickbasictheme.cpp qquickbasictheme_p.h diff --git a/src/imports/controls/fusion/CMakeLists.txt b/src/imports/controls/fusion/CMakeLists.txt index a1e79784..60b1c9af 100644 --- a/src/imports/controls/fusion/CMakeLists.txt +++ b/src/imports/controls/fusion/CMakeLists.txt @@ -11,6 +11,7 @@ qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin IMPORTS QtQuick.Controls.Basic/auto GENERATE_QMLTYPES + INSTALL_QMLTYPES SOURCES qquickfusionstyle.cpp qquickfusionstyle_p.h qquickfusiontheme.cpp qquickfusiontheme_p.h diff --git a/src/imports/controls/imagine/CMakeLists.txt b/src/imports/controls/imagine/CMakeLists.txt index 832e87e6..1e1b733a 100644 --- a/src/imports/controls/imagine/CMakeLists.txt +++ b/src/imports/controls/imagine/CMakeLists.txt @@ -11,6 +11,7 @@ qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin IMPORTS QtQuick.Controls.Basic/auto GENERATE_QMLTYPES + INSTALL_QMLTYPES SOURCES qquickimaginestyle.cpp qquickimaginestyle_p.h qquickimaginetheme.cpp qquickimaginetheme_p.h diff --git a/src/imports/controls/material/CMakeLists.txt b/src/imports/controls/material/CMakeLists.txt index 2547a0f8..8e3cc29d 100644 --- a/src/imports/controls/material/CMakeLists.txt +++ b/src/imports/controls/material/CMakeLists.txt @@ -11,6 +11,7 @@ qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin IMPORTS QtQuick.Controls.Basic/auto GENERATE_QMLTYPES + INSTALL_QMLTYPES SOURCES qquickmaterialstyle.cpp qquickmaterialstyle_p.h qquickmaterialtheme.cpp qquickmaterialtheme_p.h diff --git a/src/imports/controls/universal/CMakeLists.txt b/src/imports/controls/universal/CMakeLists.txt index ce19c5d2..336813a1 100644 --- a/src/imports/controls/universal/CMakeLists.txt +++ b/src/imports/controls/universal/CMakeLists.txt @@ -11,6 +11,7 @@ qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin IMPORTS QtQuick.Controls.Basic/auto GENERATE_QMLTYPES + INSTALL_QMLTYPES SOURCES qquickuniversalstyle.cpp qquickuniversalstyle_p.h qquickuniversaltheme.cpp qquickuniversaltheme_p.h diff --git a/src/imports/platform/CMakeLists.txt b/src/imports/platform/CMakeLists.txt index 36844102..07c99156 100644 --- a/src/imports/platform/CMakeLists.txt +++ b/src/imports/platform/CMakeLists.txt @@ -8,7 +8,8 @@ qt_internal_add_qml_module(qtlabsplatformplugin URI "Qt.labs.platform" VERSION "1.1" CLASSNAME QtLabsPlatformPlugin - SKIP_TYPE_REGISTRATION + GENERATE_QMLTYPES + INSTALL_QMLTYPES SOURCES qquickplatformcolordialog.cpp qquickplatformcolordialog_p.h qquickplatformdialog.cpp qquickplatformdialog_p.h -- cgit v1.2.3