aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkseli Salovaara <akseli.salovaara@qt.io>2018-05-21 13:41:12 +0300
committerAntti Kokko <antti.kokko@qt.io>2018-05-21 11:05:00 +0000
commit98232f5c38c176394426221df01e10c99db2f852 (patch)
tree79607a546372ddfcee6cf78b22e6efbb6fb13a2a
parent725670980892bbb0fa78bd8e60aaf2311eae9b5e (diff)
Add qt.tools.qtcreator dependency to Qt 5.11.0 packaging templatesv5.11.0-packaging
Common qt helper functions as separate component feature is not ready and packaging templates requires qt.tools.qtcreator dependency. Change-Id: I9e9445dbf34a17208f275e916be65b5c444b2b67 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.android_armv7/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.android_x86/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.clang_64/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.gcc_64/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.ios/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win32_mingw53/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win32_msvc2015/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_64/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_armv7/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_x64/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_x86/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_64/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_armv7/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_x64/meta/package.xml2
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_x86/meta/package.xml2
15 files changed, 15 insertions, 15 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.android_armv7/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.android_armv7/meta/package.xml
index 8e2f48321..ed31218e0 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.android_armv7/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.android_armv7/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for Android ARMv7</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. -->
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.android_x86/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.android_x86/meta/package.xml
index ef33a4682..5bd0117f3 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.android_x86/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.android_x86/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for Android x86</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. -->
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.clang_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.clang_64/meta/package.xml
index 74ae28e5f..9f9edb44b 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.clang_64/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.clang_64/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for macOS</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<!--<AutoSelectOn></AutoSelectOn>-->
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.gcc_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.gcc_64/meta/package.xml
index fa329b2e9..ba011c080 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.gcc_64/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.gcc_64/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for Desktop gcc 64-bit</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. -->
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.ios/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.ios/meta/package.xml
index 5e9cb50e6..7e58b6743 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.ios/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.ios/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for iOS</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. -->
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win32_mingw53/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win32_mingw53/meta/package.xml
index 49788b678..f2be4236e 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win32_mingw53/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win32_mingw53/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for MinGW 5.3.0 32-bit</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.tools.win32_mingw530, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.tools.win32_mingw530, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. -->
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win32_msvc2015/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win32_msvc2015/meta/package.xml
index aaecb3dd2..09fede6aa 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win32_msvc2015/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win32_msvc2015/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for MSVC 2015 32-bit</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. -->
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_64/meta/package.xml
index 2cc6c406f..6f8396cc9 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_64/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_64/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for MSVC 2015 64-bit</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. -->
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_armv7/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_armv7/meta/package.xml
index 4cdf565bf..8d26517d9 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_armv7/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_armv7/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for Universal Windows Platform</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_x64/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_x64/meta/package.xml
index fdaa84310..c78f267e6 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_x64/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_x64/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for Universal Windows Platform</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_x86/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_x86/meta/package.xml
index 9e5968dd8..21c4d2a25 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_x86/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2015_winrt_x86/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for Universal Windows Platform</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_64/meta/package.xml
index 611ccb7c7..ffb598957 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_64/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_64/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for MSVC 2017 64-bit</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. -->
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_armv7/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_armv7/meta/package.xml
index fe8e20738..a4b388fd5 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_armv7/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_armv7/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for Universal Windows Platform</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_x64/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_x64/meta/package.xml
index 1caa1a60a..c4a2c24fd 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_x64/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_x64/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for Universal Windows Platform</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_x86/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_x86/meta/package.xml
index 5c7f75db3..95ecb2d20 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_x86/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.win64_msvc2017_winrt_x86/meta/package.xml
@@ -4,7 +4,7 @@
<Description>Qt 5.11.0 Prebuilt Components for Universal Windows Platform</Description>
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Dependencies>qt.tools, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
+ <Dependencies>qt.tools.qtcreator, qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<AutoDependOn></AutoDependOn>
<Default>false</Default>
<Script>installscript.qs</Script>