diff options
author | Eike Ziller <eike.ziller@qt.io> | 2018-05-02 15:22:16 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-02 15:22:16 +0200 |
commit | 4749a919a65fb4588b0b1def352bc80d24704db2 (patch) | |
tree | 6e14eaf12e23b151b520bdf235fea62bb2fb3dc9 /tests/system/shared/project_explorer.py | |
parent | c46b6dbb5661e9f3d16310da381909376e8e9a6b (diff) | |
parent | e8b13fe3c9e0984817d6b7417b43964c0433fcdd (diff) |
Merge remote-tracking branch 'origin/4.6'
Change-Id: I9927fdff4c7e73c703757852a3f3cf79444e3cb6
Diffstat (limited to 'tests/system/shared/project_explorer.py')
-rw-r--r-- | tests/system/shared/project_explorer.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tests/system/shared/project_explorer.py b/tests/system/shared/project_explorer.py index 686d5722e2..c506690d70 100644 --- a/tests/system/shared/project_explorer.py +++ b/tests/system/shared/project_explorer.py @@ -173,7 +173,7 @@ def getQtInformationForQmlProject(): kit = __getTargetFromToolTip__(str(fancyToolButton.toolTip)) if not kit: test.fatal("Could not figure out which kit you're using...") - return None, None, None, None + return None test.log("Searching for Qt information for kit '%s'" % kit) invokeMenuItem("Tools", "Options...") waitForObjectItem(":Options_QListView", "Build & Run") @@ -183,7 +183,7 @@ def getQtInformationForQmlProject(): if not __selectTreeItemOnBuildAndRun__(targetsTreeView, "%s(\s\(default\))?" % kit, True): test.fatal("Found no matching kit - this shouldn't happen.") clickButton(waitForObject(":Options.Cancel_QPushButton")) - return None, None, None, None + return None qtVersionStr = str(waitForObject(":Kits_QtVersion_QComboBox").currentText) test.log("Kit '%s' uses Qt Version '%s'" % (kit, qtVersionStr)) clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Qt Versions") @@ -191,15 +191,11 @@ def getQtInformationForQmlProject(): if not __selectTreeItemOnBuildAndRun__(treeView, qtVersionStr): test.fatal("Found no matching Qt Version for kit - this shouldn't happen.") clickButton(waitForObject(":Options.Cancel_QPushButton")) - return None, None, None, None + return None qmake = str(waitForObject(":QtSupport__Internal__QtVersionManager.qmake_QLabel").text) test.log("Qt Version '%s' uses qmake at '%s'" % (qtVersionStr, qmake)) - qtDir = os.path.dirname(os.path.dirname(qmake)) - qtVersion = getQtInformationByQMakeCall(qtDir, QtInformation.QT_VERSION) - qtLibPath = getQtInformationByQMakeCall(qtDir, QtInformation.QT_LIBPATH) - mkspec = __getMkspecFromQmake__(qmake) clickButton(waitForObject(":Options.Cancel_QPushButton")) - return qtVersion, mkspec, qtLibPath, qmake + return qmake def __selectTreeItemOnBuildAndRun__(treeViewOrWidget, itemText, isRegex=False): model = treeViewOrWidget.model() |