diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index 8875e5f4b91..f26ea946dea 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -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
diff --git a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
index f336a6163da..be9d8ee5ed0 100644
--- a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
+++ b/doc/src/qtquick/qtquick-modules-with-plugins.qdoc
@@ -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
diff --git a/tests/system/settings/mac/QtProject/qtcreator/devices.xml b/tests/system/settings/mac/QtProject/qtcreator/devices.xml
index fd4632d18ea..274f258e7cc 100644
--- a/tests/system/settings/mac/QtProject/qtcreator/devices.xml
+++ b/tests/system/settings/mac/QtProject/qtcreator/devices.xml
@@ -8,40 +8,8 @@
Desktop Device
{7c5a3673-e300-4286-9666-0f86d3e3dc38}
- {1a0985cf-ad32-487c-8af8-85ee532ac19c}
- {68a75dff-5ec6-40cb-884f-8f383ed2ebb2}
-
- 1
- 10000-10100
- 192.168.2.15
- {68a75dff-5ec6-40cb-884f-8f383ed2ebb2}
-
- Maemo5/Fremantle Device
- 0
- Maemo5OsType
-
- 22
- 10
- 0
- developer
-
-
- 1
- 10000-10100
- 192.168.2.15
- {1a0985cf-ad32-487c-8af8-85ee532ac19c}
-
- MeeGo 1.2 Harmattan Device
- 0
- HarmattanOsType
-
- 22
- 10
- 0
- developer
-
1
diff --git a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml
index 6e254742aba..002250ea9fa 100644
--- a/tests/system/settings/mac/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/mac/QtProject/qtcreator/profiles.xml
@@ -29,69 +29,6 @@
Profile.1
-
- false
-
-
- {70e26273-2c0b-4534-bbc0-eb6ca670821a}
- Desktop Device
- Desktop
-
- ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}
-
- 5
-
- :///DESKTOP///
- {68d379f6-357c-42a6-83c6-7743840db4ea}
-
- Qt Simulator
- false
-
-
-
- Profile.2
-
- false
-
-
- {70e26273-2c0b-4534-bbc0-eb6ca670821a}
- {68a75dff-5ec6-40cb-884f-8f383ed2ebb2}
- Maemo5OsType
-
- ProjectExplorer.ToolChain.Gcc:{32ee0a53-87d9-4f17-b8a5-a7642101e803}
-
- 3
-
- :///DESKTOP///
- {f559999e-8f5d-4246-9321-ea9d1c444c85}
-
- Fremantle
- false
-
-
-
- Profile.3
-
- false
-
-
- {70e26273-2c0b-4534-bbc0-eb6ca670821a}
- {1a0985cf-ad32-487c-8af8-85ee532ac19c}
- HarmattanOsType
-
- ProjectExplorer.ToolChain.Gcc:{9be34a3b-acf0-4570-be0d-34cd224d8efe}
-
- 1
-
- :///DESKTOP///
- {744799ff-3430-41e1-ad7d-d76c50c1c621}
-
- Harmattan
- false
-
-
-
- Profile.4
false
@@ -116,7 +53,7 @@
- Profile.5
+ Profile.2
false
@@ -143,7 +80,7 @@
- Profile.6
+ Profile.3
false
@@ -168,7 +105,7 @@
- Profile.7
+ Profile.4
false
@@ -196,7 +133,7 @@
Profile.Count
- 8
+ 5
Profile.Default
diff --git a/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml b/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml
index 909dcb9eee1..ff94b4aa3b4 100644
--- a/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml
+++ b/tests/system/settings/mac/QtProject/qtcreator/qtversion.xml
@@ -4,16 +4,6 @@
QtVersion.0
-
- 1
- Harmattan Target (Qt SDK)
- ~/QtSDK/Madde/targets/harmattan_10.2011.34-1_rt1.2/bin/qmake
- Qt4ProjectManager.QtVersion.Maemo
- false
-
-
-
- QtVersion.1
2
Desktop Qt 4.8 for GCC (Qt SDK)
@@ -23,17 +13,7 @@
- QtVersion.2
-
- 3
- Qt for Fremantle PR1.3 Devices (Qt SDK)
- ~/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/qmake
- Qt4ProjectManager.QtVersion.Maemo
- false
-
-
-
- QtVersion.3
+ QtVersion.1
4
Desktop Qt 4.7.4 for GCC (Qt SDK)
@@ -43,17 +23,7 @@
- QtVersion.4
-
- 5
- Simulator Qt for GCC (Qt SDK)
- ~/QtSDK/Simulator/Qt/gcc/bin/qmake
- Qt4ProjectManager.QtVersion.Simulator
- false
-
-
-
- QtVersion.5
+ QtVersion.2
9
Desktop Qt 5.6.1 (SQUISH_DEFAULT_COMPILER)
@@ -63,7 +33,7 @@
- QtVersion.6
+ QtVersion.3
11
Desktop Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)
diff --git a/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml b/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml
index 69bbde66b7e..411027599df 100644
--- a/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml
+++ b/tests/system/settings/mac/QtProject/qtcreator/toolchains.xml
@@ -20,34 +20,6 @@
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}
- 2
-
-
-
- ToolChain.2
-
- ~/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/g++
-
- arm-linux-generic-elf-32bit
-
- arm-linux-harmattan-elf-32bit
- false
- GCC for Harmattan
- ProjectExplorer.ToolChain.Gcc:{9be34a3b-acf0-4570-be0d-34cd224d8efe}
- 2
-
-
-
- ToolChain.3
/usr/bin/clang++
@@ -62,7 +34,7 @@
- ToolChain.4
+ ToolChain.2
/usr/bin/clang
@@ -77,7 +49,7 @@
- ToolChain.5
+ ToolChain.3
/usr/bin/gcc
@@ -94,7 +66,7 @@
ToolChain.Count
- 6
+ 4
Version
diff --git a/tests/system/settings/unix/QtProject/qtcreator/devices.xml b/tests/system/settings/unix/QtProject/qtcreator/devices.xml
index fd4632d18ea..274f258e7cc 100644
--- a/tests/system/settings/unix/QtProject/qtcreator/devices.xml
+++ b/tests/system/settings/unix/QtProject/qtcreator/devices.xml
@@ -8,40 +8,8 @@
Desktop Device
{7c5a3673-e300-4286-9666-0f86d3e3dc38}
- {1a0985cf-ad32-487c-8af8-85ee532ac19c}
- {68a75dff-5ec6-40cb-884f-8f383ed2ebb2}
-
- 1
- 10000-10100
- 192.168.2.15
- {68a75dff-5ec6-40cb-884f-8f383ed2ebb2}
-
- Maemo5/Fremantle Device
- 0
- Maemo5OsType
-
- 22
- 10
- 0
- developer
-
-
- 1
- 10000-10100
- 192.168.2.15
- {1a0985cf-ad32-487c-8af8-85ee532ac19c}
-
- MeeGo 1.2 Harmattan Device
- 0
- HarmattanOsType
-
- 22
- 10
- 0
- developer
-
1
diff --git a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
index aac3728ef36..6914de5443f 100644
--- a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
@@ -25,69 +25,6 @@
Profile.1
-
- false
-
-
- {70e26273-2c0b-4534-bbc0-eb6ca670821a}
- Desktop Device
- Desktop
-
- ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}
-
- 5
-
- :///DESKTOP///
- {68d379f6-357c-42a6-83c6-7743840db4ea}
-
- Qt Simulator
- false
-
-
-
- Profile.2
-
- false
-
-
- {70e26273-2c0b-4534-bbc0-eb6ca670821a}
- {68a75dff-5ec6-40cb-884f-8f383ed2ebb2}
- Maemo5OsType
-
- ProjectExplorer.ToolChain.Gcc:{32ee0a53-87d9-4f17-b8a5-a7642101e803}
-
- 3
-
- :///DESKTOP///
- {f559999e-8f5d-4246-9321-ea9d1c444c85}
-
- Fremantle
- false
-
-
-
- Profile.3
-
- false
-
-
- {70e26273-2c0b-4534-bbc0-eb6ca670821a}
- {1a0985cf-ad32-487c-8af8-85ee532ac19c}
- HarmattanOsType
-
- ProjectExplorer.ToolChain.Gcc:{9be34a3b-acf0-4570-be0d-34cd224d8efe}
-
- 1
-
- :///DESKTOP///
- {744799ff-3430-41e1-ad7d-d76c50c1c621}
-
- Harmattan
- false
-
-
-
- Profile.4
false
@@ -112,7 +49,7 @@
- Profile.5
+ Profile.2
false
@@ -133,7 +70,7 @@
- Profile.6
+ Profile.3
false
@@ -156,7 +93,7 @@
- Profile.7
+ Profile.4
false
@@ -180,7 +117,7 @@
- Profile.8
+ Profile.5
false
@@ -205,7 +142,7 @@
Profile.Count
- 9
+ 6
Profile.Default
diff --git a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml
index df6caa88428..96f21e9f84c 100644
--- a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml
+++ b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml
@@ -4,16 +4,6 @@
QtVersion.0
-
- 1
- Harmattan Target (Qt SDK)
- ~/QtSDK/Madde/targets/harmattan_10.2011.34-1_rt1.2/bin/qmake
- Qt4ProjectManager.QtVersion.Maemo
- false
-
-
-
- QtVersion.1
2
Desktop Qt 4.8 for GCC (Qt SDK)
@@ -23,17 +13,7 @@
- QtVersion.2
-
- 3
- Qt for Fremantle PR1.3 Devices (Qt SDK)
- ~/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/qmake
- Qt4ProjectManager.QtVersion.Maemo
- false
-
-
-
- QtVersion.3
+ QtVersion.1
4
Desktop Qt 4.7.4 for GCC (Qt SDK)
@@ -43,17 +23,7 @@
- QtVersion.4
-
- 5
- Simulator Qt for GCC (Qt SDK)
- ~/QtSDK/Simulator/Qt/gcc/bin/qmake
- Qt4ProjectManager.QtVersion.Simulator
- false
-
-
-
- QtVersion.5
+ QtVersion.2
11
Qt 5.3.1 (SQUISH_DEFAULT_COMPILER)
@@ -63,7 +33,7 @@
- QtVersion.6
+ QtVersion.3
13
Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER)
@@ -73,7 +43,7 @@
- QtVersion.7
+ QtVersion.4
15
Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER)
diff --git a/tests/system/settings/unix/QtProject/qtcreator/toolchains.xml b/tests/system/settings/unix/QtProject/qtcreator/toolchains.xml
index 20194d2fba9..0c98a8f561f 100644
--- a/tests/system/settings/unix/QtProject/qtcreator/toolchains.xml
+++ b/tests/system/settings/unix/QtProject/qtcreator/toolchains.xml
@@ -19,32 +19,6 @@
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.2
-
- ~/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/g++
-
- arm-linux-generic-elf-32bit
-
- arm-linux-harmattan-elf-32bit
- false
- GCC for Harmattan
- ProjectExplorer.ToolChain.Gcc:{9be34a3b-acf0-4570-be0d-34cd224d8efe}
-
-
-
- ToolChain.3
x86_64-linux-gnu
/usr/bin/gcc
@@ -63,7 +37,7 @@
ToolChain.Count
- 4
+ 2
Version
diff --git a/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml b/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
index 6bb8c3101fe..926bc49c9c7 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml
@@ -32,24 +32,9 @@
7.8.0
-
- DebuggerItem.2
-
-
- arm-linux-generic-elf-32bit
-
- true
-
- C:/QtSDK/pythongdb/python_2.7based/gdb-arm-none-linux-gnueabi.exe
- Extracted from Kit Fremantle
- 1
- {5ad1d623-7300-41b4-ba32-99e11bfcb988}
-
-
-
DebuggerItem.Count
- 3
+ 2
Version
diff --git a/tests/system/settings/windows/QtProject/qtcreator/devices.xml b/tests/system/settings/windows/QtProject/qtcreator/devices.xml
index 558af5ec9e8..70eaf23f6b2 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/devices.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/devices.xml
@@ -7,25 +7,8 @@
Desktop Device
- {3260da4e-2949-43b8-b464-1f34d0a47c04}
- {0d112162-56a5-40cb-a911-e0545489da5c}
-
- 1
- 10000-10100
- 192.168.2.15
- {0d112162-56a5-40cb-a911-e0545489da5c}
-
- Maemo5/Fremantle Device
- 0
- Maemo5OsType
-
- 22
- 10
- 0
- developer
-
1
@@ -41,21 +24,6 @@
0
-
- 1
- 10000-10100
- 192.168.2.15
- {3260da4e-2949-43b8-b464-1f34d0a47c04}
-
- MeeGo 1.2 Harmattan Device
- 0
- HarmattanOsType
-
- 22
- 10
- 0
- developer
-
diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
index ee44082aa55..f7656fd7e4e 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
@@ -32,76 +32,6 @@
Profile.1
-
- false
-
-
-
- {2f8a1f59-ddd7-49f0-ae61-1337223f56a3}
- Desktop Device
- Desktop
-
-
- ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}
-
- {41d0a157-7cf1-4c83-bab8-d77b3f136b85}
- ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}
-
-
- 9
-
- :///DESKTOP///
- {0ce9f69f-0f60-4b04-8691-c328ee5bfe14}
-
- Qt Simulator
- false
-
-
-
-
- Profile.2
-
- false
-
-
- {5ad1d623-7300-41b4-ba32-99e11bfcb988}
- {0d112162-56a5-40cb-a911-e0545489da5c}
- Maemo5OsType
-
- ProjectExplorer.ToolChain.Gcc:{333fff9b-5a71-4289-ac68-af2174cb68df}
-
- 16
-
- :///DESKTOP///
- {618722a5-c008-4869-9404-07f755973496}
-
- Fremantle
- false
-
-
-
- Profile.3
-
- false
-
-
- {5ad1d623-7300-41b4-ba32-99e11bfcb988}
- {3260da4e-2949-43b8-b464-1f34d0a47c04}
- HarmattanOsType
-
- ProjectExplorer.ToolChain.Gcc:{306bf3f1-a40e-49ca-9936-72af77d8ae6d}
-
- 15
-
- :///DESKTOP///
- {3800d54f-6c86-4cd1-88a9-7456bbef6dce}
-
- Harmattan
- false
-
-
-
- Profile.4
false
@@ -114,7 +44,7 @@
ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}
- {88921fca-56c4-4ea8-9681-ee0fa5085814}
+ {93e707bd-236f-4d8d-917d-814aa358024b}
ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}
@@ -129,7 +59,7 @@
- Profile.5
+ Profile.2
false
@@ -142,7 +72,7 @@
ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}
- {88921fca-56c4-4ea8-9681-ee0fa5085814}
+ {93e707bd-236f-4d8d-917d-814aa358024b}
ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2}
@@ -157,7 +87,7 @@
- Profile.6
+ Profile.3
false
@@ -185,7 +115,7 @@
- Profile.7
+ Profile.4
false
@@ -198,7 +128,7 @@
{7ca0887f-a9a5-4251-aba6-560a15595d20}
- {3cdb6753-cdee-4bb7-8fb3-2e7a60e279e3}
+ {d35e7a1a-5ab8-4fd6-8a2c-634846c669bb}
{7ca0887f-a9a5-4251-aba6-560a15595d20}
@@ -214,7 +144,7 @@
Profile.Count
- 8
+ 5
Profile.Default
diff --git a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml
index a517d266d51..73d1c52694e 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml
@@ -24,36 +24,6 @@
QtVersion.2
-
- 9
- Simulator Qt for MinGW 4.4 (Qt SDK)
- c:/qtsdk/simulator/qt/mingw/bin/qmake.exe
- Qt4ProjectManager.QtVersion.Simulator
- false
-
-
-
- QtVersion.3
-
- 15
- Harmattan Target (Qt SDK)
- c:/qtsdk/madde/targets/harmattan_10.2011.34-1_rt1.2/bin/qmake.exe
- Qt4ProjectManager.QtVersion.Maemo
- false
-
-
-
- QtVersion.4
-
- 16
- Qt for Fremantle PR1.3 Devices (Qt SDK)
- c:/qtsdk/maemo/4.6.2/targets/fremantle-pr13/bin/qmake.exe
- Qt4ProjectManager.QtVersion.Maemo
- false
-
-
-
- QtVersion.5
20
Qt 5.3.1 (msvc2010_opengl)
@@ -63,7 +33,7 @@
- QtVersion.6
+ QtVersion.3
22
Qt %{Qt:Version} (mingw491_32)
@@ -73,7 +43,7 @@
- QtVersion.7
+ QtVersion.4
24
Qt %{Qt:Version} (msvc2013)
diff --git a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml
index 70616db5c79..bbb2ad2a904 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml
@@ -19,32 +19,6 @@
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.2
-
- C:/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/g++.exe
-
- arm-linux-generic-elf-32bit
-
- arm-linux-harmattan-elf-32bit
- false
- GCC for Harmattan
- ProjectExplorer.ToolChain.Gcc:{306bf3f1-a40e-49ca-9936-72af77d8ae6d}
-
-
-
- ToolChain.3
x86-windows-msvc2010-pe-32bit
c:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/vcvarsall.bat
@@ -55,7 +29,7 @@
- ToolChain.4
+ ToolChain.2
C:/Qt/Qt5.4.1/Tools/mingw491_32/bin/g++.exe
@@ -69,6 +43,30 @@
ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb}
+
+ ToolChain.3
+
+ x86-windows-msvc2010-pe-32bit
+ C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/vcvarsall.bat
+ x86
+ true
+ Microsoft Visual C++ Compiler 10.0 (x86)
+ ProjectExplorer.ToolChain.Msvc:{93e707bd-236f-4d8d-917d-814aa358024b}
+ 1
+
+
+
+ ToolChain.4
+
+ x86-windows-msvc2013-pe-32bit
+ C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat
+ x86
+ true
+ Microsoft Visual C++ Compiler 12.0 (x86)
+ ProjectExplorer.ToolChain.Msvc:{d35e7a1a-5ab8-4fd6-8a2c-634846c669bb}
+ 1
+
+
ToolChain.5
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index b8e02f56639..f2e7fcb9961 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -28,11 +28,10 @@ import operator
# for easier re-usage (because Python hasn't an enum type)
class Targets:
- ALL_TARGETS = map(lambda x: 2 ** x , range(7))
+ ALL_TARGETS = map(lambda x: 2 ** x , range(6))
(DESKTOP_474_GCC,
DESKTOP_480_DEFAULT,
- SIMULATOR,
EMBEDDED_LINUX,
DESKTOP_531_DEFAULT,
DESKTOP_541_GCC,
@@ -40,7 +39,7 @@ class Targets:
@staticmethod
def desktopTargetClasses():
- desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.SIMULATOR & ~Targets.EMBEDDED_LINUX)
+ desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.EMBEDDED_LINUX)
if platform.system() == 'Darwin':
desktopTargets &= ~Targets.DESKTOP_541_GCC
return desktopTargets
@@ -48,7 +47,7 @@ class Targets:
@staticmethod
def qt4Classes():
return (Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_DEFAULT
- | Targets.SIMULATOR | Targets.EMBEDDED_LINUX)
+ | Targets.EMBEDDED_LINUX)
@staticmethod
def getStringForTarget(target):
@@ -59,8 +58,6 @@ class Targets:
return "Desktop 480 MSVC2010"
else:
return "Desktop 480 GCC"
- elif target == Targets.SIMULATOR:
- return "Qt Simulator"
elif target == Targets.EMBEDDED_LINUX:
return "Embedded Linux"
elif target == Targets.DESKTOP_531_DEFAULT:
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 853b2187a10..e8e7a90330e 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -186,7 +186,7 @@ def __modifyAvailableTargets__(available, requiredQt, asStrings=False):
if not (requiredQtVersion == "480" and found.group(0) == "474"):
available.remove(currentItem)
if requiredQtVersion > "480":
- toBeRemoved = [Targets.EMBEDDED_LINUX, Targets.SIMULATOR]
+ toBeRemoved = [Targets.EMBEDDED_LINUX]
if asStrings:
toBeRemoved = Targets.getTargetsAsStrings(toBeRemoved)
for t in toBeRemoved:
@@ -424,9 +424,7 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None, ad
if mustCheck:
test.fail("Failed to check target '%s'." % Targets.getStringForTarget(current))
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
def __createProjectHandleModuleSelection__(modules):
@@ -643,8 +641,6 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
result.extend([Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_561_DEFAULT])
if platform.system() != 'Darwin':
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:
result = list(Targets.ALL_TARGETS)
result.remove(Targets.EMBEDDED_LINUX)
diff --git a/tests/system/shared/workarounds.py b/tests/system/shared/workarounds.py
index d0a7ab0145d..cd28f4b877b 100644
--- a/tests/system/shared/workarounds.py
+++ b/tests/system/shared/workarounds.py
@@ -70,7 +70,6 @@ class JIRA:
# Helper class
class Bug:
CREATOR = 'QTCREATORBUG'
- SIMULATOR = 'QTSIM'
SDK = 'QTSDK'
QT = 'QTBUG'
QT_QUICKCOMPONENTS = 'QTCOMPONENTS'
diff --git a/tests/system/suite_debugger/tst_qml_js_console/test.py b/tests/system/suite_debugger/tst_qml_js_console/test.py
index d0d085e5993..7187fc9ceaa 100644
--- a/tests/system/suite_debugger/tst_qml_js_console/test.py
+++ b/tests/system/suite_debugger/tst_qml_js_console/test.py
@@ -56,7 +56,7 @@ def useDebuggerConsole(expression, expectedOutput, check=None, checkOutp=None):
def debuggerHasStopped():
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,
"Verifying whether debugger buttons are in correct state.")
ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton")
@@ -110,9 +110,6 @@ def testLoggingFeatures():
clickButton(":*Qt Creator.Clear_QToolButton")
def main():
- test.warning("This test must be rewritten (QTCREATORBUG-15831)") # QmlJS Console has changed
- return
-
projName = "simpleQuickUI2.qmlproject"
projFolder = os.path.dirname(findFile("testdata", "simpleQuickUI2/%s" % projName))
if not neededFilePresent(os.path.join(projFolder, projName)):
@@ -128,7 +125,7 @@ def main():
return
# 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."):
# make sure QML Debugging is enabled
switchViewTo(ViewConstants.PROJECTS)
diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py
index a615f97e20e..bb5b3da6105 100644
--- a/tests/system/suite_general/tst_default_settings/test.py
+++ b/tests/system/suite_general/tst_default_settings/test.py
@@ -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\\x64",
"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:
cdb = os.path.join(cdbPath, "cdb.exe")
if os.path.exists(cdb):