qt515 migration (#131)

automerged PR by conda-forge/automerge-action
conda-forge · Jun 5, 2022 · 2c1d4d0 · 2c1d4d0
2 parents c24bce8 + 7bccc4e
commit 2c1d4d0
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 515 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/...ux_64_OGRE_VERSION1.10QT_VERSION5.12.yaml → .ci_support/linux_64_OGRE_VERSION1.10.yaml b/...ux_64_OGRE_VERSION1.10QT_VERSION5.12.yaml → .ci_support/linux_64_OGRE_VERSION1.10.yaml
@@ -1,15 +1,13 @@
 OGRE_VERSION:
 - '1.10'
-QT_VERSION:
-- '5.12'
 boost_cpp:
 - 1.74.0
 c_compiler:
 - gcc
 c_compiler_version:
 - '10'
 cdt_name:
-- cos7
+- cos6
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_64_OGRE_VERSION1.10QT_VERSION5.15.yaml b/.ci_support/linux_64_OGRE_VERSION1.10QT_VERSION5.15.yaml
diff --git a/...ux_64_OGRE_VERSION1.12QT_VERSION5.12.yaml → .ci_support/linux_64_OGRE_VERSION1.12.yaml b/...ux_64_OGRE_VERSION1.12QT_VERSION5.12.yaml → .ci_support/linux_64_OGRE_VERSION1.12.yaml
@@ -1,15 +1,13 @@
 OGRE_VERSION:
 - '1.12'
-QT_VERSION:
-- '5.12'
 boost_cpp:
 - 1.74.0
 c_compiler:
 - gcc
 c_compiler_version:
 - '10'
 cdt_name:
-- cos7
+- cos6
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_64_OGRE_VERSION1.12QT_VERSION5.15.yaml b/.ci_support/linux_64_OGRE_VERSION1.12QT_VERSION5.15.yaml
diff --git a/...sx_64_OGRE_VERSION1.10QT_VERSION5.12.yaml → .ci_support/osx_64_OGRE_VERSION1.10.yaml b/...sx_64_OGRE_VERSION1.10QT_VERSION5.12.yaml → .ci_support/osx_64_OGRE_VERSION1.10.yaml
@@ -2,8 +2,6 @@ MACOSX_DEPLOYMENT_TARGET:
 - '10.14'
 OGRE_VERSION:
 - '1.10'
-QT_VERSION:
-- '5.12'
 boost_cpp:
 - 1.74.0
 bzip2:

diff --git a/.ci_support/osx_64_OGRE_VERSION1.10QT_VERSION5.15.yaml b/.ci_support/osx_64_OGRE_VERSION1.10QT_VERSION5.15.yaml
diff --git a/...sx_64_OGRE_VERSION1.12QT_VERSION5.12.yaml → .ci_support/osx_64_OGRE_VERSION1.12.yaml b/...sx_64_OGRE_VERSION1.12QT_VERSION5.12.yaml → .ci_support/osx_64_OGRE_VERSION1.12.yaml
@@ -2,8 +2,6 @@ MACOSX_DEPLOYMENT_TARGET:
 - '10.14'
 OGRE_VERSION:
 - '1.12'
-QT_VERSION:
-- '5.12'
 boost_cpp:
 - 1.74.0
 bzip2: