Commit bde4362d authored by Robert Loehning's avatar Robert Loehning

Squish: Replace Qt 5.2.1 kit with Qt 5.6.1

Change-Id: I5865024f55a68bc2860f5b8b0b7c9c37775cc122
Reviewed-by: default avatarRobert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 84f84890
...@@ -9,9 +9,9 @@ On Linux/Mac this is ~/QtSDK, and on Windows this is C:\QtSDK. ...@@ -9,9 +9,9 @@ On Linux/Mac this is ~/QtSDK, and on Windows this is C:\QtSDK.
After installing the QtSDK you should use the package manager of the QtSDK (SDKMaintenanceTool) to add some more packages. After installing the QtSDK you should use the package manager of the QtSDK (SDKMaintenanceTool) to add some more packages.
You'll need at least Desktop Qt versions 4.7.4, 4.8.0, Harmattan stuff (except QEmu), Maemo Toolchain, Qt Examples, Simulator, Documentation files. You'll need at least Desktop Qt versions 4.7.4, 4.8.0, Harmattan stuff (except QEmu), Maemo Toolchain, Qt Examples, Simulator, Documentation files.
Third - some of the test suites/test cases expect Qt 5.2.1 (default toolchain), Qt 5.3.1 (default toolchain) and Qt 5.4.1 (gcc, Linux and Windows only) Third - some of the test suites/test cases expect Qt 5.3.1 (default toolchain), Qt 5.4.1 (gcc, Linux and Windows only) and Qt 5.6.1-1 (default toolchain)
installed in their default locations. On Linux/Mac this is ~/Qt5.x.1 and on Windows this is C:\Qt\Qt5.x.1. The default toolchains are gcc on Linux, installed in their default locations. On Linux/Mac this is ~/Qt5.x.1 and on Windows this is C:\Qt\Qt5.x.1. The default toolchains are gcc on Linux,
clang on Mac and MSVC2010 on Windows. clang on Mac and MSVC2010 (Qt <= 5.5) or MSVC2013 (Qt > 5.5) on Windows. It's easiest to use default installations of the official opensource Qt packages.
Fourth - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below). Fourth - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below).
These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on). These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on).
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{fc5f34fd-e703-4f4c-85ce-ea5bf5869e6a}</value> <value type="QString" key="PE.Profile.Id">{fc5f34fd-e703-4f4c-85ce-ea5bf5869e6a}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/> <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Desktop 521 default</value> <value type="QString" key="PE.Profile.Name">Desktop 561 default</value>
<value type="bool" key="PE.Profile.SDK">false</value> <value type="bool" key="PE.Profile.SDK">false</value>
<valuelist type="QVariantList" key="PE.Profile.StickyInfo"/> <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap> </valuemap>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
</data> </data>
<data> <data>
<variable>Profile.Default</variable> <variable>Profile.Default</variable>
<value type="QString">{fc5f34fd-e703-4f4c-85ce-ea5bf5869e6a}</value> <value type="QString">{a1e860d1-c241-4abf-80fe-cf0c9f0a43b3}</value>
</data> </data>
<data> <data>
<variable>Version</variable> <variable>Version</variable>
......
...@@ -56,8 +56,8 @@ ...@@ -56,8 +56,8 @@
<variable>QtVersion.5</variable> <variable>QtVersion.5</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">9</value> <value type="int" key="Id">9</value>
<value type="QString" key="Name">Desktop Qt 5.2.1 (SQUISH_DEFAULT_COMPILER)</value> <value type="QString" key="Name">Desktop Qt 5.6.1 (SQUISH_DEFAULT_COMPILER)</value>
<value type="QString" key="QMakePath">~/Qt5.2.1/5.2.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value> <value type="QString" key="QMakePath">~/Qt5.6.1/5.6/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value> <value type="bool" key="isAutodetected">false</value>
</valuemap> </valuemap>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles> <!DOCTYPE QtCreatorProfiles>
<!-- Written by QtCreator 3.3.81, 2015-02-18T14:20:56. --> <!-- Written by QtCreator 4.0.83, 2016-07-21T11:54:33. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>Profile.0</variable> <variable>Profile.0</variable>
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
<variable>Profile.5</variable> <variable>Profile.5</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value> <value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value> <value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value>
...@@ -120,20 +119,20 @@ ...@@ -120,20 +119,20 @@
<value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">9</value> <value type="int" key="QtSupport.QtInformation">2</value>
</valuemap> </valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{17ae70be-817d-4019-9337-fa7761c4b0ed}</value> <value type="QString" key="PE.Profile.Id">{1dcb5509-1670-470d-80a5-8a988f36e4e2}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/> <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Desktop 521 default</value> <value type="QString" key="PE.Profile.Name">Desktop 480 GCC</value>
<value type="bool" key="PE.Profile.SDK">false</value> <value type="bool" key="PE.Profile.SDK">false</value>
<valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.6</variable> <variable>Profile.6</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value> <value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value> <value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value>
...@@ -142,13 +141,14 @@ ...@@ -142,13 +141,14 @@
<value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">2</value> <value type="int" key="QtSupport.QtInformation">11</value>
</valuemap> </valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{1dcb5509-1670-470d-80a5-8a988f36e4e2}</value> <value type="QString" key="PE.Profile.Id">{e91398ba-6443-4b02-b416-782a70d9df90}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/> <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Desktop 480 GCC</value> <value type="QString" key="PE.Profile.Name">Desktop 531 default</value>
<value type="bool" key="PE.Profile.SDK">false</value> <value type="bool" key="PE.Profile.SDK">false</value>
<valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap> </valuemap>
</data> </data>
<data> <data>
...@@ -161,15 +161,16 @@ ...@@ -161,15 +161,16 @@
<value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value> <value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value>
<value type="QString" key="PE.Profile.Device">Desktop Device</value> <value type="QString" key="PE.Profile.Device">Desktop Device</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value> <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<valuelist type="QVariantList" key="PE.Profile.Environment"/>
<value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">11</value> <value type="int" key="QtSupport.QtInformation">13</value>
</valuemap> </valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{e91398ba-6443-4b02-b416-782a70d9df90}</value> <value type="QString" key="PE.Profile.Id">{8ca91e21-c12e-4876-85b3-4b2141708acb}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/> <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Desktop 531 default</value> <value type="QString" key="PE.Profile.Name">Desktop 541 GCC</value>
<value type="bool" key="PE.Profile.SDK">false</value> <value type="bool" key="PE.Profile.SDK">false</value>
<valuelist type="QVariantList" key="PE.Profile.StickyInfo"/> <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap> </valuemap>
...@@ -188,12 +189,12 @@ ...@@ -188,12 +189,12 @@
<value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">13</value> <value type="int" key="QtSupport.QtInformation">15</value>
</valuemap> </valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{8ca91e21-c12e-4876-85b3-4b2141708acb}</value> <value type="QString" key="PE.Profile.Id">{542217c7-ce0f-48f7-843b-d4fad339688d}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/> <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Desktop 541 GCC</value> <value type="QString" key="PE.Profile.Name">Desktop 561 default</value>
<value type="bool" key="PE.Profile.SDK">false</value> <value type="bool" key="PE.Profile.SDK">false</value>
<valuelist type="QVariantList" key="PE.Profile.StickyInfo"/> <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap> </valuemap>
...@@ -204,7 +205,7 @@ ...@@ -204,7 +205,7 @@
</data> </data>
<data> <data>
<variable>Profile.Default</variable> <variable>Profile.Default</variable>
<value type="QString">{17ae70be-817d-4019-9337-fa7761c4b0ed}</value> <value type="QString">{e91398ba-6443-4b02-b416-782a70d9df90}</value>
</data> </data>
<data> <data>
<variable>Version</variable> <variable>Version</variable>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorQtVersions> <!DOCTYPE QtCreatorQtVersions>
<!-- Written by QtCreator 3.3.81, 2015-02-18T14:20:56. --> <!-- Written by QtCreator 4.0.83, 2016-07-21T11:54:33. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>QtVersion.0</variable> <variable>QtVersion.0</variable>
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
<data> <data>
<variable>QtVersion.5</variable> <variable>QtVersion.5</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">9</value> <value type="int" key="Id">11</value>
<value type="QString" key="Name">Desktop Qt 5.2.1 (SQUISH_DEFAULT_COMPILER)</value> <value type="QString" key="Name">Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)</value>
<value type="QString" key="QMakePath">~/Qt5.2.1/5.2.1/SQUISH_DEFAULT_COMPILER/bin/qmake</value> <value type="QString" key="QMakePath">~/Qt5.3.1/5.3/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value> <value type="bool" key="isAutodetected">false</value>
</valuemap> </valuemap>
...@@ -65,9 +65,9 @@ ...@@ -65,9 +65,9 @@
<data> <data>
<variable>QtVersion.6</variable> <variable>QtVersion.6</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">11</value> <value type="int" key="Id">13</value>
<value type="QString" key="Name">Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)</value> <value type="QString" key="Name">Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER)</value>
<value type="QString" key="QMakePath">~/Qt5.3.1/5.3/SQUISH_DEFAULT_COMPILER/bin/qmake</value> <value type="QString" key="QMakePath">~/Qt5.4.1/5.4/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value> <value type="bool" key="isAutodetected">false</value>
</valuemap> </valuemap>
...@@ -75,9 +75,9 @@ ...@@ -75,9 +75,9 @@
<data> <data>
<variable>QtVersion.7</variable> <variable>QtVersion.7</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">13</value> <value type="int" key="Id">15</value>
<value type="QString" key="Name">Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER)</value> <value type="QString" key="Name">Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER)</value>
<value type="QString" key="QMakePath">~/Qt5.4.1/5.4/SQUISH_DEFAULT_COMPILER/bin/qmake</value> <value type="QString" key="QMakePath">~/Qt5.6.1/5.6/SQUISH_DEFAULT_COMPILER/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value> <value type="bool" key="isAutodetected">false</value>
</valuemap> </valuemap>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles> <!DOCTYPE QtCreatorProfiles>
<!-- Written by QtCreator 3.3.81, 2015-02-20T13:29:04. --> <!-- Written by QtCreator 4.0.83, 2016-07-20T17:07:18. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>Profile.0</variable> <variable>Profile.0</variable>
...@@ -147,19 +147,19 @@ ...@@ -147,19 +147,19 @@
<value type="QString" key="PE.Profile.AutoDetectionSource"></value> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value> <value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{811977c9-ea95-4616-bc28-c66d1935ff65}</value> <value type="QString" key="Debugger.Information">{2f8a1f59-ddd7-49f0-ae61-1337223f56a3}</value>
<value type="QString" key="PE.Profile.Device">Desktop Device</value> <value type="QString" key="PE.Profile.Device">Desktop Device</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value> <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<valuelist type="QVariantList" key="PE.Profile.Environment"/> <valuelist type="QVariantList" key="PE.Profile.Environment"/>
<value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value> <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">4</value> <value type="int" key="QtSupport.QtInformation">22</value>
</valuemap> </valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{11e4aad3-9fa6-48a2-93f5-829471bfda32}</value> <value type="QString" key="PE.Profile.Id">{10cf33c5-e36d-4a49-a8c7-086f3cf59695}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/> <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Desktop 521 default</value> <value type="QString" key="PE.Profile.Name">Desktop 541 GCC</value>
<value type="bool" key="PE.Profile.SDK">false</value> <value type="bool" key="PE.Profile.SDK">false</value>
<valuelist type="QVariantList" key="PE.Profile.StickyInfo"/> <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap> </valuemap>
...@@ -171,19 +171,19 @@ ...@@ -171,19 +171,19 @@
<value type="QString" key="PE.Profile.AutoDetectionSource"></value> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value> <value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{2f8a1f59-ddd7-49f0-ae61-1337223f56a3}</value> <value type="QString" key="Debugger.Information">{811977c9-ea95-4616-bc28-c66d1935ff65}</value>
<value type="QString" key="PE.Profile.Device">Desktop Device</value> <value type="QString" key="PE.Profile.Device">Desktop Device</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value> <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
<valuelist type="QVariantList" key="PE.Profile.Environment"/> <valuelist type="QVariantList" key="PE.Profile.Environment"/>
<value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb}</value> <value type="QString" key="PE.Profile.ToolChain">{7ca0887f-a9a5-4251-aba6-560a15595d20}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">22</value> <value type="int" key="QtSupport.QtInformation">24</value>
</valuemap> </valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value> <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{10cf33c5-e36d-4a49-a8c7-086f3cf59695}</value> <value type="QString" key="PE.Profile.Id">{f9c7858c-d167-4b78-847a-91943bd0af07}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/> <valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Desktop 541 GCC</value> <value type="QString" key="PE.Profile.Name">Desktop 561 default</value>
<value type="bool" key="PE.Profile.SDK">false</value> <value type="bool" key="PE.Profile.SDK">false</value>
<valuelist type="QVariantList" key="PE.Profile.StickyInfo"/> <valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</valuemap> </valuemap>
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</data> </data>
<data> <data>
<variable>Profile.Default</variable> <variable>Profile.Default</variable>
<value type="QString">{11e4aad3-9fa6-48a2-93f5-829471bfda32}</value> <value type="QString">{6a95566e-8372-4372-8286-ef73af7de191}</value>
</data> </data>
<data> <data>
<variable>Version</variable> <variable>Version</variable>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorQtVersions> <!DOCTYPE QtCreatorQtVersions>
<!-- Written by QtCreator 3.3.81, 2015-02-17T18:11:11. --> <!-- Written by QtCreator 4.0.83, 2016-07-20T17:07:18. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>QtVersion.0</variable> <variable>QtVersion.0</variable>
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
<data> <data>
<variable>QtVersion.5</variable> <variable>QtVersion.5</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">4</value> <value type="int" key="Id">20</value>
<value type="QString" key="Name">Desktop Qt 5.2.1 (msvc2010)</value> <value type="QString" key="Name">Qt 5.3.1 (msvc2010_opengl)</value>
<value type="QString" key="QMakePath">C:/Qt/Qt5.2.1/5.2.1/msvc2010/bin/qmake.exe</value> <value type="QString" key="QMakePath">C:/Qt/Qt5.3.1/5.3/msvc2010_opengl/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value> <value type="bool" key="isAutodetected">false</value>
</valuemap> </valuemap>
...@@ -65,9 +65,9 @@ ...@@ -65,9 +65,9 @@
<data> <data>
<variable>QtVersion.6</variable> <variable>QtVersion.6</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">20</value> <value type="int" key="Id">22</value>
<value type="QString" key="Name">Qt 5.3.1 (msvc2010_opengl)</value> <value type="QString" key="Name">Qt %{Qt:Version} (mingw491_32)</value>
<value type="QString" key="QMakePath">C:/Qt/Qt5.3.1/5.3/msvc2010_opengl/bin/qmake.exe</value> <value type="QString" key="QMakePath">C:/Qt/Qt5.4.1/5.4/mingw491_32/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value> <value type="bool" key="isAutodetected">false</value>
</valuemap> </valuemap>
...@@ -75,9 +75,9 @@ ...@@ -75,9 +75,9 @@
<data> <data>
<variable>QtVersion.7</variable> <variable>QtVersion.7</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">22</value> <value type="int" key="Id">24</value>
<value type="QString" key="Name">Qt %{Qt:Version} (mingw491_32)</value> <value type="QString" key="Name">Qt %{Qt:Version} (msvc2013)</value>
<value type="QString" key="QMakePath">C:/Qt/Qt5.4.1/5.4/mingw491_32/bin/qmake.exe</value> <value type="QString" key="QMakePath">C:/Qt/Qt5.6.1/5.6/msvc2013/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value> <value type="bool" key="isAutodetected">false</value>
</valuemap> </valuemap>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorToolChains> <!DOCTYPE QtCreatorToolChains>
<!-- Written by QtCreator 3.3.81, 2015-02-20T13:29:04. --> <!-- Written by QtCreator 4.0.83, 2016-07-20T17:07:18. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>ToolChain.0</variable> <variable>ToolChain.0</variable>
...@@ -69,9 +69,20 @@ ...@@ -69,9 +69,20 @@
<value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb}</value> <value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb}</value>
</valuemap> </valuemap>
</data> </data>
<data>
<variable>ToolChain.5</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2013-pe-32bit</value>
<value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat</value>
<value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBatArg">x86</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">true</value>
<value type="QString" key="ProjectExplorer.ToolChain.DisplayName">Microsoft Visual C++ Compiler 12.0 (x86)</value>
<value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{7ca0887f-a9a5-4251-aba6-560a15595d20}</value>
</valuemap>
</data>
<data> <data>
<variable>ToolChain.Count</variable> <variable>ToolChain.Count</variable>
<value type="int">5</value> <value type="int">6</value>
</data> </data>
<data> <data>
<variable>Version</variable> <variable>Version</variable>
......
...@@ -34,11 +34,9 @@ class Targets: ...@@ -34,11 +34,9 @@ class Targets:
DESKTOP_480_DEFAULT, DESKTOP_480_DEFAULT,
SIMULATOR, SIMULATOR,
EMBEDDED_LINUX, EMBEDDED_LINUX,
DESKTOP_521_DEFAULT,
DESKTOP_531_DEFAULT, DESKTOP_531_DEFAULT,
DESKTOP_541_GCC) = ALL_TARGETS DESKTOP_541_GCC,
DESKTOP_561_DEFAULT) = ALL_TARGETS
DESKTOP_561_DEFAULT = sum(ALL_TARGETS) + 1
@staticmethod @staticmethod
def desktopTargetClasses(): def desktopTargetClasses():
...@@ -65,8 +63,6 @@ class Targets: ...@@ -65,8 +63,6 @@ class Targets:
return "Qt Simulator" return "Qt Simulator"
elif target == Targets.EMBEDDED_LINUX: elif target == Targets.EMBEDDED_LINUX:
return "Embedded Linux" return "Embedded Linux"
elif target == Targets.DESKTOP_521_DEFAULT:
return "Desktop 521 default"
elif target == Targets.DESKTOP_531_DEFAULT: elif target == Targets.DESKTOP_531_DEFAULT:
return "Desktop 531 default" return "Desktop 531 default"
elif target == Targets.DESKTOP_541_GCC: elif target == Targets.DESKTOP_541_GCC:
...@@ -96,7 +92,7 @@ class Targets: ...@@ -96,7 +92,7 @@ class Targets:
@staticmethod @staticmethod
def getDefaultKit(): def getDefaultKit():
return Targets.DESKTOP_521_DEFAULT return Targets.DESKTOP_531_DEFAULT
# this class holds some constants for easier usage inside the Projects view # this class holds some constants for easier usage inside the Projects view
class ProjectSettings: class ProjectSettings:
...@@ -182,7 +178,7 @@ class Qt5Path: ...@@ -182,7 +178,7 @@ class Qt5Path:
@staticmethod @staticmethod
def getPaths(pathSpec): def getPaths(pathSpec):
qt5targets = [Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT] qt5targets = [Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_561_DEFAULT]
if platform.system() != 'Darwin': if platform.system() != 'Darwin':
qt5targets.append(Targets.DESKTOP_541_GCC) qt5targets.append(Targets.DESKTOP_541_GCC)
if pathSpec == Qt5Path.DOCS: if pathSpec == Qt5Path.DOCS:
...@@ -196,10 +192,7 @@ class Qt5Path: ...@@ -196,10 +192,7 @@ class Qt5Path:
@staticmethod @staticmethod
def __preCheckAndExtractQtVersionStr__(target): def __preCheckAndExtractQtVersionStr__(target):
if target not in Targets.ALL_TARGETS: if target not in Targets.ALL_TARGETS:
# Ignore DESKTOP_561_DEFAULT which only delivers examples but not a kit yet. raise Exception("Unexpected target '%s'" % str(target))
# Remove the condition as soon as it is being used as a kit in tests.
if not target == Targets.DESKTOP_561_DEFAULT:
raise Exception("Unexpected target '%s'" % str(target))
matcher = re.match("^Desktop (5\\d{2}).*$", Targets.getStringForTarget(target)) matcher = re.match("^Desktop (5\\d{2}).*$", Targets.getStringForTarget(target))
if matcher is None: if matcher is None:
......
...@@ -629,7 +629,9 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): ...@@ -629,7 +629,9 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
version = res.group("version") version = res.group("version")
else: else:
version = None version = None
if 'Supported Platforms' in text: if 'only available with Qt 5.6' in text:
result = [Targets.DESKTOP_561_DEFAULT]
elif 'Supported Platforms' in text:
supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ") supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ")
result = [] result = []
if 'Desktop' in supports: if 'Desktop' in supports:
...@@ -638,7 +640,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): ...@@ -638,7 +640,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
result.append(Targets.DESKTOP_480_DEFAULT) result.append(Targets.DESKTOP_480_DEFAULT)
if platform.system() in ("Linux", "Darwin"): if platform.system() in ("Linux", "Darwin"):
result.append(Targets.EMBEDDED_LINUX) result.append(Targets.EMBEDDED_LINUX)
result.extend([Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT]) result.extend([Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_561_DEFAULT])
if platform.system() != 'Darwin': if platform.system() != 'Darwin':
result.append(Targets.DESKTOP_541_GCC) result.append(Targets.DESKTOP_541_GCC)
if not templateName == "Qt Creator Plugin" and (version == None or version < "5.0"): if not templateName == "Qt Creator Plugin" and (version == None or version < "5.0"):
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
source("../../shared/qtcreator.py") source("../../shared/qtcreator.py")
def main(): def main():
target = Targets.DESKTOP_521_DEFAULT target = Targets.DESKTOP_531_DEFAULT
sourceExample = os.path.join(Qt5Path.examplesPath(target), "declarative/keyinteraction/focus") sourceExample = os.path.join(Qt5Path.examplesPath(target), "declarative/keyinteraction/focus")
proFile = "focus.pro" proFile = "focus.pro"
if not neededFilePresent(os.path.join(sourceExample, proFile)): if not neededFilePresent(os.path.join(sourceExample, proFile)):
......
...@@ -29,7 +29,7 @@ def main(): ...@@ -29,7 +29,7 @@ def main():
startApplication("qtcreator" + SettingsPath) startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError(): if not startedWithoutPluginError():
return return
available = [("5.3", False), ("5.3", True)] available = [("5.6", False), ("5.6", True)]
if platform.system() != 'Darwin': if platform.system() != 'Darwin':
available.extend([("5.4", False), ("5.4", True)]) available.extend([("5.4", False), ("5.4", True)])
...@@ -39,9 +39,9 @@ def main(): ...@@ -39,9 +39,9 @@ def main():
projectName = createNewQtQuickUI(workingDir, qtVersion, controls) projectName = createNewQtQuickUI(workingDir, qtVersion, controls)
switchViewTo(ViewConstants.PROJECTS) switchViewTo(ViewConstants.PROJECTS)
clickButton(waitForObject(":*Qt Creator.Add Kit_QPushButton")) clickButton(waitForObject(":*Qt Creator.Add Kit_QPushButton"))
if qtVersion == "5.3": if qtVersion == "5.6":
menuItem = Targets.getStringForTarget(Targets.DESKTOP_531_DEFAULT) menuItem = Targets.getStringForTarget(Targets.DESKTOP_561_DEFAULT)
quick = "2.3" quick = "2.6"
else: else:
menuItem = Targets.getStringForTarget(Targets.DESKTOP_541_GCC) menuItem = Targets.getStringForTarget(Targets.DESKTOP_541_GCC)
quick = "2.4" quick = "2.4"
......
...@@ -29,7 +29,7 @@ def main(): ...@@ -29,7 +29,7 @@ def main():
startApplication("qtcreator" + SettingsPath) startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError(): if not startedWithoutPluginError():
return return
for targ, quickVer in [[Targets.DESKTOP_480_DEFAULT, 1], [Targets.DESKTOP_521_DEFAULT, 2], for targ, quickVer in [[Targets.DESKTOP_480_DEFAULT, 1], [Targets.DESKTOP_561_DEFAULT, 2],
[Targets.DESKTOP_531_DEFAULT, 2]]: [Targets.DESKTOP_531_DEFAULT, 2]]:
# using a temporary directory won't mess up a potentially existing # using a temporary directory won't mess up a potentially existing
createNewQmlExtension(tempDir(), targ, quickVer) createNewQmlExtension(tempDir(), targ, quickVer)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment