Commit 62441682 authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/4.2'

Change-Id: Idd63494e3878dbf8811c35beb957562255d83813
parents f76227fa 69df8ec3
......@@ -387,6 +387,41 @@
You can create your own project and class wizards. For more information,
see \l{Adding New Custom Wizards}.
\section2 Creating Resource Files
\QC supports the \l{The Qt Resource System}{Qt Resource System}, which is a
platform-independent mechanism for storing files in the application's
executable.
\image qtcreator-add-resource-wizard.png "New File or Project dialog"
The wizard creates a resource collection file (.qrc) that you can manage in
the resource editor.
\image qtcreator-add-resource.png "Editing resource files"
Select \uicontrol Add > \uicontrol {Add Files} to locate and add individual
files.
By default, resources are accessible in the application under the same file
name as they have in the source tree, with a \c{:/} prefix, or by a URL with
a \c qrc scheme. To specify a path prefix for all files in the \c .qrc file,
select \uicontrol Add > \uicontrol {Add Prefix} or enter the prefix in the
\uicontrol Prefix field.
Some resources need to change based on the user's locale, such as
translation files or icons. You can specify a locale in the
\uicontrol Language field.
Select \uicontrol Remove to remove the selected file from the resource
collection. In the \uicontrol {Remove File} dialog, select the
\uicontrol {Delete file permanently} check box to remove the file from
the file system. To remove files that cannot be found in the file system,
select \uicontrol {Remove Missing Files}.
The above functions are also available in the context menu in the
\uicontrol Projects view.
\section2 Creating OpenGL Fragment and Vertex Shaders
Qt provides support for integration with OpenGL implementations on all
......
......@@ -60,6 +60,15 @@
then you can specify those using \c{QML_IMPORT_PATH} in the \c{.pro} file of your
application.
If you use CMake, add the following command to the CMakeLists.txt file to
set the QML import path:
\code
{set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/qml ${CMAKE_BINARY_DIR}/imports CACHE string "" FORCE)}
\endcode
The import path affects all the targets built by the CMake project.
Ideally, QML modules have a \c{plugins.qmltypes} file in the same directory
as the \c qmldir file. The \c qmltypes file contains a description of the
types exported by the module's plugins and is loaded by \QC when the
......
......@@ -8,40 +8,8 @@
<valuemap type="QVariantMap" key="DefaultDevices">
<value type="QString" key="Desktop">Desktop Device</value>
<value type="QString" key="GenericLinuxOsType">{7c5a3673-e300-4286-9666-0f86d3e3dc38}</value>
<value type="QString" key="HarmattanOsType">{1a0985cf-ad32-487c-8af8-85ee532ac19c}</value>
<value type="QString" key="Maemo5OsType">{68a75dff-5ec6-40cb-884f-8f383ed2ebb2}</value>
</valuemap>
<valuelist type="QVariantList" key="DeviceList">
<valuemap type="QVariantMap">
<value type="int" key="Authentication">1</value>
<value type="QString" key="FreePortsSpec">10000-10100</value>
<value type="QString" key="Host">192.168.2.15</value>
<value type="QByteArray" key="InternalId">{68a75dff-5ec6-40cb-884f-8f383ed2ebb2}</value>
<value type="QString" key="KeyFile"></value>
<value type="QString" key="Name">Maemo5/Fremantle Device</value>
<value type="int" key="Origin">0</value>
<value type="QString" key="OsType">Maemo5OsType</value>
<value type="QString" key="Password"></value>
<value type="int" key="SshPort">22</value>
<value type="int" key="Timeout">10</value>
<value type="int" key="Type">0</value>
<value type="QString" key="Uname">developer</value>
</valuemap>
<valuemap type="QVariantMap">
<value type="int" key="Authentication">1</value>
<value type="QString" key="FreePortsSpec">10000-10100</value>
<value type="QString" key="Host">192.168.2.15</value>
<value type="QByteArray" key="InternalId">{1a0985cf-ad32-487c-8af8-85ee532ac19c}</value>
<value type="QString" key="KeyFile"></value>
<value type="QString" key="Name">MeeGo 1.2 Harmattan Device</value>
<value type="int" key="Origin">0</value>
<value type="QString" key="OsType">HarmattanOsType</value>
<value type="QString" key="Password"></value>
<value type="int" key="SshPort">22</value>
<value type="int" key="Timeout">10</value>
<value type="int" key="Type">0</value>
<value type="QString" key="Uname">developer</value>
</valuemap>
<valuemap type="QVariantMap">
<value type="int" key="Authentication">1</value>
<value type="QString" key="FreePortsSpec"></value>
......
......@@ -29,69 +29,6 @@
</data>
<data>
<variable>Profile.1</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></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="QByteArray" key="PE.Profile.DeviceType">Desktop</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="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">5</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{68d379f6-357c-42a6-83c6-7743840db4ea}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Qt Simulator</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap>
</data>
<data>
<variable>Profile.2</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value>
<value type="QString" key="PE.Profile.Device">{68a75dff-5ec6-40cb-884f-8f383ed2ebb2}</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Maemo5OsType</value>
<value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{32ee0a53-87d9-4f17-b8a5-a7642101e803}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">3</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{f559999e-8f5d-4246-9321-ea9d1c444c85}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Fremantle</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap>
</data>
<data>
<variable>Profile.3</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value>
<value type="QString" key="PE.Profile.Device">{1a0985cf-ad32-487c-8af8-85ee532ac19c}</value>
<value type="QByteArray" key="PE.Profile.DeviceType">HarmattanOsType</value>
<value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{9be34a3b-acf0-4570-be0d-34cd224d8efe}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">1</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{744799ff-3430-41e1-ad7d-d76c50c1c621}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Harmattan</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap>
</data>
<data>
<variable>Profile.4</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
......@@ -116,7 +53,7 @@
</valuemap>
</data>
<data>
<variable>Profile.5</variable>
<variable>Profile.2</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
......@@ -143,7 +80,7 @@
</valuemap>
</data>
<data>
<variable>Profile.6</variable>
<variable>Profile.3</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
......@@ -168,7 +105,7 @@
</valuemap>
</data>
<data>
<variable>Profile.7</variable>
<variable>Profile.4</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
......@@ -196,7 +133,7 @@
</data>
<data>
<variable>Profile.Count</variable>
<value type="int">8</value>
<value type="int">5</value>
</data>
<data>
<variable>Profile.Default</variable>
......
......@@ -4,16 +4,6 @@
<qtcreator>
<data>
<variable>QtVersion.0</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_rt1.2/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.1</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">2</value>
<value type="QString" key="Name">Desktop Qt 4.8 for GCC (Qt SDK)</value>
......@@ -23,17 +13,7 @@
</valuemap>
</data>
<data>
<variable>QtVersion.2</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">3</value>
<value type="QString" key="Name">Qt for Fremantle PR1.3 Devices (Qt SDK)</value>
<value type="QString" key="QMakePath">~/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.3</variable>
<variable>QtVersion.1</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">4</value>
<value type="QString" key="Name">Desktop Qt 4.7.4 for GCC (Qt SDK)</value>
......@@ -43,17 +23,7 @@
</valuemap>
</data>
<data>
<variable>QtVersion.4</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">5</value>
<value type="QString" key="Name">Simulator Qt for GCC (Qt SDK)</value>
<value type="QString" key="QMakePath">~/QtSDK/Simulator/Qt/gcc/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Simulator</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.5</variable>
<variable>QtVersion.2</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">9</value>
<value type="QString" key="Name">Desktop Qt 5.6.1 (SQUISH_DEFAULT_COMPILER)</value>
......@@ -63,7 +33,7 @@
</valuemap>
</data>
<data>
<variable>QtVersion.6</variable>
<variable>QtVersion.3</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">11</value>
<value type="QString" key="Name">Desktop Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)</value>
......
......@@ -20,34 +20,6 @@
</data>
<data>
<variable>ToolChain.1</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">~/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/g++</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
<value type="QString">arm-linux-generic-elf-32bit</value>
</valuelist>
<value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">arm-linux-maemo-elf-32bit</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
<value type="QString" key="ProjectExplorer.ToolChain.DisplayName">GCC for Fremantle</value>
<value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Gcc:{32ee0a53-87d9-4f17-b8a5-a7642101e803}</value>
<value type="int" key="ProjectExplorer.ToolChain.Language">2</value>
</valuemap>
</data>
<data>
<variable>ToolChain.2</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">~/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/g++</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
<value type="QString">arm-linux-generic-elf-32bit</value>
</valuelist>
<value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">arm-linux-harmattan-elf-32bit</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
<value type="QString" key="ProjectExplorer.ToolChain.DisplayName">GCC for Harmattan</value>
<value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Gcc:{9be34a3b-acf0-4570-be0d-34cd224d8efe}</value>
<value type="int" key="ProjectExplorer.ToolChain.Language">2</value>
</valuemap>
</data>
<data>
<variable>ToolChain.3</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang++</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
......@@ -62,7 +34,7 @@
</valuemap>
</data>
<data>
<variable>ToolChain.4</variable>
<variable>ToolChain.2</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
......@@ -77,7 +49,7 @@
</valuemap>
</data>
<data>
<variable>ToolChain.5</variable>
<variable>ToolChain.3</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/gcc</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
......@@ -94,7 +66,7 @@
</data>
<data>
<variable>ToolChain.Count</variable>
<value type="int">6</value>
<value type="int">4</value>
</data>
<data>
<variable>Version</variable>
......
......@@ -8,40 +8,8 @@
<valuemap type="QVariantMap" key="DefaultDevices">
<value type="QString" key="Desktop">Desktop Device</value>
<value type="QString" key="GenericLinuxOsType">{7c5a3673-e300-4286-9666-0f86d3e3dc38}</value>
<value type="QString" key="HarmattanOsType">{1a0985cf-ad32-487c-8af8-85ee532ac19c}</value>
<value type="QString" key="Maemo5OsType">{68a75dff-5ec6-40cb-884f-8f383ed2ebb2}</value>
</valuemap>
<valuelist type="QVariantList" key="DeviceList">
<valuemap type="QVariantMap">
<value type="int" key="Authentication">1</value>
<value type="QString" key="FreePortsSpec">10000-10100</value>
<value type="QString" key="Host">192.168.2.15</value>
<value type="QByteArray" key="InternalId">{68a75dff-5ec6-40cb-884f-8f383ed2ebb2}</value>
<value type="QString" key="KeyFile"></value>
<value type="QString" key="Name">Maemo5/Fremantle Device</value>
<value type="int" key="Origin">0</value>
<value type="QString" key="OsType">Maemo5OsType</value>
<value type="QString" key="Password"></value>
<value type="int" key="SshPort">22</value>
<value type="int" key="Timeout">10</value>
<value type="int" key="Type">0</value>
<value type="QString" key="Uname">developer</value>
</valuemap>
<valuemap type="QVariantMap">
<value type="int" key="Authentication">1</value>
<value type="QString" key="FreePortsSpec">10000-10100</value>
<value type="QString" key="Host">192.168.2.15</value>
<value type="QByteArray" key="InternalId">{1a0985cf-ad32-487c-8af8-85ee532ac19c}</value>
<value type="QString" key="KeyFile"></value>
<value type="QString" key="Name">MeeGo 1.2 Harmattan Device</value>
<value type="int" key="Origin">0</value>
<value type="QString" key="OsType">HarmattanOsType</value>
<value type="QString" key="Password"></value>
<value type="int" key="SshPort">22</value>
<value type="int" key="Timeout">10</value>
<value type="int" key="Type">0</value>
<value type="QString" key="Uname">developer</value>
</valuemap>
<valuemap type="QVariantMap">
<value type="int" key="Authentication">1</value>
<value type="QString" key="FreePortsSpec"></value>
......
......@@ -25,69 +25,6 @@
</data>
<data>
<variable>Profile.1</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></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="QByteArray" key="PE.Profile.DeviceType">Desktop</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="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">5</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{68d379f6-357c-42a6-83c6-7743840db4ea}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Qt Simulator</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap>
</data>
<data>
<variable>Profile.2</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value>
<value type="QString" key="PE.Profile.Device">{68a75dff-5ec6-40cb-884f-8f383ed2ebb2}</value>
<value type="QByteArray" key="PE.Profile.DeviceType">Maemo5OsType</value>
<value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{32ee0a53-87d9-4f17-b8a5-a7642101e803}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">3</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{f559999e-8f5d-4246-9321-ea9d1c444c85}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Fremantle</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap>
</data>
<data>
<variable>Profile.3</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></value>
<value type="QString" key="Debugger.Information">{70e26273-2c0b-4534-bbc0-eb6ca670821a}</value>
<value type="QString" key="PE.Profile.Device">{1a0985cf-ad32-487c-8af8-85ee532ac19c}</value>
<value type="QByteArray" key="PE.Profile.DeviceType">HarmattanOsType</value>
<value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{9be34a3b-acf0-4570-be0d-34cd224d8efe}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">1</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{744799ff-3430-41e1-ad7d-d76c50c1c621}</value>
<valuelist type="QVariantList" key="PE.Profile.MutableInfo"/>
<value type="QString" key="PE.Profile.Name">Harmattan</value>
<value type="bool" key="PE.Profile.SDK">false</value>
</valuemap>
</data>
<data>
<variable>Profile.4</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
......@@ -112,7 +49,7 @@
</valuemap>
</data>
<data>
<variable>Profile.5</variable>
<variable>Profile.2</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
......@@ -133,7 +70,7 @@
</valuemap>
</data>
<data>
<variable>Profile.6</variable>
<variable>Profile.3</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
......@@ -156,7 +93,7 @@
</valuemap>
</data>
<data>
<variable>Profile.7</variable>
<variable>Profile.4</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
......@@ -180,7 +117,7 @@
</valuemap>
</data>
<data>
<variable>Profile.8</variable>
<variable>Profile.5</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
......@@ -205,7 +142,7 @@
</data>
<data>
<variable>Profile.Count</variable>
<value type="int">9</value>
<value type="int">6</value>
</data>
<data>
<variable>Profile.Default</variable>
......
......@@ -4,16 +4,6 @@
<qtcreator>
<data>
<variable>QtVersion.0</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_rt1.2/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.1</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">2</value>
<value type="QString" key="Name">Desktop Qt 4.8 for GCC (Qt SDK)</value>
......@@ -23,17 +13,7 @@
</valuemap>
</data>
<data>
<variable>QtVersion.2</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">3</value>
<value type="QString" key="Name">Qt for Fremantle PR1.3 Devices (Qt SDK)</value>
<value type="QString" key="QMakePath">~/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.3</variable>
<variable>QtVersion.1</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">4</value>
<value type="QString" key="Name">Desktop Qt 4.7.4 for GCC (Qt SDK)</value>
......@@ -43,17 +23,7 @@
</valuemap>
</data>
<data>
<variable>QtVersion.4</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">5</value>
<value type="QString" key="Name">Simulator Qt for GCC (Qt SDK)</value>
<value type="QString" key="QMakePath">~/QtSDK/Simulator/Qt/gcc/bin/qmake</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Simulator</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.5</variable>
<variable>QtVersion.2</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">11</value>
<value type="QString" key="Name">Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)</value>
......@@ -63,7 +33,7 @@
</valuemap>
</data>
<data>
<variable>QtVersion.6</variable>
<variable>QtVersion.3</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">13</value>
<value type="QString" key="Name">Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER)</value>
......@@ -73,7 +43,7 @@
</valuemap>
</data>
<data>
<variable>QtVersion.7</variable>
<variable>QtVersion.4</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">15</value>
<value type="QString" key="Name">Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER)</value>
......
......@@ -19,32 +19,6 @@
</data>
<data>
<variable>ToolChain.1</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">~/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/g++</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
<value type="QString">arm-linux-generic-elf-32bit</value>
</valuelist>
<value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">arm-linux-maemo-elf-32bit</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
<value type="QString" key="ProjectExplorer.ToolChain.DisplayName">GCC for Fremantle</value>
<value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Gcc:{32ee0a53-87d9-4f17-b8a5-a7642101e803}</value>
</valuemap>
</data>
<data>
<variable>ToolChain.2</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">~/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/g++</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
<value type="QString">arm-linux-generic-elf-32bit</value>
</valuelist>
<value type="QString" key="ProjectExplorer.GccToolChain.TargetAbi">arm-linux-harmattan-elf-32bit</value>
<value type="bool" key="ProjectExplorer.ToolChain.Autodetect">false</value>
<value type="QString" key="ProjectExplorer.ToolChain.DisplayName">GCC for Harmattan</value>
<value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Gcc:{9be34a3b-acf0-4570-be0d-34cd224d8efe}</value>
</valuemap>
</data>
<data>
<variable>ToolChain.3</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.OriginalTargetTriple">x86_64-linux-gnu</value>
<value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/gcc</value>
......@@ -63,7 +37,7 @@
</data>
<data>
<variable>ToolChain.Count</variable>
<value type="int">4</value>
<value type="int">2</value>
</data>
<data>
<variable>Version</variable>
......
......@@ -32,24 +32,9 @@
<value type="QString" key="Version">7.8.0</value>
</valuemap>
</data>
<data>
<variable>DebuggerItem.2</variable>
<valuemap type="QVariantMap">
<valuelist type="QVariantList" key="Abis">
<value type="QString">arm-linux-generic-elf-32bit</value>
</valuelist>
<value type="bool" key="AutoDetected">true</value>
<value type="QString" key="AutoDetectionSource"></value>
<value type="QString" key="Binary">C:/QtSDK/pythongdb/python_2.7based/gdb-arm-none-linux-gnueabi.exe</value>
<value type="QString" key="DisplayName">Extracted from Kit Fremantle</value>
<value type="int" key="EngineType">1</value>
<value type="QString" key="Id">{5ad1d623-7300-41b4-ba32-99e11bfcb988}</value>
<value type="QString" key="Version"></value>
</valuemap>
</data>
<data>
<variable>DebuggerItem.Count</variable>
<value type="int">3</value>
<value type="int">2</value>
</data>
<data>
<variable>Version</variable>
......
......@@ -7,25 +7,8 @@
<valuemap type="QVariantMap">
<valuemap type="QVariantMap" key="DefaultDevices">
<value type="QString" key="Desktop">Desktop Device</value>
<value type="QString" key="HarmattanOsType">{3260da4e-2949-43b8-b464-1f34d0a47c04}</value>
<value type="QString" key="Maemo5OsType">{0d112162-56a5-40cb-a911-e0545489da5c}</value>
</valuemap>
<valuelist type="QVariantList" key="DeviceList">
<valuemap type="QVariantMap">
<value type="int" key="Authentication">1</value>
<value type="QString" key="FreePortsSpec">10000-10100</value>
<value type="QString" key="Host">192.168.2.15</value>
<value type="QByteArray" key="InternalId">{0d112162-56a5-40cb-a911-e0545489da5c}</value>
<value type="QString" key="KeyFile"></value>
<value type="QString" key="Name">Maemo5/Fremantle Device</value>
<value type="int" key="Origin">0</value>
<value type="QString" key="OsType">Maemo5OsType</value>
<value type="QString" key="Password"></value>
<value type="int" key="SshPort">22</value>
<value type="int" key="Timeout">10</value>
<value type="int" key="Type">0</value>
<value type="QString" key="Uname">developer</value>
</valuemap>