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

Squish: Update Qt Quick tests to reflect new available versions

Browse Source 
Change-Id: I60d4b2ca64825101358774a4e04cceb3040fc630
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2014-02-14 13:04:07 +01:00
parent fb0bc00670
commit ae781b1919
6 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,13 +136,13 @@ class SubprocessType:
USER_DEFINED=3
@staticmethod
def getWindowType(subprocessType, qtQuickVersion=1):
def getWindowType(subprocessType, qtQuickVersion="1.1"):
if subprocessType == SubprocessType.QT_WIDGET:
return "QMainWindow"
if subprocessType == SubprocessType.QT_QUICK_APPLICATION:
return "QtQuick%dApplicationViewer" % qtQuickVersion
return "QtQuick%sApplicationViewer" % qtQuickVersion[0]
if subprocessType == SubprocessType.QT_QUICK_UI:
if qtQuickVersion == 1:
if qtQuickVersion == "1.1":
return "QDeclarativeViewer"
else:
return "QQuickView"