feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Change-Id: Idd63494e3878dbf8811c35beb957562255d83813
This commit is contained in:
Eike Ziller
2017-02-06 14:52:03 +01:00
parent f76227fa50 69df8ec321
commit 6244168202
20 changed files with 109 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
doc/src/projects/creator-projects-creating.qdoc
View File

@@ -387,6 +387,41 @@
You can create your own project and class wizards. For more information, You can create your own project and class wizards. For more information,
see \l{Adding New Custom Wizards}. 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 \section2 Creating OpenGL Fragment and Vertex Shaders
Qt provides support for integration with OpenGL implementations on all Qt provides support for integration with OpenGL implementations on all

9
doc/src/qtquick/qtquick-modules-with-plugins.qdoc
View File

@@ -60,6 +60,15 @@
then you can specify those using \c{QML_IMPORT_PATH} in the \c{.pro} file of your then you can specify those using \c{QML_IMPORT_PATH} in the \c{.pro} file of your
application. 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 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 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 types exported by the module's plugins and is loaded by \QC when the

32
tests/system/settings/mac/QtProject/qtcreator/devices.xml
View File

@@ -8,40 +8,8 @@
<valuemap type="QVariantMap" key="DefaultDevices"> <valuemap type="QVariantMap" key="DefaultDevices">
<value type="QString" key="Desktop">Desktop Device</value> <value type="QString" key="Desktop">Desktop Device</value>
<value type="QString" key="GenericLinuxOsType">{7c5a3673-e300-4286-9666-0f86d3e3dc38}</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> </valuemap>
<valuelist type="QVariantList" key="DeviceList"> <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"> <valuemap type="QVariantMap">
<value type="int" key="Authentication">1</value> <value type="int" key="Authentication">1</value>
<value type="QString" key="FreePortsSpec"></value> <value type="QString" key="FreePortsSpec"></value>

71
tests/system/settings/mac/QtProject/qtcreator/profiles.xml
View File

@@ -29,69 +29,6 @@
</data> </data>
<data> <data>
<variable>Profile.1</variable> <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"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
@@ -116,7 +53,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.5</variable> <variable>Profile.2</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> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -143,7 +80,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.6</variable> <variable>Profile.3</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>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
@@ -168,7 +105,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.7</variable> <variable>Profile.4</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> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -196,7 +133,7 @@
</data> </data>
<data> <data>
<variable>Profile.Count</variable> <variable>Profile.Count</variable>
<value type="int">8</value> <value type="int">5</value>
</data> </data>
<data> <data>
<variable>Profile.Default</variable> <variable>Profile.Default</variable>

36
tests/system/settings/mac/QtProject/qtcreator/qtversion.xml
View File

@@ -4,16 +4,6 @@
<qtcreator> <qtcreator>
<data> <data>
<variable>QtVersion.0</variable> <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"> <valuemap type="QVariantMap">
<value type="int" key="Id">2</value> <value type="int" key="Id">2</value>
<value type="QString" key="Name">Desktop Qt 4.8 for GCC (Qt SDK)</value> <value type="QString" key="Name">Desktop Qt 4.8 for GCC (Qt SDK)</value>
@@ -23,17 +13,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>QtVersion.2</variable> <variable>QtVersion.1</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>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">4</value> <value type="int" key="Id">4</value>
<value type="QString" key="Name">Desktop Qt 4.7.4 for GCC (Qt SDK)</value> <value type="QString" key="Name">Desktop Qt 4.7.4 for GCC (Qt SDK)</value>
@@ -43,17 +23,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>QtVersion.4</variable> <variable>QtVersion.2</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>
<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.6.1 (SQUISH_DEFAULT_COMPILER)</value> <value type="QString" key="Name">Desktop Qt 5.6.1 (SQUISH_DEFAULT_COMPILER)</value>
@@ -63,7 +33,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>QtVersion.6</variable> <variable>QtVersion.3</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">11</value> <value type="int" key="Id">11</value>
<value type="QString" key="Name">Desktop Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)</value> <value type="QString" key="Name">Desktop Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)</value>

34
tests/system/settings/mac/QtProject/qtcreator/toolchains.xml
View File

@@ -20,34 +20,6 @@
</data> </data>
<data> <data>
<variable>ToolChain.1</variable> <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"> <valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang++</value> <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang++</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
@@ -62,7 +34,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>ToolChain.4</variable> <variable>ToolChain.2</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang</value> <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/clang</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
@@ -77,7 +49,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>ToolChain.5</variable> <variable>ToolChain.3</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/gcc</value> <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/gcc</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis"> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.SupportedAbis">
@@ -94,7 +66,7 @@
</data> </data>
<data> <data>
<variable>ToolChain.Count</variable> <variable>ToolChain.Count</variable>
<value type="int">6</value> <value type="int">4</value>
</data> </data>
<data> <data>
<variable>Version</variable> <variable>Version</variable>

32
tests/system/settings/unix/QtProject/qtcreator/devices.xml
View File

@@ -8,40 +8,8 @@
<valuemap type="QVariantMap" key="DefaultDevices"> <valuemap type="QVariantMap" key="DefaultDevices">
<value type="QString" key="Desktop">Desktop Device</value> <value type="QString" key="Desktop">Desktop Device</value>
<value type="QString" key="GenericLinuxOsType">{7c5a3673-e300-4286-9666-0f86d3e3dc38}</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> </valuemap>
<valuelist type="QVariantList" key="DeviceList"> <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"> <valuemap type="QVariantMap">
<value type="int" key="Authentication">1</value> <value type="int" key="Authentication">1</value>
<value type="QString" key="FreePortsSpec"></value> <value type="QString" key="FreePortsSpec"></value>

73
tests/system/settings/unix/QtProject/qtcreator/profiles.xml
View File

@@ -25,69 +25,6 @@
</data> </data>
<data> <data>
<variable>Profile.1</variable> <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"> <valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value> <value type="bool" key="PE.Profile.AutoDetected">false</value>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
@@ -112,7 +49,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.5</variable> <variable>Profile.2</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>
<valuemap type="QVariantMap" key="PE.Profile.Data"> <valuemap type="QVariantMap" key="PE.Profile.Data">
@@ -133,7 +70,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.6</variable> <variable>Profile.3</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> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -156,7 +93,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.7</variable> <variable>Profile.4</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> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -180,7 +117,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.8</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> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -205,7 +142,7 @@
</data> </data>
<data> <data>
<variable>Profile.Count</variable> <variable>Profile.Count</variable>
<value type="int">9</value> <value type="int">6</value>
</data> </data>
<data> <data>
<variable>Profile.Default</variable> <variable>Profile.Default</variable>

38
tests/system/settings/unix/QtProject/qtcreator/qtversion.xml
View File

@@ -4,16 +4,6 @@
<qtcreator> <qtcreator>
<data> <data>
<variable>QtVersion.0</variable> <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"> <valuemap type="QVariantMap">
<value type="int" key="Id">2</value> <value type="int" key="Id">2</value>
<value type="QString" key="Name">Desktop Qt 4.8 for GCC (Qt SDK)</value> <value type="QString" key="Name">Desktop Qt 4.8 for GCC (Qt SDK)</value>
@@ -23,17 +13,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>QtVersion.2</variable> <variable>QtVersion.1</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>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">4</value> <value type="int" key="Id">4</value>
<value type="QString" key="Name">Desktop Qt 4.7.4 for GCC (Qt SDK)</value> <value type="QString" key="Name">Desktop Qt 4.7.4 for GCC (Qt SDK)</value>
@@ -43,17 +23,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>QtVersion.4</variable> <variable>QtVersion.2</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>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">11</value> <value type="int" key="Id">11</value>
<value type="QString" key="Name">Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)</value> <value type="QString" key="Name">Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)</value>
@@ -63,7 +33,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>QtVersion.6</variable> <variable>QtVersion.3</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">13</value> <value type="int" key="Id">13</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>
@@ -73,7 +43,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>QtVersion.7</variable> <variable>QtVersion.4</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">15</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>

28
tests/system/settings/unix/QtProject/qtcreator/toolchains.xml
View File

@@ -19,32 +19,6 @@
</data> </data>
<data> <data>
<variable>ToolChain.1</variable> <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"> <valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.OriginalTargetTriple">x86_64-linux-gnu</value> <value type="QString" key="ProjectExplorer.GccToolChain.OriginalTargetTriple">x86_64-linux-gnu</value>
<value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/gcc</value> <value type="QString" key="ProjectExplorer.GccToolChain.Path">/usr/bin/gcc</value>
@@ -63,7 +37,7 @@
</data> </data>
<data> <data>
<variable>ToolChain.Count</variable> <variable>ToolChain.Count</variable>
<value type="int">4</value> <value type="int">2</value>
</data> </data>
<data> <data>
<variable>Version</variable> <variable>Version</variable>

17
tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
View File

@@ -32,24 +32,9 @@
<value type="QString" key="Version">7.8.0</value> <value type="QString" key="Version">7.8.0</value>
</valuemap> </valuemap>
</data> </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> <data>
<variable>DebuggerItem.Count</variable> <variable>DebuggerItem.Count</variable>
<value type="int">3</value> <value type="int">2</value>
</data> </data>
<data> <data>
<variable>Version</variable> <variable>Version</variable>

32
tests/system/settings/windows/QtProject/qtcreator/devices.xml
View File

@@ -7,25 +7,8 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<valuemap type="QVariantMap" key="DefaultDevices"> <valuemap type="QVariantMap" key="DefaultDevices">
<value type="QString" key="Desktop">Desktop Device</value> <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> </valuemap>
<valuelist type="QVariantList" key="DeviceList"> <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>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Authentication">1</value> <value type="int" key="Authentication">1</value>
<value type="QString" key="FreePortsSpec"></value> <value type="QString" key="FreePortsSpec"></value>
@@ -41,21 +24,6 @@
<value type="int" key="Type">0</value> <value type="int" key="Type">0</value>
<value type="QString" key="Uname"></value> <value type="QString" key="Uname"></value>
</valuemap> </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">{3260da4e-2949-43b8-b464-1f34d0a47c04}</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>
</valuelist> </valuelist>
</valuemap> </valuemap>
</data> </data>

84
tests/system/settings/windows/QtProject/qtcreator/profiles.xml
View File

@@ -32,76 +32,6 @@
</data> </data>
<data> <data>
<variable>Profile.1</variable> <variable>Profile.1</variable>
<valuemap type="QVariantMap">
<value type="bool" key="PE.Profile.AutoDetected">false</value>
<value type="QString" key="PE.Profile.AutoDetectionSource"></value>
<valuemap type="QVariantMap" key="PE.Profile.Data">
<value type="QString" key="Android.GdbServer.Information"></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="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.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
<valuemap type="QVariantMap" key="PE.Profile.ToolChains">
<value type="QByteArray" key="C">{41d0a157-7cf1-4c83-bab8-d77b3f136b85}</value>
<value type="QString" key="Cxx">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
</valuemap>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">9</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{0ce9f69f-0f60-4b04-8691-c328ee5bfe14}</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>
<valuelist type="QVariantList" key="PE.Profile.StickyInfo"/>
</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">{5ad1d623-7300-41b4-ba32-99e11bfcb988}</value>
<value type="QString" key="PE.Profile.Device">{0d112162-56a5-40cb-a911-e0545489da5c}</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:{333fff9b-5a71-4289-ac68-af2174cb68df}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">16</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{618722a5-c008-4869-9404-07f755973496}</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">{5ad1d623-7300-41b4-ba32-99e11bfcb988}</value>
<value type="QString" key="PE.Profile.Device">{3260da4e-2949-43b8-b464-1f34d0a47c04}</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:{306bf3f1-a40e-49ca-9936-72af77d8ae6d}</value>
<value type="QString" key="QtPM4.mkSpecInformation"></value>
<value type="int" key="QtSupport.QtInformation">15</value>
</valuemap>
<value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
<value type="QString" key="PE.Profile.Id">{3800d54f-6c86-4cd1-88a9-7456bbef6dce}</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"> <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> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -114,7 +44,7 @@
<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.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value>
<valuemap type="QVariantMap" key="PE.Profile.ToolChains"> <valuemap type="QVariantMap" key="PE.Profile.ToolChains">
<value type="QByteArray" key="C">{88921fca-56c4-4ea8-9681-ee0fa5085814}</value> <value type="QByteArray" key="C">{93e707bd-236f-4d8d-917d-814aa358024b}</value>
<value type="QString" key="Cxx">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value> <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value>
</valuemap> </valuemap>
<value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="QString" key="QtPM4.mkSpecInformation"></value>
@@ -129,7 +59,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.5</variable> <variable>Profile.2</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> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -142,7 +72,7 @@
<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.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value>
<valuemap type="QVariantMap" key="PE.Profile.ToolChains"> <valuemap type="QVariantMap" key="PE.Profile.ToolChains">
<value type="QByteArray" key="C">{88921fca-56c4-4ea8-9681-ee0fa5085814}</value> <value type="QByteArray" key="C">{93e707bd-236f-4d8d-917d-814aa358024b}</value>
<value type="QString" key="Cxx">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value> <value type="QString" key="Cxx">ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}</value>
</valuemap> </valuemap>
<value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="QString" key="QtPM4.mkSpecInformation"></value>
@@ -157,7 +87,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.6</variable> <variable>Profile.3</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> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -185,7 +115,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>Profile.7</variable> <variable>Profile.4</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> <value type="QString" key="PE.Profile.AutoDetectionSource"></value>
@@ -198,7 +128,7 @@
<value type="QString" key="PE.Profile.SysRoot"></value> <value type="QString" key="PE.Profile.SysRoot"></value>
<value type="QString" key="PE.Profile.ToolChain">{7ca0887f-a9a5-4251-aba6-560a15595d20}</value> <value type="QString" key="PE.Profile.ToolChain">{7ca0887f-a9a5-4251-aba6-560a15595d20}</value>
<valuemap type="QVariantMap" key="PE.Profile.ToolChains"> <valuemap type="QVariantMap" key="PE.Profile.ToolChains">
<value type="QByteArray" key="C">{3cdb6753-cdee-4bb7-8fb3-2e7a60e279e3}</value> <value type="QByteArray" key="C">{d35e7a1a-5ab8-4fd6-8a2c-634846c669bb}</value>
<value type="QString" key="Cxx">{7ca0887f-a9a5-4251-aba6-560a15595d20}</value> <value type="QString" key="Cxx">{7ca0887f-a9a5-4251-aba6-560a15595d20}</value>
</valuemap> </valuemap>
<value type="QString" key="QtPM4.mkSpecInformation"></value> <value type="QString" key="QtPM4.mkSpecInformation"></value>
@@ -214,7 +144,7 @@
</data> </data>
<data> <data>
<variable>Profile.Count</variable> <variable>Profile.Count</variable>
<value type="int">8</value> <value type="int">5</value>
</data> </data>
<data> <data>
<variable>Profile.Default</variable> <variable>Profile.Default</variable>

34
tests/system/settings/windows/QtProject/qtcreator/qtversion.xml
View File

@@ -24,36 +24,6 @@
</data> </data>
<data> <data>
<variable>QtVersion.2</variable> <variable>QtVersion.2</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">9</value>
<value type="QString" key="Name">Simulator Qt for MinGW 4.4 (Qt SDK)</value>
<value type="QString" key="QMakePath">c:/qtsdk/simulator/qt/mingw/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Simulator</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.3</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">15</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_rt1.2/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.4</variable>
<valuemap type="QVariantMap">
<value type="int" key="Id">16</value>
<value type="QString" key="Name">Qt for Fremantle PR1.3 Devices (Qt SDK)</value>
<value type="QString" key="QMakePath">c:/qtsdk/maemo/4.6.2/targets/fremantle-pr13/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Maemo</value>
<value type="bool" key="isAutodetected">false</value>
</valuemap>
</data>
<data>
<variable>QtVersion.5</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">20</value> <value type="int" key="Id">20</value>
<value type="QString" key="Name">Qt 5.3.1 (msvc2010_opengl)</value> <value type="QString" key="Name">Qt 5.3.1 (msvc2010_opengl)</value>
@@ -63,7 +33,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>QtVersion.6</variable> <variable>QtVersion.3</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">22</value> <value type="int" key="Id">22</value>
<value type="QString" key="Name">Qt %{Qt:Version} (mingw491_32)</value> <value type="QString" key="Name">Qt %{Qt:Version} (mingw491_32)</value>
@@ -73,7 +43,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>QtVersion.7</variable> <variable>QtVersion.4</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">24</value> <value type="int" key="Id">24</value>
<value type="QString" key="Name">Qt %{Qt:Version} (msvc2013)</value> <value type="QString" key="Name">Qt %{Qt:Version} (msvc2013)</value>

52
tests/system/settings/windows/QtProject/qtcreator/toolchains.xml
View File

@@ -19,32 +19,6 @@
</data> </data>
<data> <data>
<variable>ToolChain.1</variable> <variable>ToolChain.1</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/g++.exe</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:{333fff9b-5a71-4289-ac68-af2174cb68df}</value>
</valuemap>
</data>
<data>
<variable>ToolChain.2</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/g++.exe</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:{306bf3f1-a40e-49ca-9936-72af77d8ae6d}</value>
</valuemap>
</data>
<data>
<variable>ToolChain.3</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2010-pe-32bit</value> <value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2010-pe-32bit</value>
<value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">c:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/vcvarsall.bat</value> <value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">c:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/vcvarsall.bat</value>
@@ -55,7 +29,7 @@
</valuemap> </valuemap>
</data> </data>
<data> <data>
<variable>ToolChain.4</variable> <variable>ToolChain.2</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/Qt/Qt5.4.1/Tools/mingw491_32/bin/g++.exe</value> <value type="QString" key="ProjectExplorer.GccToolChain.Path">C:/Qt/Qt5.4.1/Tools/mingw491_32/bin/g++.exe</value>
<valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.PlatformCodeGenFlags"/> <valuelist type="QVariantList" key="ProjectExplorer.GccToolChain.PlatformCodeGenFlags"/>
@@ -69,6 +43,30 @@
<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.3</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.MsvcToolChain.SupportedAbi">x86-windows-msvc2010-pe-32bit</value>
<value type="QString" key="ProjectExplorer.MsvcToolChain.VarsBat">C:/Program Files (x86)/Microsoft Visual Studio 10.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 10.0 (x86)</value>
<value type="QString" key="ProjectExplorer.ToolChain.Id">ProjectExplorer.ToolChain.Msvc:{93e707bd-236f-4d8d-917d-814aa358024b}</value>
<value type="int" key="ProjectExplorer.ToolChain.Language">1</value>
</valuemap>
</data>
<data>
<variable>ToolChain.4</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:{d35e7a1a-5ab8-4fd6-8a2c-634846c669bb}</value>
<value type="int" key="ProjectExplorer.ToolChain.Language">1</value>
</valuemap>
</data>
<data> <data>
<variable>ToolChain.5</variable> <variable>ToolChain.5</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">

9
tests/system/shared/classes.py
View File

@@ -28,11 +28,10 @@ import operator
# for easier re-usage (because Python hasn't an enum type) # for easier re-usage (because Python hasn't an enum type)
class Targets: class Targets:
ALL_TARGETS = map(lambda x: 2 ** x , range(7)) ALL_TARGETS = map(lambda x: 2 ** x , range(6))
(DESKTOP_474_GCC, (DESKTOP_474_GCC,
DESKTOP_480_DEFAULT, DESKTOP_480_DEFAULT,
SIMULATOR,
EMBEDDED_LINUX, EMBEDDED_LINUX,
DESKTOP_531_DEFAULT, DESKTOP_531_DEFAULT,
DESKTOP_541_GCC, DESKTOP_541_GCC,
@@ -40,7 +39,7 @@ class Targets:
@staticmethod @staticmethod
def desktopTargetClasses(): def desktopTargetClasses():
desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.SIMULATOR & ~Targets.EMBEDDED_LINUX) desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.EMBEDDED_LINUX)
if platform.system() == 'Darwin': if platform.system() == 'Darwin':
desktopTargets &= ~Targets.DESKTOP_541_GCC desktopTargets &= ~Targets.DESKTOP_541_GCC
return desktopTargets return desktopTargets
@@ -48,7 +47,7 @@ class Targets:
@staticmethod @staticmethod
def qt4Classes(): def qt4Classes():
return (Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_DEFAULT return (Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_DEFAULT
| Targets.SIMULATOR | Targets.EMBEDDED_LINUX) | Targets.EMBEDDED_LINUX)
@staticmethod @staticmethod
def getStringForTarget(target): def getStringForTarget(target):
@@ -59,8 +58,6 @@ class Targets:
return "Desktop 480 MSVC2010" return "Desktop 480 MSVC2010"
else: else:
return "Desktop 480 GCC" return "Desktop 480 GCC"
elif target == Targets.SIMULATOR:
return "Qt Simulator"
elif target == Targets.EMBEDDED_LINUX: elif target == Targets.EMBEDDED_LINUX:
return "Embedded Linux" return "Embedded Linux"
elif target == Targets.DESKTOP_531_DEFAULT: elif target == Targets.DESKTOP_531_DEFAULT:

6
tests/system/shared/project.py
View File

@@ -186,7 +186,7 @@ def __modifyAvailableTargets__(available, requiredQt, asStrings=False):
if not (requiredQtVersion == "480" and found.group(0) == "474"): if not (requiredQtVersion == "480" and found.group(0) == "474"):
available.remove(currentItem) available.remove(currentItem)
if requiredQtVersion > "480": if requiredQtVersion > "480":
toBeRemoved = [Targets.EMBEDDED_LINUX, Targets.SIMULATOR] toBeRemoved = [Targets.EMBEDDED_LINUX]
if asStrings: if asStrings:
toBeRemoved = Targets.getTargetsAsStrings(toBeRemoved) toBeRemoved = Targets.getTargetsAsStrings(toBeRemoved)
for t in toBeRemoved: for t in toBeRemoved:
@@ -424,8 +424,6 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None, ad
if mustCheck: if mustCheck:
test.fail("Failed to check target '%s'." % Targets.getStringForTarget(current)) test.fail("Failed to check target '%s'." % Targets.getStringForTarget(current))
else: else:
# Simulator has been added without knowing whether configured or not - so skip warning here?
if current != Targets.SIMULATOR:
test.warning("Target '%s' is not set up correctly." % Targets.getStringForTarget(current)) test.warning("Target '%s' is not set up correctly." % Targets.getStringForTarget(current))
return checkedTargets return checkedTargets
@@ -643,8 +641,6 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
result.extend([Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_561_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"):
result.append(Targets.SIMULATOR)
elif 'Platform independent' in text: elif 'Platform independent' in text:
result = list(Targets.ALL_TARGETS) result = list(Targets.ALL_TARGETS)
result.remove(Targets.EMBEDDED_LINUX) result.remove(Targets.EMBEDDED_LINUX)

1
tests/system/shared/workarounds.py
View File

@@ -70,7 +70,6 @@ class JIRA:
# Helper class # Helper class
class Bug: class Bug:
CREATOR = 'QTCREATORBUG' CREATOR = 'QTCREATORBUG'
SIMULATOR = 'QTSIM'
SDK = 'QTSDK' SDK = 'QTSDK'
QT = 'QTBUG' QT = 'QTBUG'
QT_QUICKCOMPONENTS = 'QTCOMPONENTS' QT_QUICKCOMPONENTS = 'QTCOMPONENTS'

7
tests/system/suite_debugger/tst_qml_js_console/test.py
View File

@@ -56,7 +56,7 @@ def useDebuggerConsole(expression, expectedOutput, check=None, checkOutp=None):
def debuggerHasStopped(): def debuggerHasStopped():
stopDebugger = findObject(":Debugger Toolbar.Exit Debugger_QToolButton") stopDebugger = findObject(":Debugger Toolbar.Exit Debugger_QToolButton")
fancyDebugButton = findObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton") fancyDebugButton = waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")
result = test.verify(not stopDebugger.enabled and fancyDebugButton.enabled, result = test.verify(not stopDebugger.enabled and fancyDebugButton.enabled,
"Verifying whether debugger buttons are in correct state.") "Verifying whether debugger buttons are in correct state.")
ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton") ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton")
@@ -110,9 +110,6 @@ def testLoggingFeatures():
clickButton(":*Qt Creator.Clear_QToolButton") clickButton(":*Qt Creator.Clear_QToolButton")
def main(): def main():
test.warning("This test must be rewritten (QTCREATORBUG-15831)") # QmlJS Console has changed
return
projName = "simpleQuickUI2.qmlproject" projName = "simpleQuickUI2.qmlproject"
projFolder = os.path.dirname(findFile("testdata", "simpleQuickUI2/%s" % projName)) projFolder = os.path.dirname(findFile("testdata", "simpleQuickUI2/%s" % projName))
if not neededFilePresent(os.path.join(projFolder, projName)): if not neededFilePresent(os.path.join(projFolder, projName)):
@@ -128,7 +125,7 @@ def main():
return return
# if Debug is enabled - 1 valid kit is assigned - real check for this is done in tst_qml_locals # if Debug is enabled - 1 valid kit is assigned - real check for this is done in tst_qml_locals
fancyDebugButton = findObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton") fancyDebugButton = waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")
if test.verify(waitFor('fancyDebugButton.enabled', 5000), "Start Debugging is enabled."): if test.verify(waitFor('fancyDebugButton.enabled', 5000), "Start Debugging is enabled."):
# make sure QML Debugging is enabled # make sure QML Debugging is enabled
switchViewTo(ViewConstants.PROJECTS) switchViewTo(ViewConstants.PROJECTS)

4
tests/system/suite_general/tst_default_settings/test.py
View File

@@ -252,7 +252,9 @@ def __getCDB__():
"C:\\Program Files (x86)\\Windows Kits\\8.1\\Debuggers\\x86", "C:\\Program Files (x86)\\Windows Kits\\8.1\\Debuggers\\x86",
"C:\\Program Files (x86)\\Windows Kits\\8.1\\Debuggers\\x64", "C:\\Program Files (x86)\\Windows Kits\\8.1\\Debuggers\\x64",
"C:\\Program Files\\Windows Kits\\8.1\\Debuggers\\x86", "C:\\Program Files\\Windows Kits\\8.1\\Debuggers\\x86",
"C:\\Program Files\\Windows Kits\\8.1\\Debuggers\\x64"] "C:\\Program Files\\Windows Kits\\8.1\\Debuggers\\x64",
"C:\\Program Files (x86)\\Windows Kits\\10\\Debuggers\\x86",
"C:\\Program Files (x86)\\Windows Kits\\10\\Debuggers\\x64"]
for cdbPath in possibleLocations: for cdbPath in possibleLocations:
cdb = os.path.join(cdbPath, "cdb.exe") cdb = os.path.join(cdbPath, "cdb.exe")
if os.path.exists(cdb): if os.path.exists(cdb):