diff --git a/recipes/qcustomplot/all/conandata.yml b/recipes/qcustomplot/all/conandata.yml index 9655ef7e13aab..9b9ecc2f4a023 100644 --- a/recipes/qcustomplot/all/conandata.yml +++ b/recipes/qcustomplot/all/conandata.yml @@ -5,9 +5,6 @@ sources: "2.1.0": url: "https://www.qcustomplot.com/release/2.1.0fixed/QCustomPlot-source.tar.gz" sha256: "357b78be0f52b2d01c17ec3e2e1271255761810af7e8a9476cef51fccf1a0f44" - "1.3.2": - url: "https://www.qcustomplot.com/release/1.3.2/QCustomPlot.tar.gz" - sha256: "ea2ed5712c2020b25f40eacabd0926ef71a7f07e2a3771c32d53ace1f47123eb" patches: "2.1.0": - patch_file: "patches/0001-fix-for-qt6.2.patch" diff --git a/recipes/qcustomplot/all/conanfile.py b/recipes/qcustomplot/all/conanfile.py index 959e00e8825f1..1084226db02ee 100644 --- a/recipes/qcustomplot/all/conanfile.py +++ b/recipes/qcustomplot/all/conanfile.py @@ -42,10 +42,8 @@ def configure(self): self.options.rm_safe("fPIC") def requirements(self): - if Version(self.version) >= "2.0.0": - self.requires("qt/[~6.4]", transitive_headers=True, transitive_libs=True) - else: - self.requires("qt/[~5]", transitive_headers=True, transitive_libs=True) + self.requires("qt/[~6.4]", transitive_headers=True, transitive_libs=True) + if self.options.with_opengl and self.settings.os == "Windows": self.requires("opengl/system") @@ -78,11 +76,10 @@ def generate(self): def _patch_sources(self): apply_conandata_patches(self) - if Version(self.version) >= "2.0.0": - # allow static qcustomplot with shared qt, and vice versa - replace_in_file(self, os.path.join(self.source_folder, "qcustomplot.h"), - "#if defined(QT_STATIC_BUILD)", - "#if 0" if self.options.shared else "#if 1") + # allow static qcustomplot with shared qt, and vice versa + replace_in_file(self, os.path.join(self.source_folder, "qcustomplot.h"), + "#if defined(QT_STATIC_BUILD)", + "#if 0" if self.options.shared else "#if 1") def build(self): self._patch_sources()