Skip to content

Commit

Permalink
(#19082) Add QuickPrivate module
Browse files Browse the repository at this point in the history
  • Loading branch information
bog-dan-ro authored Jul 26, 2024
1 parent 0d3a6ed commit 9635424
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions recipes/qt/5.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,8 @@ def _create_private_module(module, dependencies=[]):

if self.options.qtdeclarative:
_create_private_module("Qml", ["CorePrivate", "Qml"])
if self.options.gui:
_create_private_module("Quick", ["CorePrivate", "GuiPrivate", "QmlPrivate", "Quick"])

def package_info(self):
self.cpp_info.set_property("cmake_file_name", "Qt5")
Expand Down Expand Up @@ -1233,6 +1235,7 @@ def _create_plugin(pluginname, libname, plugintype, requires):
self.cpp_info.components["qtQmlImportScanner"].requires = _get_corrected_reqs(["Qml"])
if self.options.gui:
_create_module("Quick", ["Gui", "Qml", "QmlModels"])
_add_build_module("qtQuick", self._cmake_qt5_private_file("Quick"))
if self.options.widgets:
_create_module("QuickWidgets", ["Gui", "Qml", "Quick", "Widgets"])
_create_module("QuickShapes", ["Gui", "Qml", "Quick"])
Expand Down
3 changes: 3 additions & 0 deletions recipes/qt/6.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,8 @@ def _create_private_module(module, dependencies):
save(self, os.path.join(self.package_folder, "lib", "cmake", "Qt6Qml", "conan_qt_qt6_policies.cmake"), textwrap.dedent("""\
set(QT_KNOWN_POLICY_QTP0001 TRUE)
"""))
if self.options.gui and self.options.qtshadertools:
_create_private_module("Quick", ["CorePrivate", "GuiPrivate", "QmlPrivate", "Quick"])

if self.settings.os in ["Windows", "iOS"]:
contents = textwrap.dedent("""\
Expand Down Expand Up @@ -1222,6 +1224,7 @@ def _create_plugin(pluginname, libname, plugintype, requires):
self.cpp_info.components["qtQmlImportScanner"].requires = _get_corrected_reqs(["Qml"])
if qt_quick_enabled:
_create_module("Quick", ["Gui", "Qml", "QmlModels"])
_add_build_module("qtQuick", self._cmake_qt6_private_file("Quick"))
if self.options.widgets:
_create_module("QuickWidgets", ["Gui", "Qml", "Quick", "Widgets"])
_create_module("QuickShapes", ["Gui", "Qml", "Quick"])
Expand Down

0 comments on commit 9635424

Please sign in to comment.