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:
	src/plugins/android/androiddevice.h
	src/plugins/android/androidplugin.cpp
	src/plugins/android/androidplugin.h

Change-Id: I1a68354415283fe4a7450706520a576d2a1775e0
This commit is contained in:
Eike Ziller
2022-03-23 14:16:07 +01:00
parent ae49fb213b 031998c988
commit ae6c974fb2
37 changed files with 644 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/system/shared/welcome.py
View File

@@ -46,10 +46,10 @@ def getWelcomeScreenSideBarButton(buttonLabel, isUrlButton = False):
"unnamed='1'}")
return __getWelcomeScreenButtonHelper__(buttonLabel, sideBar, isUrlButton)
def getWelcomeScreenMainButton(buttonLabel):
stackedWidget = waitForObject(":Qt Creator.WelcomeScreenStackedWidget")
currentStackWidget = stackedWidget.currentWidget()
return __getWelcomeScreenButtonHelper__(buttonLabel, currentStackWidget)
def getWelcomeScreenBottomButton(buttonLabel):
bottomArea = waitForObject("{type='Welcome::Internal::BottomArea' unnamed='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}")
return __getWelcomeScreenButtonHelper__(buttonLabel, bottomArea, False)
def getWelcomeTreeView(treeViewLabel):
try:

8
tests/system/suite_CSUP/tst_CSUP03/test.py
View File

@@ -1,6 +1,6 @@
############################################################################
#
# Copyright (C) 2016 The Qt Company Ltd.
# Copyright (C) 2022 The Qt Company Ltd.
# Contact: https://www.qt.io/licensing/
#
# This file is part of Qt Creator.
@@ -78,10 +78,8 @@ def main():
continue
if not startCreatorVerifyingClang(useClang):
continue
targetToChoose = Targets.DESKTOP_4_8_7_DEFAULT
if not qt4Available:
targetToChoose = Targets.DESKTOP_5_14_1_DEFAULT
projectName = createNewNonQtProject(tempDir(), "project-csup03", [targetToChoose])
projectName = createNewNonQtProject(tempDir(), "project-csup03",
[Targets.DESKTOP_5_14_1_DEFAULT])
checkCodeModelSettings(useClang)
openDocument("%s.Sources.main\\.cpp" % projectName)
editor = getEditorForFileSuffix("main.cpp")

14
tests/system/suite_WELP/tst_WELP01/test.py
View File

@@ -25,7 +25,7 @@
source("../../shared/qtcreator.py")
getStarted = 'Get Started Now'
getStarted = 'Get Started'
def clickItemVerifyHelpCombo(button, expectedHelpComboRegex, testDetails):
global getStarted
@@ -41,7 +41,7 @@ def clickItemVerifyHelpCombo(button, expectedHelpComboRegex, testDetails):
"Verifying: '%s' button is being displayed." % getStarted)
def buttonActive(button):
# colors of the default theme for active button on Welcome page
(activeRed, activeGreen, activeBlue) = (64, 65, 66)
(activeRed, activeGreen, activeBlue) = (69, 206, 85)
# QPalette::Window (used background color of Welcome page buttons)
enumQPaletteWindow = 10
color = button.palette.color(enumQPaletteWindow)
@@ -92,8 +92,8 @@ def main():
# select Projects and roughly check this
switchToSubMode('Projects')
for button in ['New', 'Open']:
wsButtonFrame, wsButtonLabel = getWelcomeScreenMainButton(button)
for button in ['Create Project...', 'Open Project...']:
wsButtonFrame, wsButtonLabel = getWelcomeScreenSideBarButton(button)
if test.verify(all((wsButtonFrame, wsButtonLabel)),
"Verified whether '%s' button is shown." % button):
test.verify(not buttonActive(wsButtonFrame),
@@ -111,7 +111,7 @@ def main():
'User Guide':'qthelp://org.qt-project.qtcreator/doc/index.html'
}
for text, url in textUrls.items():
button, label = getWelcomeScreenSideBarButton(text, True)
button, label = getWelcomeScreenBottomButton(text)
if test.verify(all((button, label)),
"Verifying whether link button (%s) exists." % text):
test.compare(str(button.toolTip), url, "Verifying URL for %s" % text)
@@ -135,7 +135,7 @@ def main():
switchToSubMode('Examples')
test.verify(waitForButtonsState(False, True, False), "Buttons' states have changed.")
expect = (("QTableView", "unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'",
expect = (("QListView", "unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'",
"examples list"),
("QLineEdit", "placeholderText='Search in Examples...'", "examples search line edit"),
("QComboBox", "currentText~='.*Qt.*'", "Qt version combo box"))
@@ -149,7 +149,7 @@ def main():
# select Tutorials and roughly check them
switchToSubMode('Tutorials')
test.verify(waitForButtonsState(False, False, True), "Buttons' states have changed.")
expect = (("QTableView", "unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'",
expect = (("QListView", "unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'",
"tutorials list"),
("QLineEdit", "placeholderText='Search in Tutorials...'",
"tutorials search line edit"))

7
tests/system/suite_general/tst_openqt_creator/test.py
View File

@@ -1,6 +1,6 @@
############################################################################
#
# Copyright (C) 2016 The Qt Company Ltd.
# Copyright (C) 2022 The Qt Company Ltd.
# Contact: https://www.qt.io/licensing/
#
# This file is part of Qt Creator.
@@ -36,10 +36,7 @@ def main():
return
runButton = findObject(':*Qt Creator.Run_Core::Internal::FancyToolButton')
targetToChoose = Targets.DESKTOP_4_8_7_DEFAULT
if not qt4Available:
targetToChoose = Targets.DESKTOP_5_14_1_DEFAULT
openQmakeProject(pathSpeedcrunch, [targetToChoose])
openQmakeProject(pathSpeedcrunch, [Targets.DESKTOP_5_14_1_DEFAULT])
# Wait for parsing to complete
waitFor("runButton.enabled", 30000)
# Starting before opening, because this is where Creator froze (QTCREATORBUG-10733)