diff --git a/conan/README.txt b/conan/README.txt index df3c2d1d..8994522a 100644 --- a/conan/README.txt +++ b/conan/README.txt @@ -13,6 +13,9 @@ Configuration options: * build_examples Build the examples. Default=True - * builde_python_bindings + * build_python_bindings Build/Generate python bindings (always false for Debug or static builds). Default=False + * build_for_qt6 + Build against Qt6 rather than Qt5. Default=false (Qt5 will be used even if Qt6 is available) + (Make sure the Qt6 bin directory is found in your execute PATH) diff --git a/conan/conanfile.py b/conan/conanfile.py index 74b429bb..f47a12ce 100644 --- a/conan/conanfile.py +++ b/conan/conanfile.py @@ -11,7 +11,7 @@ from conans import ConanFile, CMake, tools class KDDockWidgetsConan(ConanFile): name = "kddockwidgets" - version = "1.3.0" + version = "1.3.1" default_user = "kdab" default_channel = "stable" license = ("https://raw.githubusercontent.com/KDAB/KDDockWidgets/master/LICENSES/GPL-2.0-only.txt", @@ -28,6 +28,7 @@ class KDDockWidgetsConan(ConanFile): "build_examples": [True, False], "build_tests": [True, False], "build_python_bindings": [True, False], + "build_for_qt6": [True, False], } default_options = { @@ -36,6 +37,7 @@ class KDDockWidgetsConan(ConanFile): "build_examples": True, "build_tests": False, "build_python_bindings": False, + "build_for_qt6": False, } def requirements(self): @@ -52,6 +54,7 @@ class KDDockWidgetsConan(ConanFile): self.cmake.definitions["KDDockWidgets_EXAMPLES"] = self.options.build_examples self.cmake.definitions["KDDockWidgets_TESTS"] = self.options.build_tests self.cmake.definitions["KDDockWidgets_PYTHON_BINDINGS"] = self.options.build_python_bindings + self.cmake.definitions["KDDockWidgets_QT6"] = self.options.build_for_qt6 self.cmake.configure() self.cmake.build()