summaryrefslogtreecommitdiff
path: root/tests/system
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@digia.com>2014-04-02 13:16:48 +0200
committerRobert Loehning <robert.loehning@digia.com>2014-04-02 13:58:54 +0200
commitdc66a01b108ab722042e0d64df3f3249d07abeea (patch)
tree89f9dba20756b271a93726690c2806298cca4023 /tests/system
parent0c68cbbaa926d48068cc30c766e202f1eb6c7360 (diff)
downloadqt-creator-dc66a01b108ab722042e0d64df3f3249d07abeea.tar.gz
Squish: Configure old Qt Quick projects with Qt 4
Change-Id: I3a891ba8a3ca5d437c114a95fb1620a200261301 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests/system')
-rw-r--r--tests/system/suite_QMLS/tst_QMLS03/test.py2
-rw-r--r--tests/system/suite_editors/tst_qml_editor/test.py2
-rw-r--r--tests/system/suite_general/tst_session_handling/test.py2
-rw-r--r--tests/system/suite_qtquick/tst_qml_outline/test.py6
4 files changed, 4 insertions, 8 deletions
diff --git a/tests/system/suite_QMLS/tst_QMLS03/test.py b/tests/system/suite_QMLS/tst_QMLS03/test.py
index d8b435b24e..a46a13999c 100644
--- a/tests/system/suite_QMLS/tst_QMLS03/test.py
+++ b/tests/system/suite_QMLS/tst_QMLS03/test.py
@@ -79,7 +79,7 @@ def main():
if not startedWithoutPluginError():
return
# open example project
- openQmakeProject(examplePath)
+ openQmakeProject(examplePath, Targets.DESKTOP_480_GCC)
# open qml file
openDocument("propertyanimation.QML.qml.color-animation\\.qml")
# get editor
diff --git a/tests/system/suite_editors/tst_qml_editor/test.py b/tests/system/suite_editors/tst_qml_editor/test.py
index fe188db512..cd6fca5158 100644
--- a/tests/system/suite_editors/tst_qml_editor/test.py
+++ b/tests/system/suite_editors/tst_qml_editor/test.py
@@ -43,7 +43,7 @@ def main():
addHelpDocumentation([os.path.join(sdkPath, "Documentation", "qt.qch")])
templateDir = prepareTemplate(sourceExample)
installLazySignalHandler("{type='Core::FutureProgress' unnamed='1'}", "finished()", "__handleFutureProgress__")
- openQmakeProject(os.path.join(templateDir,proFile))
+ openQmakeProject(os.path.join(templateDir,proFile), Targets.DESKTOP_480_GCC)
openDocument("focus.QML.qml.focus\\.qml")
testRenameId()
testFindUsages()
diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py
index 9d81da376d..1bfec7e695 100644
--- a/tests/system/suite_general/tst_session_handling/test.py
+++ b/tests/system/suite_general/tst_session_handling/test.py
@@ -42,7 +42,7 @@ def main():
test.verify(waitFor("sessionName in str(mainWindow.windowTitle)", 2000),
"Verifying window title contains created session name.")
for project in projects:
- openQmakeProject(project)
+ openQmakeProject(project, Targets.DESKTOP_480_GCC)
progressBarWait(20000)
checkNavigator(68, "Verifying whether all projects have been opened.")
openDocument("propertyanimation.QML.qml.color-animation\\.qml")
diff --git a/tests/system/suite_qtquick/tst_qml_outline/test.py b/tests/system/suite_qtquick/tst_qml_outline/test.py
index 46420f3310..879e05e308 100644
--- a/tests/system/suite_qtquick/tst_qml_outline/test.py
+++ b/tests/system/suite_qtquick/tst_qml_outline/test.py
@@ -42,11 +42,7 @@ def main():
startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError():
return
- targets = openQmakeProject(os.path.join(templateDir, proFile))
- # make sure we use the 474 kit for having QtQuick 1.0 support
- switchViewTo(ViewConstants.PROJECTS)
- switchToBuildOrRunSettingsFor(len(targets), 0, ProjectSettings.BUILD)
- switchViewTo(ViewConstants.EDIT)
+ openQmakeProject(os.path.join(templateDir, proFile), Targets.DESKTOP_480_GCC)
qmlFiles = ["focus.QML.qml.focus\\.qml", "focus.QML.qml.Core.ListMenu\\.qml"]
checkOutlineFor(qmlFiles)
testModify()