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

Squish: Using default installation of Qt5 on Windows

Browse Source 
Change-Id: Ib1ec62fce66487591cadb8c0bec0d378721ebbb0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Robert Loehning
2013-04-05 16:25:32 +02:00
parent 970b55b125
commit f4eddb96ea
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/README
View File

@@ -12,7 +12,7 @@ After installing the QtSDK you should use the package manager of the QtSDK (SDKM
You'll need at least Desktop Qt versions 4.7.4, 4.8.0, Harmattan stuff (except QEmu), Maemo Toolchain, Qt Examples, Simulator, Documentation files. You'll need at least Desktop Qt versions 4.7.4, 4.8.0, Harmattan stuff (except QEmu), Maemo Toolchain, Qt Examples, Simulator, Documentation files.
Third - some of the test suites/test cases expect Qt 5.0.1 installed in its default location. Third - some of the test suites/test cases expect Qt 5.0.1 installed in its default location.
On Linux/Mac this is ~/Qt5.0.1, and on Windows this is C:\Qt\5.0.1. On Linux/Mac this is ~/Qt5.0.1, and on Windows this is C:\Qt\Qt5.0.1.
Fourth - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below). Fourth - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below).
These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on). These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on).

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

@@ -97,7 +97,7 @@
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
<value type="int" key="Id">18</value> <value type="int" key="Id">18</value>
<value type="QString" key="Name">Desktop Qt 5.0.1 (msvc2010)</value> <value type="QString" key="Name">Desktop Qt 5.0.1 (msvc2010)</value>
<value type="QString" key="QMakePath">C:/Qt/5.0.1/5.0.1/msvc2010/bin/qmake.exe</value> <value type="QString" key="QMakePath">C:/Qt/Qt5.0.1/5.0.1/msvc2010/bin/qmake.exe</value>
<value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value> <value type="QString" key="QtVersion.Type">Qt4ProjectManager.QtVersion.Desktop</value>
<value type="bool" key="isAutodetected">false</value> <value type="bool" key="isAutodetected">false</value>
</valuemap> </valuemap>