diff options
author | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-02-19 12:37:49 +0100 |
---|---|---|
committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-02-19 13:35:45 +0000 |
commit | 243a0e54befb4c40aa5a96a97712fd0b8284e7c2 (patch) | |
tree | e904752c7d1c03e4a2941d3b944f4ff4be788009 /tests | |
parent | 289e660fb7bc1ac1e2ce7cd776aa65e2b069f7c6 (diff) | |
download | qt-creator-243a0e54befb4c40aa5a96a97712fd0b8284e7c2.tar.gz |
Squish: Fix bitwise operators for selecting kits
Change-Id: I4373e8f07b124f61a743d5c922a45f2962ac7392
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/system/suite_APTW/tst_APTW03/test.py | 2 | ||||
-rwxr-xr-x | tests/system/suite_CCOM/tst_CCOM01/test.py | 2 | ||||
-rwxr-xr-x | tests/system/suite_CCOM/tst_CCOM02/test.py | 2 | ||||
-rw-r--r-- | tests/system/suite_debugger/tst_simple_analyze/test.py | 2 | ||||
-rw-r--r-- | tests/system/suite_debugger/tst_simple_debug/test.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/system/suite_APTW/tst_APTW03/test.py b/tests/system/suite_APTW/tst_APTW03/test.py index 36dea03afe..ce58243a01 100644 --- a/tests/system/suite_APTW/tst_APTW03/test.py +++ b/tests/system/suite_APTW/tst_APTW03/test.py @@ -85,7 +85,7 @@ def main(): checkSimpleCppLib("SampleApp2", True) # 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", target=targets) is12251Open = JIRA.isBugStillOpen(12251) diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py index 83de4ad421..798d29de5f 100755 --- a/tests/system/suite_CCOM/tst_CCOM01/test.py +++ b/tests/system/suite_CCOM/tst_CCOM01/test.py @@ -45,7 +45,7 @@ def main(): return # open example project # 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) if not replaceLine("propertyanimation.Sources.main\\.cpp", "#include <QtGui/QApplication>", diff --git a/tests/system/suite_CCOM/tst_CCOM02/test.py b/tests/system/suite_CCOM/tst_CCOM02/test.py index 2240124ae8..4bd3c37150 100755 --- a/tests/system/suite_CCOM/tst_CCOM02/test.py +++ b/tests/system/suite_CCOM/tst_CCOM02/test.py @@ -45,7 +45,7 @@ def main(): if not startedWithoutPluginError(): return # 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) # create syntax error openDocument("propertyanimation.QML.qml.property-animation\\.qml") diff --git a/tests/system/suite_debugger/tst_simple_analyze/test.py b/tests/system/suite_debugger/tst_simple_analyze/test.py index 1128ea2ae5..c792dc14b4 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/test.py +++ b/tests/system/suite_debugger/tst_simple_analyze/test.py @@ -37,7 +37,7 @@ def main(): # using a temporary directory won't mess up a potentially existing workingDir = tempDir() # 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) editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") if placeCursorToLine(editor, "MouseArea.*", True): diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py index 7590ede3da..941d3ec017 100644 --- a/tests/system/suite_debugger/tst_simple_debug/test.py +++ b/tests/system/suite_debugger/tst_simple_debug/test.py @@ -35,7 +35,7 @@ def main(): if not startedWithoutPluginError(): return # 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 workingDir = tempDir() checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targets) |