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

Merge remote-tracking branch 'origin/2.5'

Browse Source
This commit is contained in:
Eike Ziller
2012-06-11 16:39:38 +02:00
parent 929bc18a7e a66e344b42
commit 1ccde24c77
13 changed files with 35 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/workarounds.py
+4 -1
View File
@@ -221,7 +221,10 @@ class JIRA:
def _workaroundCreator6994_(self, *args):
if args[0] in ('Mobile Qt Application', 'Qt Gui Application', 'Qt Custom Designer Widget'):
args[1].remove('Harmattan')
if QtQuickConstants.Targets.HARMATTAN in args[1]:
args[1].remove(QtQuickConstants.Targets.HARMATTAN)
else:
args[1].remove(QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.HARMATTAN))
test.xverify(False, "Removed Harmattan from expected targets.")
def _workaroundCreator6853_(self, *args):