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

Squish: Fix bitwise operators for selecting kits

Browse Source 
Change-Id: I4373e8f07b124f61a743d5c922a45f2962ac7392
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-02-19 12:37:49 +01:00
parent 289e660fb7
commit 243a0e54be
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/suite_APTW/tst_APTW03/test.py
View File

@@ -85,7 +85,7 @@ def main():
checkSimpleCppLib("SampleApp2", True) checkSimpleCppLib("SampleApp2", True)
# Qt Plugin needs Qt4.8 for QGenericPlugin which is tested by default # Qt Plugin needs Qt4.8 for QGenericPlugin which is tested by default
targets = Targets.desktopTargetClasses() ^ Targets.DESKTOP_474_GCC targets = Targets.desktopTargetClasses() & ~Targets.DESKTOP_474_GCC
checkedTargets, projectName, className = createNewQtPlugin(tempDir(), "SampleApp3", "MyPlugin", checkedTargets, projectName, className = createNewQtPlugin(tempDir(), "SampleApp3", "MyPlugin",
target=targets) target=targets)
is12251Open = JIRA.isBugStillOpen(12251) is12251Open = JIRA.isBugStillOpen(12251)

2
tests/system/suite_CCOM/tst_CCOM01/test.py
View File

@@ -45,7 +45,7 @@ def main():
return return
# open example project # open example project
# qmlapplicationviewer of this example supports only Qt version < 5 # qmlapplicationviewer of this example supports only Qt version < 5
targets = Targets.desktopTargetClasses() ^ Targets.DESKTOP_521_DEFAULT ^ Targets.DESKTOP_531_DEFAULT targets = Targets.desktopTargetClasses() & ~Targets.DESKTOP_521_DEFAULT & ~Targets.DESKTOP_531_DEFAULT
checkedTargets = openQmakeProject(examplePath, targets) checkedTargets = openQmakeProject(examplePath, targets)
if not replaceLine("propertyanimation.Sources.main\\.cpp", if not replaceLine("propertyanimation.Sources.main\\.cpp",
"#include <QtGui/QApplication>", "#include <QtGui/QApplication>",

2
tests/system/suite_CCOM/tst_CCOM02/test.py
View File

@@ -45,7 +45,7 @@ def main():
if not startedWithoutPluginError(): if not startedWithoutPluginError():
return return
# open example project # open example project
targets = Targets.desktopTargetClasses() ^ Targets.DESKTOP_521_DEFAULT ^ Targets.DESKTOP_531_DEFAULT targets = Targets.desktopTargetClasses() & ~Targets.DESKTOP_521_DEFAULT & ~Targets.DESKTOP_531_DEFAULT
openQmakeProject(examplePath, targets) openQmakeProject(examplePath, targets)
# create syntax error # create syntax error
openDocument("propertyanimation.QML.qml.property-animation\\.qml") openDocument("propertyanimation.QML.qml.property-animation\\.qml")

2
tests/system/suite_debugger/tst_simple_analyze/test.py
View File

@@ -37,7 +37,7 @@ def main():
# using a temporary directory won't mess up a potentially existing # using a temporary directory won't mess up a potentially existing
workingDir = tempDir() workingDir = tempDir()
# we need a Qt >= 4.8 # we need a Qt >= 4.8
analyzerTargets = Targets.desktopTargetClasses() ^ Targets.DESKTOP_474_GCC analyzerTargets = Targets.desktopTargetClasses() & ~Targets.DESKTOP_474_GCC
checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=analyzerTargets) checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=analyzerTargets)
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
if placeCursorToLine(editor, "MouseArea.*", True): if placeCursorToLine(editor, "MouseArea.*", True):

2
tests/system/suite_debugger/tst_simple_debug/test.py
View File

@@ -35,7 +35,7 @@ def main():
if not startedWithoutPluginError(): if not startedWithoutPluginError():
return return
# Requires Qt 4.8 # Requires Qt 4.8
targets = Targets.desktopTargetClasses() ^ Targets.DESKTOP_474_GCC targets = Targets.desktopTargetClasses() & ~Targets.DESKTOP_474_GCC
# using a temporary directory won't mess up a potentially existing # using a temporary directory won't mess up a potentially existing
workingDir = tempDir() workingDir = tempDir()
checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targets) checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targets)