From f4eddb96ea0ee085dfc673f2eac1250268226c9a Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 5 Apr 2013 16:25:32 +0200 Subject: [PATCH] Squish: Using default installation of Qt5 on Windows Change-Id: Ib1ec62fce66487591cadb8c0bec0d378721ebbb0 Reviewed-by: Christian Stenger --- tests/system/README | 2 +- tests/system/settings/windows/QtProject/qtcreator/qtversion.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/README b/tests/system/README index 203c9212b29..a2797a5e893 100644 --- a/tests/system/README +++ b/tests/system/README @@ -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. 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). These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on). diff --git a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml index 128df0933e5..8c47f59d402 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml @@ -97,7 +97,7 @@ 18 Desktop Qt 5.0.1 (msvc2010) - C:/Qt/5.0.1/5.0.1/msvc2010/bin/qmake.exe + C:/Qt/Qt5.0.1/5.0.1/msvc2010/bin/qmake.exe Qt4ProjectManager.QtVersion.Desktop false