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

Squish: Update Qt Quick hooking stuff...

Browse Source 
...to differentiate between Qt Quick 1 and Qt Quick 2 when using
no additional function on the subprocess.

Change-Id: Ia345a1503128be0c5b81a010c438009bf41d93b5
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2014-01-22 09:39:04 +01:00
parent c567dabc71
commit 1cdb5d87c2
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,13 +136,16 @@ class SubprocessType:
USER_DEFINED=3
@staticmethod
def getWindowType(subprocessType):
def getWindowType(subprocessType, qtQuickVersion=1):
if subprocessType == SubprocessType.QT_WIDGET:
return "QMainWindow"
if subprocessType == SubprocessType.QT_QUICK_APPLICATION:
return "QmlApplicationViewer"
return "QtQuick%dApplicationViewer" % qtQuickVersion
if subprocessType == SubprocessType.QT_QUICK_UI:
return "QDeclarativeViewer"
if qtQuickVersion == 1:
return "QDeclarativeViewer"
else:
return "QQuickView"
if subprocessType == SubprocessType.USER_DEFINED:
return "user-defined"
test.fatal("Could not determine the WindowType for SubprocessType %s" % subprocessType)