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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/studiowelcome/recentpresets.h
	src/plugins/studiowelcome/userpresets.h

Change-Id: Ie573b945eb28347a36ee1b3582fbd6ab0c0f866c
This commit is contained in:
Eike Ziller
2022-03-28 15:10:11 +02:00
parent 93de345587 f58add023a
commit 780f5da7c4
62 changed files with 974 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/utils.py
+3
View File
@@ -366,6 +366,9 @@ def getConfiguredKits():
def __setQtVersionForKit__(kit, kitName, kitsQtVersionName):
mouseClick(waitForObjectItem(":BuildAndRun_QTreeView", kit))
qtVersionStr = str(waitForObjectExists(":Kits_QtVersion_QComboBox").currentText)
invalid = qtVersionStr.endswith(" (invalid)")
if invalid:
qtVersionStr = qtVersionStr[:-10]
kitsQtVersionName[kitName] = qtVersionStr
# end of internal function for iterate kits