diff --git a/libs/qt5/qtquickcontrols2/optional-widget-dependency.diff b/libs/qt5/qtquickcontrols2/optional-widget-dependency.diff new file mode 100644 index 0000000000000000000000000000000000000000..f23c4274af1f543083f3d00f844558aa61447c9a --- /dev/null +++ b/libs/qt5/qtquickcontrols2/optional-widget-dependency.diff @@ -0,0 +1,52 @@ +diff --git a/configure.json b/configure.json +index 717877a8c..b55e5994d 100644 +--- a/configure.json ++++ b/configure.json +@@ -1,6 +1,7 @@ + { + "subconfigs": [ + "src/quickcontrols2", +- "src/quicktemplates2" ++ "src/quicktemplates2", ++ "src/imports/platform" + ] + } +diff --git a/src/imports/platform/configure.json b/src/imports/platform/configure.json +new file mode 100644 +index 000000000..c68fa82fb +--- /dev/null ++++ b/src/imports/platform/configure.json +@@ -0,0 +1,18 @@ ++{ ++ "module": "qtlabsplatformplugin", ++ ++ "features": { ++ "widgetplatform": { ++ "label": "Widget platform support", ++ "section": "Qt Labs Platform Plugin", ++ "output": [ "privateFeature" ] ++ } ++ }, ++ ++ "summary": [ ++ { ++ "section": "Qt Labs Platform Plugin", ++ "entries": [ "widgetplatform" ] ++ } ++ ] ++} +diff --git a/src/imports/platform/platform.pro b/src/imports/platform/platform.pro +index d9bcfcb81..5da2b9e68 100644 +--- a/src/imports/platform/platform.pro ++++ b/src/imports/platform/platform.pro +@@ -16,7 +16,9 @@ SOURCES += \ + $$PWD/qtlabsplatformplugin.cpp + + include(platform.pri) +-qtHaveModule(widgets): include(widgets/widgets.pri) ++ ++MODULE = qtlabsplatformplugin ++qtHaveModule(widgets):qtConfig(widgetplatform): include(widgets/widgets.pri) + + CONFIG += no_cxx_module + load(qml_plugin) diff --git a/libs/qt5/qtquickcontrols2/qtquickcontrols2.py b/libs/qt5/qtquickcontrols2/qtquickcontrols2.py index 9bf693c6cf6dcb426e349f0b012ef7bf4067ef84..595e4ccb301301e7e97f75a33b9ca41eb3315c73 100644 --- a/libs/qt5/qtquickcontrols2/qtquickcontrols2.py +++ b/libs/qt5/qtquickcontrols2/qtquickcontrols2.py @@ -5,7 +5,9 @@ import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() - self.patchLevel["5.15.2"] = 1 + self.patchLevel["5.15.2"] = 2 + if CraftCore.compiler.isAndroid: + self.patchToApply["5.15.2"] = [ ("optional-widget-dependency.diff", 1) ] def setDependencies(self): self.runtimeDependencies["libs/qt5/qtbase"] = None