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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Iba1e6cacaebf9bb4653ac77e981ddacaf729c52c
This commit is contained in:
Eike Ziller
2021-07-14 12:20:35 +02:00
parent d8286adc7c 40e87880fd
commit f08bd9df91
153 changed files with 1374 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/shared/qtcreator.py
View File

@@ -102,7 +102,7 @@ def waitForCleanShutdown(timeOut=10):
shutdownDone = (str(appCtxt)=="")
if platform.system() in ('Windows','Microsoft'):
# cleaning helper for running on the build machines
checkForStillRunningQmlExecutable(['qmlviewer.exe', 'qmlscene.exe'])
checkForStillRunningQmlExecutable(['qmlscene.exe', 'qml.exe'])
endtime = datetime.utcnow() + timedelta(seconds=timeOut)
while not shutdownDone:
# following work-around because os.kill() works for win not until python 2.7

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

@@ -52,7 +52,7 @@ def main():
"Verifying Run and Debug are enabled (Qt5 is available).")
and test.compare(target, Targets.getStringForTarget(Targets.getDefaultKit()),
"Verifying selected Target is Qt5.")
and test.compare(exe, "QML Scene", "Verifying selected executable is QML Scene.")):
and test.compare(exe, "QML Utility", "Verifying selected executable is QML Utility.")):
earlyExit("Something went wrong opening Qml project - probably missing Qt5.")
return
switchViewTo(ViewConstants.PROJECTS)

2
tests/system/suite_qtquick/tst_qtquick_creation3/test.py
View File

@@ -56,7 +56,7 @@ def main():
__closeSubprocessByPushingStop__(True)
appOutput = logApplicationOutput()
test.verify(_exactlyOne_(map(lambda ver: ver in appOutput, available)),
"Does Creator use qmlscene from a checked kit?")
"Does Qt Creator use QML binary from a checked kit?")
test.verify(projectName + ".qml:" not in appOutput,
"Does the Application Output indicate QML errors?")
invokeMenuItem("File", "Close All Projects and Editors")