diff options
| author | Robert Loehning <robert.loehning@nokia.com> | 2011-11-10 15:09:17 +0100 |
|---|---|---|
| committer | Robert Löhning <robert.loehning@nokia.com> | 2011-11-14 17:54:43 +0100 |
| commit | fde3e900a80ea155ce4343382bd9d8b34652b1df (patch) | |
| tree | 0f1f5ae6ce4080da0a285f65ee57d90af9728ac2 | |
| parent | 58001c4043cb5a56305d3dd9c7058bbe0db669a4 (diff) | |
| download | qt-creator-fde3e900a80ea155ce4343382bd9d8b34652b1df.tar.gz | |
Squish: Updated Creator's settings to new Qt SDK 1.1.4
Change-Id: Ic77c7ba0ca101ff0745b8dc89f7a04824c9c7ea1
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
| -rw-r--r-- | tests/system/settings/unix/Nokia/qtversion.xml | 13 | ||||
| -rw-r--r-- | tests/system/settings/windows/Nokia/qtversion.xml | 27 |
2 files changed, 20 insertions, 20 deletions
diff --git a/tests/system/settings/unix/Nokia/qtversion.xml b/tests/system/settings/unix/Nokia/qtversion.xml index 00d17a58b8..a06c086f4f 100644 --- a/tests/system/settings/unix/Nokia/qtversion.xml +++ b/tests/system/settings/unix/Nokia/qtversion.xml @@ -43,8 +43,19 @@ </valuemap> </data> <data> + <variable>QtVersion.4</variable> + <valuemap type="QVariantMap"> + <value type="int" key="Id">1</value> + <value type="QString" key="Name">Harmattan Target (Qt SDK)</value> + <value type="QString" key="QMakePath">~/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/qmake</value> + <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value> + <value type="QString" key="autodetectionSource">SDK.MeeGo_1.2_Harmattan_API</value> + <value type="bool" key="isAutodetected">true</value> + </valuemap> + </data> + <data> <variable>QtVersion.Count</variable> - <value type="int">4</value> + <value type="int">5</value> </data> <data> <variable>Version</variable> diff --git a/tests/system/settings/windows/Nokia/qtversion.xml b/tests/system/settings/windows/Nokia/qtversion.xml index f4b46e5056..c368196718 100644 --- a/tests/system/settings/windows/Nokia/qtversion.xml +++ b/tests/system/settings/windows/Nokia/qtversion.xml @@ -74,12 +74,12 @@ <variable>QtVersion.6</variable> <valuemap type="QVariantMap"> <value type="int" key="Id">12</value> - <value type="QString" key="Name">Qt 4.7.3 for Symbian^3 (Qt SDK)</value> - <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbian3qt473/bin/qmake.exe</value> + <value type="QString" key="Name">Qt 4.7.4 for Symbian Anna (Qt SDK)</value> + <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbian3qt474/bin/qmake.exe</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Symbian</value> <value type="QString" key="SBSv2Directory">C:/QtSDK/Symbian/tools/sbs/bin</value> - <value type="QString" key="SystemRoot">C:/QtSDK/Symbian/SDKs/Symbian3Qt473/</value> - <value type="QString" key="autodetectionSource">SDK.C:/QtSDK/Symbian/SDKs/Symbian3Qt473</value> + <value type="QString" key="SystemRoot">C:/QtSDK/Symbian/SDKs/Symbian3Qt474/</value> + <value type="QString" key="autodetectionSource">SDK.C:/QtSDK/Symbian/SDKs/Symbian3Qt474</value> <value type="bool" key="isAutodetected">true</value> </valuemap> </data> @@ -87,7 +87,7 @@ <variable>QtVersion.7</variable> <valuemap type="QVariantMap"> <value type="int" key="Id">13</value> - <value type="QString" key="Name">Qt 4.7.3 for Symbian^1 (Qt SDK)</value> + <value type="QString" key="Name">Qt 4.7.3 for S60 5th Edition (Qt SDK)</value> <value type="QString" key="QMakePath">c:/qtsdk/symbian/sdks/symbian1qt473/bin/qmake.exe</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Symbian</value> <value type="QString" key="SBSv2Directory"></value> @@ -99,20 +99,9 @@ <data> <variable>QtVersion.8</variable> <valuemap type="QVariantMap"> - <value type="int" key="Id">14</value> - <value type="QString" key="Name">Harmattan Platform API (Qt SDK)</value> - <value type="QString" key="QMakePath">c:/qtsdk/madde/targets/harmattan-platform-api/bin/qmake.exe</value> - <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value> - <value type="QString" key="autodetectionSource">SDK.Harmattan_Platform_API</value> - <value type="bool" key="isAutodetected">true</value> - </valuemap> - </data> - <data> - <variable>QtVersion.9</variable> - <valuemap type="QVariantMap"> <value type="int" key="Id">15</value> - <value type="QString" key="Name">MeeGo 1.2 Harmattan API (Qt SDK)</value> - <value type="QString" key="QMakePath">c:/qtsdk/madde/targets/harmattan-nokia-meego-api/bin/qmake.exe</value> + <value type="QString" key="Name">Harmattan Target (Qt SDK)</value> + <value type="QString" key="QMakePath">c:/qtsdk/madde/targets/harmattan_10.2011.34-1/bin/qmake.exe</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value> <value type="QString" key="autodetectionSource">SDK.MeeGo_1.2_Harmattan_API</value> <value type="bool" key="isAutodetected">true</value> @@ -120,7 +109,7 @@ </data> <data> <variable>QtVersion.Count</variable> - <value type="int">10</value> + <value type="int">9</value> </data> <data> <variable>Version</variable> |