From a426cadeece38bc64209abf77149b990c2995480 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 31 Aug 2012 19:57:54 +0200 Subject: [PATCH] Squish: Added Fremantle target Change-Id: I4c7d5a053d42693e658e82699e9339c1a72d0057 Reviewed-by: Christian Stenger --- .../settings/unix/Nokia/qtcreator/devices.xml | 46 +++++++++++++++++++ .../unix/Nokia/qtcreator/profiles.xml | 22 ++++++++- .../unix/Nokia/qtcreator/toolchains.xml | 15 +++++- .../windows/Nokia/qtcreator/devices.xml | 46 +++++++++++++++++++ .../windows/Nokia/qtcreator/profiles.xml | 22 ++++++++- .../windows/Nokia/qtcreator/toolchains.xml | 15 +++++- 6 files changed, 160 insertions(+), 6 deletions(-) create mode 100644 tests/system/settings/unix/Nokia/qtcreator/devices.xml create mode 100644 tests/system/settings/windows/Nokia/qtcreator/devices.xml diff --git a/tests/system/settings/unix/Nokia/qtcreator/devices.xml b/tests/system/settings/unix/Nokia/qtcreator/devices.xml new file mode 100644 index 00000000000..cf0e1556156 --- /dev/null +++ b/tests/system/settings/unix/Nokia/qtcreator/devices.xml @@ -0,0 +1,46 @@ + + + + + + DeviceManager + + + Desktop Device + {68a75dff-5ec6-40cb-884f-8f383ed2ebb2} + + + + 1 + + + Desktop Device + + Run locally + 1 + Desktop + + 0 + 0 + 0 + + + + 1 + 10000-10100 + 192.168.2.15 + {68a75dff-5ec6-40cb-884f-8f383ed2ebb2} + + Maemo5/Fremantle Device + 0 + Maemo5OsType + + 22 + 10 + 0 + developer + + + + + diff --git a/tests/system/settings/unix/Nokia/qtcreator/profiles.xml b/tests/system/settings/unix/Nokia/qtcreator/profiles.xml index b3a3a5e5620..42482f30ac9 100644 --- a/tests/system/settings/unix/Nokia/qtcreator/profiles.xml +++ b/tests/system/settings/unix/Nokia/qtcreator/profiles.xml @@ -1,6 +1,6 @@ - + Profile.0 @@ -38,9 +38,27 @@ Qt Simulator + + Profile.2 + + false + + /usr/bin/gdb + {68a75dff-5ec6-40cb-884f-8f383ed2ebb2} + Maemo5OsType + + ProjectExplorer.ToolChain.Gcc:{32ee0a53-87d9-4f17-b8a5-a7642101e803} + + 3 + + :///DESKTOP/// + {f559999e-8f5d-4246-9321-ea9d1c444c85} + Fremantle + + Profile.Count - 2 + 3 Profile.Default diff --git a/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml b/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml index 3fec8907ff4..44307c16991 100644 --- a/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml +++ b/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml @@ -15,9 +15,22 @@ ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371} + + ToolChain.1 + + ~/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/g++ + + arm-linux-generic-elf-32bit + + arm-linux-maemo-elf-32bit + false + GCC for Fremantle + ProjectExplorer.ToolChain.Gcc:{32ee0a53-87d9-4f17-b8a5-a7642101e803} + + ToolChain.Count - 1 + 2 Version diff --git a/tests/system/settings/windows/Nokia/qtcreator/devices.xml b/tests/system/settings/windows/Nokia/qtcreator/devices.xml new file mode 100644 index 00000000000..ee41924e964 --- /dev/null +++ b/tests/system/settings/windows/Nokia/qtcreator/devices.xml @@ -0,0 +1,46 @@ + + + + + + DeviceManager + + + Desktop Device + {0d112162-56a5-40cb-a911-e0545489da5c} + + + + 1 + + + Desktop Device + + Run locally + 1 + Desktop + + 0 + 0 + 0 + + + + 1 + 10000-10100 + 192.168.2.15 + {0d112162-56a5-40cb-a911-e0545489da5c} + + Maemo5/Fremantle Device + 0 + Maemo5OsType + + 22 + 10 + 0 + developer + + + + + diff --git a/tests/system/settings/windows/Nokia/qtcreator/profiles.xml b/tests/system/settings/windows/Nokia/qtcreator/profiles.xml index f7fde15dea3..7f5f8fdfabf 100644 --- a/tests/system/settings/windows/Nokia/qtcreator/profiles.xml +++ b/tests/system/settings/windows/Nokia/qtcreator/profiles.xml @@ -1,6 +1,6 @@ - + Profile.0 @@ -38,9 +38,27 @@ Qt Simulator + + Profile.2 + + false + + C:/QtSDK/pythongdb/python_2.7based/gdb-arm-none-linux-gnueabi.exe + {0d112162-56a5-40cb-a911-e0545489da5c} + Maemo5OsType + + ProjectExplorer.ToolChain.Gcc:{333fff9b-5a71-4289-ac68-af2174cb68df} + + 16 + + :///DESKTOP/// + {618722a5-c008-4869-9404-07f755973496} + Fremantle + + Profile.Count - 2 + 3 Profile.Default diff --git a/tests/system/settings/windows/Nokia/qtcreator/toolchains.xml b/tests/system/settings/windows/Nokia/qtcreator/toolchains.xml index 5350264958f..0c6929b7a9f 100644 --- a/tests/system/settings/windows/Nokia/qtcreator/toolchains.xml +++ b/tests/system/settings/windows/Nokia/qtcreator/toolchains.xml @@ -15,9 +15,22 @@ ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce} + + ToolChain.1 + + C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/g++.exe + + arm-linux-generic-elf-32bit + + arm-linux-maemo-elf-32bit + false + GCC for Fremantle + ProjectExplorer.ToolChain.Gcc:{333fff9b-5a71-4289-ac68-af2174cb68df} + + ToolChain.Count - 1 + 2 Version