Skip to content

Commit 8e3bb8f

Browse files
Migrate to qt 5.15
1 parent 20f8409 commit 8e3bb8f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class QtBasemapPluginConan(ConanFile):
66
name = 'QtBasemapPlugin'
7-
version = '1.1.0-2'
7+
version = '1.1.1-0'
88
license = 'LGPL3'
99
url = 'http://code.qt.io/cgit/qt/qtlocation.git/tree/src/plugins/geoservices/mapbox?h=5.10'
1010
description = 'Qt GeoServices plugin for basemaps including MapBox'
@@ -28,7 +28,7 @@ def build(self):
2828
cmake.build(target='install')
2929

3030
def build_requirements(self):
31-
self.build_requires('Qt5/[5.12.7-2]@pix4d/stable')
31+
self.build_requires('Qt5/[>=5.15.2-1]@pix4d/stable')
3232

3333
def configure(self):
3434
del self.settings.compiler.libcxx

test_package/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def build(self):
1212
# Note: Not running from the install target to avoid packaging qt properly
1313

1414
def requirements(self):
15-
self.requires('Qt5/[5.12.7-2]@pix4d/stable')
15+
self.requires('Qt5/[5.15.2-1]@pix4d/stable')
1616

1717
def test(self):
1818
self.run(os.path.join('bin', 'example'))

0 commit comments

Comments
 (0)