Rebuild for qt515 (#134)

automerged PR by conda-forge/automerge-action
conda-forge · Jun 5, 2022 · 27ba3ca · 27ba3ca
2 parents c624813 + cc3c67f
commit 27ba3ca
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 1 deletion.
diff --git a/.ci_support/linux_64_OGRE_VERSION1.10.yaml b/.ci_support/linux_64_OGRE_VERSION1.10.yaml
@@ -47,6 +47,8 @@ pin_run_as_build:
     max_pin: x.x
   libuuid:
     max_pin: x
+qt_main:
+- '5.15'
 target_platform:
 - linux-64
 tbb_devel:

diff --git a/.ci_support/linux_64_OGRE_VERSION1.12.yaml b/.ci_support/linux_64_OGRE_VERSION1.12.yaml
@@ -47,6 +47,8 @@ pin_run_as_build:
     max_pin: x.x
   libuuid:
     max_pin: x
+qt_main:
+- '5.15'
 target_platform:
 - linux-64
 tbb_devel:

diff --git a/.ci_support/migrations/qt515.yaml b/.ci_support/migrations/qt515.yaml
@@ -0,0 +1,10 @@
+migrator_ts: 1653771978
+__migrator:
+  kind: version
+  migration_number: 1
+  bump_number: 1
+
+qt:
+  - 5.15
+qt_main:
+  - 5.15
diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml
@@ -51,6 +51,8 @@ pin_run_as_build:
     max_pin: x.x
   zlib:
     max_pin: x.x
+qt_main:
+- '5.15'
 target_platform:
 - osx-64
 tbb_devel:

diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml
@@ -51,6 +51,8 @@ pin_run_as_build:
     max_pin: x.x
   zlib:
     max_pin: x.x
+qt_main:
+- '5.15'
 target_platform:
 - osx-64
 tbb_devel:

diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml
@@ -49,6 +49,8 @@ pin_run_as_build:
     max_pin: x.x
   zlib:
     max_pin: x.x
+qt_main:
+- '5.15'
 target_platform:
 - osx-arm64
 tbb_devel:

diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml
@@ -49,6 +49,8 @@ pin_run_as_build:
     max_pin: x.x
   zlib:
     max_pin: x.x
+qt_main:
+- '5.15'
 target_platform:
 - osx-arm64
 tbb_devel:

diff --git a/.ci_support/win_64_OGRE_VERSION1.10.yaml b/.ci_support/win_64_OGRE_VERSION1.10.yaml
@@ -31,6 +31,8 @@ pin_run_as_build:
     max_pin: x
   libgdal:
     max_pin: x.x
+qt_main:
+- '5.15'
 target_platform:
 - win-64
 tbb_devel:

diff --git a/.ci_support/win_64_OGRE_VERSION1.12.yaml b/.ci_support/win_64_OGRE_VERSION1.12.yaml
@@ -31,6 +31,8 @@ pin_run_as_build:
     max_pin: x
   libgdal:
     max_pin: x.x
+qt_main:
+- '5.15'
 target_platform:
 - win-64
 tbb_devel:

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -15,7 +15,7 @@ source:
       - 3190.patch
 
 build:
-  number: 3
+  number: 4
   run_exports:
     - {{ pin_subpackage('gazebo', max_pin='x') }}