Migrate to qt 5.15

Pix4D · Sep 10, 2021 · 8e3bb8f · 8e3bb8f
1 parent 20f8409
commit 8e3bb8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -4,7 +4,7 @@
 
 class QtBasemapPluginConan(ConanFile):
     name = 'QtBasemapPlugin'
-    version = '1.1.0-2'
+    version = '1.1.1-0'
     license = 'LGPL3'
     url = 'http://code.qt.io/cgit/qt/qtlocation.git/tree/src/plugins/geoservices/mapbox?h=5.10'
     description = 'Qt GeoServices plugin for basemaps including MapBox'
@@ -28,7 +28,7 @@ def build(self):
         cmake.build(target='install')
 
     def build_requirements(self):
-        self.build_requires('Qt5/[5.12.7-2]@pix4d/stable')
+        self.build_requires('Qt5/[>=5.15.2-1]@pix4d/stable')
 
     def configure(self):
         del self.settings.compiler.libcxx

diff --git a/test_package/conanfile.py b/test_package/conanfile.py
@@ -12,7 +12,7 @@ def build(self):
         # Note: Not running from the install target to avoid packaging qt properly
 
     def requirements(self):
-        self.requires('Qt5/[5.12.7-2]@pix4d/stable')
+        self.requires('Qt5/[5.15.2-1]@pix4d/stable')
 
     def test(self):
         self.run(os.path.join('bin', 'example'))