Commit f2b5f6a8 authored by Robert Loehning's avatar Robert Loehning

Squish: Updates to keep suite_debugger running

Change-Id: I3096289a935b654005cdc7440a87cbc527410c64
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent 22a4f491
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
:Qt Creator_Core::Internal::NavComboBox {type='Core::Internal::NavComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Core::Internal::NavComboBox {type='Core::Internal::NavComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Core::Internal::ProgressBar {type='Core::Internal::ProgressBar' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Core::Internal::ProgressBar {type='Core::Internal::ProgressBar' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Core::OutputWindow {type='Core::OutputWindow' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Core::OutputWindow {type='Core::OutputWindow' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_CppEditor::Internal::CPPEditorWidget {type='CppEditor::Internal::CPPEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_CppEditor::Internal::CPPEditorWidget {type='CppEditor::Internal::CppEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_DiffEditor::Internal::DescriptionEditorWidget {type='DiffEditor::Internal::DescriptionEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_DiffEditor::Internal::DescriptionEditorWidget {type='DiffEditor::Internal::DescriptionEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_DiffEditor::SideDiffEditorWidget {type='DiffEditor::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_DiffEditor::SideDiffEditorWidget {type='DiffEditor::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_DiffEditor::SideDiffEditorWidget2 {occurrence='2' type='DiffEditor::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_DiffEditor::SideDiffEditorWidget2 {occurrence='2' type='DiffEditor::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
...@@ -163,14 +163,14 @@ ...@@ -163,14 +163,14 @@
:Qt Creator_Help::Internal::HelpViewer {type='Help::Internal::QtWebKitHelpWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Help::Internal::HelpViewer {type='Help::Internal::QtWebKitHelpWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_HelpSelector_QComboBox {occurrence='3' type='QComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_HelpSelector_QComboBox {occurrence='3' type='QComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Issues_Core::Internal::OutputPaneToggleButton {occurrence='1' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Issues_Core::Internal::OutputPaneToggleButton {occurrence='1' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_ProFileEditorWidget {type='QmakeProjectManager::Internal::ProFileEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_PythonEditor::EditorWidget {type='PythonEditor::Internal::EditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_PythonEditor::EditorWidget {type='PythonEditor::Internal::EditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_QHelpContentWidget {type='QHelpContentWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_QHelpContentWidget {type='QHelpContentWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_QTableView {type='QTableView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_QTableView {type='QTableView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_QmlJSEditor::Internal::QmlJSOutlineTreeView {type='QmlJSEditor::Internal::QmlJSOutlineTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_QmlJSEditor::Internal::QmlJSOutlineTreeView {type='QmlJSEditor::Internal::QmlJSOutlineTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_QmlJSEditor::QmlJSTextEditorWidget {type='QmlJSEditor::Internal::QmlJSTextEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_QmlJSEditor::QmlJSTextEditorWidget {type='QmlJSEditor::Internal::QmlJSEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_SearchResult_Core::Internal::OutputPaneToggleButton {occurrence='2' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_SearchResult_Core::Internal::OutputPaneToggleButton {occurrence='2' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_SystemSettings.Details_Utils::DetailsButton {occurrence='4' text='Details' type='Utils::DetailsButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_SystemSettings.Details_Utils::DetailsButton {occurrence='4' text='Details' type='Utils::DetailsButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_TextEditor::BaseTextEditorWidget {type='TextEditor::BaseTextEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_TextEditor::PlainTextEditorWidget {type='TextEditor::PlainTextEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_TextEditor::PlainTextEditorWidget {type='TextEditor::PlainTextEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Utils::NavigationTreeView {type='Utils::NavigationTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Utils::NavigationTreeView {type='Utils::NavigationTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit {container=':Qt Creator_Utils::NavigationTreeView' type='QExpandingLineEdit' unnamed='1' visible='1'} :Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit {container=':Qt Creator_Utils::NavigationTreeView' type='QExpandingLineEdit' unnamed='1' visible='1'}
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
:scrollArea.Edit build configuration:_QLabel {text='Edit build configuration:' type='QLabel' unnamed='1' visible='1'} :scrollArea.Edit build configuration:_QLabel {text='Edit build configuration:' type='QLabel' unnamed='1' visible='1'}
:scrollArea.Executable:_QLabel {container=':Qt Creator.scrollArea_QScrollArea' text='Executable:' type='QLabel' unnamed='1' visible='1'} :scrollArea.Executable:_QLabel {container=':Qt Creator.scrollArea_QScrollArea' text='Executable:' type='QLabel' unnamed='1' visible='1'}
:scrollArea.Library not available_QLabel {name='qmlDebuggingWarningText' text?='Library not available*' type='QLabel' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :scrollArea.Library not available_QLabel {name='qmlDebuggingWarningText' text?='Library not available*' type='QLabel' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:scrollArea.environment_QTreeView {aboveWidget=':scrollArea.Clear system environment_QCheckBox' container=':Qt Creator.scrollArea_QScrollArea' type='QTreeView' unnamed='1' visible='1'} :scrollArea.environment_QTreeView {container=':Qt Creator.scrollArea_QScrollArea' type='QTreeView' unnamed='1' visible='1'}
:scrollArea.qmlDebuggingLibraryCheckBox_QCheckBox {name='qmlDebuggingLibraryCheckBox' type='QCheckBox' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :scrollArea.qmlDebuggingLibraryCheckBox_QCheckBox {name='qmlDebuggingLibraryCheckBox' type='QCheckBox' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
:sourceFileLineEdit_Utils::FileNameValidatingLineEdit {buddy=':Qt Gui Application.Source file:_QLabel' name='sourceFileLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1'} :sourceFileLineEdit_Utils::FileNameValidatingLineEdit {buddy=':Qt Gui Application.Source file:_QLabel' name='sourceFileLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1'}
:splitter.Commit File(s)_VcsBase::QActionPushButton {container=':Qt Creator.splitter_QSplitter' text~='(Commit .+/.+ File.*)' type='VcsBase::QActionPushButton' unnamed='1' visible='1'} :splitter.Commit File(s)_VcsBase::QActionPushButton {container=':Qt Creator.splitter_QSplitter' text~='(Commit .+/.+ File.*)' type='VcsBase::QActionPushButton' unnamed='1' visible='1'}
......
...@@ -276,7 +276,7 @@ def getEditorForFileSuffix(curFile, treeViewSyntax=False): ...@@ -276,7 +276,7 @@ def getEditorForFileSuffix(curFile, treeViewSyntax=False):
elif suffix in qmlEditorSuffixes: elif suffix in qmlEditorSuffixes:
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
elif suffix in proEditorSuffixes: elif suffix in proEditorSuffixes:
editor = waitForObject(":Qt Creator_ProFileEditorWidget") editor = waitForObject(":Qt Creator_TextEditor::BaseTextEditorWidget")
elif suffix in glslEditorSuffixes: elif suffix in glslEditorSuffixes:
editor = waitForObject("{type='GLSLEditor::Internal::GLSLTextEditorWidget' unnamed='1' " editor = waitForObject("{type='GLSLEditor::Internal::GLSLTextEditorWidget' unnamed='1' "
"visible='1' window=':Qt Creator_Core::Internal::MainWindow'}") "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}")
......
...@@ -96,7 +96,7 @@ def __createProjectOrFileSelectType__(category, template, fromWelcome = False, i ...@@ -96,7 +96,7 @@ def __createProjectOrFileSelectType__(category, template, fromWelcome = False, i
mouseClick(waitForObject(":CreateProject_QStyleItem"), 5, 5, 0, Qt.LeftButton) mouseClick(waitForObject(":CreateProject_QStyleItem"), 5, 5, 0, Qt.LeftButton)
else: else:
invokeMenuItem("File", "New File or Project...") invokeMenuItem("File", "New File or Project...")
categoriesView = waitForObject("{type='QTreeView' name='templateCategoryView'}") categoriesView = waitForObject(":New.templateCategoryView_QTreeView")
if isProject: if isProject:
clickItem(categoriesView, "Projects." + category, 5, 5, 0, Qt.LeftButton) clickItem(categoriesView, "Projects." + category, 5, 5, 0, Qt.LeftButton)
else: else:
...@@ -212,7 +212,7 @@ def __modifyAvailableTargets__(available, requiredQt, asStrings=False): ...@@ -212,7 +212,7 @@ def __modifyAvailableTargets__(available, requiredQt, asStrings=False):
# param checks turns tests in the function on if set to True # param checks turns tests in the function on if set to True
def createProject_Qt_GUI(path, projectName, checks = True, addToVersionControl = "<None>"): def createProject_Qt_GUI(path, projectName, checks = True, addToVersionControl = "<None>"):
template = "Qt Widgets Application" template = "Qt Widgets Application"
available = __createProjectOrFileSelectType__(" Applications", template) available = __createProjectOrFileSelectType__(" Application", template)
__createProjectSetNameAndPath__(path, projectName, checks) __createProjectSetNameAndPath__(path, projectName, checks)
checkedTargets = __selectQtVersionDesktop__(checks, available) checkedTargets = __selectQtVersionDesktop__(checks, available)
...@@ -252,7 +252,7 @@ def createProject_Qt_GUI(path, projectName, checks = True, addToVersionControl = ...@@ -252,7 +252,7 @@ def createProject_Qt_GUI(path, projectName, checks = True, addToVersionControl =
# param projectName is the name for the new project # param projectName is the name for the new project
# param checks turns tests in the function on if set to True # param checks turns tests in the function on if set to True
def createProject_Qt_Console(path, projectName, checks = True): def createProject_Qt_Console(path, projectName, checks = True):
available = __createProjectOrFileSelectType__(" Applications", "Qt Console Application") available = __createProjectOrFileSelectType__(" Application", "Qt Console Application")
__createProjectSetNameAndPath__(path, projectName, checks) __createProjectSetNameAndPath__(path, projectName, checks)
checkedTargets = __selectQtVersionDesktop__(checks, available) checkedTargets = __selectQtVersionDesktop__(checks, available)
...@@ -275,7 +275,7 @@ def createProject_Qt_Console(path, projectName, checks = True): ...@@ -275,7 +275,7 @@ def createProject_Qt_Console(path, projectName, checks = True):
def createNewQtQuickApplication(workingDir, projectName = None, def createNewQtQuickApplication(workingDir, projectName = None,
targets=Targets.desktopTargetClasses(), qtQuickVersion="1.1", targets=Targets.desktopTargetClasses(), qtQuickVersion="1.1",
fromWelcome=False): fromWelcome=False):
available = __createProjectOrFileSelectType__(" Applications", "Qt Quick Application", fromWelcome) available = __createProjectOrFileSelectType__(" Application", "Qt Quick Application", fromWelcome)
projectName = __createProjectSetNameAndPath__(workingDir, projectName) projectName = __createProjectSetNameAndPath__(workingDir, projectName)
requiredQt = __createProjectHandleQtQuickSelection__(qtQuickVersion) requiredQt = __createProjectHandleQtQuickSelection__(qtQuickVersion)
__modifyAvailableTargets__(available, requiredQt) __modifyAvailableTargets__(available, requiredQt)
...@@ -288,7 +288,7 @@ def createNewQtQuickApplication(workingDir, projectName = None, ...@@ -288,7 +288,7 @@ def createNewQtQuickApplication(workingDir, projectName = None,
return checkedTargets, projectName return checkedTargets, projectName
def createNewQtQuickUI(workingDir, qtQuickVersion="1.1"): def createNewQtQuickUI(workingDir, qtQuickVersion="1.1"):
__createProjectOrFileSelectType__(" Applications", "Qt Quick UI") __createProjectOrFileSelectType__(" Application", "Qt Quick UI")
if workingDir == None: if workingDir == None:
workingDir = tempDir() workingDir = tempDir()
projectName = __createProjectSetNameAndPath__(workingDir) projectName = __createProjectSetNameAndPath__(workingDir)
...@@ -297,7 +297,7 @@ def createNewQtQuickUI(workingDir, qtQuickVersion="1.1"): ...@@ -297,7 +297,7 @@ def createNewQtQuickUI(workingDir, qtQuickVersion="1.1"):
return projectName return projectName
def createNewQmlExtension(workingDir, targets=Targets.DESKTOP_474_GCC, qtQuickVersion=1): def createNewQmlExtension(workingDir, targets=Targets.DESKTOP_474_GCC, qtQuickVersion=1):
available = __createProjectOrFileSelectType__(" Libraries", "Qt Quick %d Extension Plugin" available = __createProjectOrFileSelectType__(" Library", "Qt Quick %d Extension Plugin"
% qtQuickVersion) % qtQuickVersion)
if workingDir == None: if workingDir == None:
workingDir = tempDir() workingDir = tempDir()
...@@ -351,7 +351,7 @@ def createNewNonQtProject(workingDir=None, projectName=None, target=Targets.DESK ...@@ -351,7 +351,7 @@ def createNewNonQtProject(workingDir=None, projectName=None, target=Targets.DESK
def createNewCPPLib(projectDir = None, projectName = None, className = None, fromWelcome = False, def createNewCPPLib(projectDir = None, projectName = None, className = None, fromWelcome = False,
target = Targets.DESKTOP_474_GCC, isStatic = False, modules = ["QtCore"]): target = Targets.DESKTOP_474_GCC, isStatic = False, modules = ["QtCore"]):
available = __createProjectOrFileSelectType__(" Libraries", "C++ Library", fromWelcome, True) available = __createProjectOrFileSelectType__(" Library", "C++ Library", fromWelcome, True)
if isStatic: if isStatic:
libType = LibType.STATIC libType = LibType.STATIC
else: else:
...@@ -369,7 +369,7 @@ def createNewCPPLib(projectDir = None, projectName = None, className = None, fro ...@@ -369,7 +369,7 @@ def createNewCPPLib(projectDir = None, projectName = None, className = None, fro
def createNewQtPlugin(projectDir=None, projectName=None, className=None, fromWelcome=False, def createNewQtPlugin(projectDir=None, projectName=None, className=None, fromWelcome=False,
target=Targets.DESKTOP_474_GCC, baseClass="QGenericPlugin"): target=Targets.DESKTOP_474_GCC, baseClass="QGenericPlugin"):
available = __createProjectOrFileSelectType__(" Libraries", "C++ Library", fromWelcome, True) available = __createProjectOrFileSelectType__(" Library", "C++ Library", fromWelcome, True)
if projectDir == None: if projectDir == None:
projectDir = tempDir() projectDir = tempDir()
projectName = __createProjectSetNameAndPath__(projectDir, projectName, False, LibType.QT_PLUGIN) projectName = __createProjectSetNameAndPath__(projectDir, projectName, False, LibType.QT_PLUGIN)
......
...@@ -54,8 +54,8 @@ def main(): ...@@ -54,8 +54,8 @@ def main():
' qDebug() << \"' + outputQDebug + '\";']) ' qDebug() << \"' + outputQDebug + '\";'])
# Rely on code completion for closing bracket # Rely on code completion for closing bracket
invokeMenuItem("File", "Save All") invokeMenuItem("File", "Save All")
selectFromLocator(project + ".pro") openDocument(project + "." + project + "\\.pro")
proEditor = waitForObject(":Qt Creator_ProFileEditorWidget") proEditor = waitForObject(":Qt Creator_TextEditor::BaseTextEditorWidget")
test.verify("CONFIG += console" in str(proEditor.plainText), "Verifying that program is configured with console") test.verify("CONFIG += console" in str(proEditor.plainText), "Verifying that program is configured with console")
availableConfigs = iterateBuildConfigs(len(checkedTargets)) availableConfigs = iterateBuildConfigs(len(checkedTargets))
......
...@@ -92,8 +92,8 @@ def testLoggingFeatures(): ...@@ -92,8 +92,8 @@ def testLoggingFeatures():
["warning message", "<undefined>"], ["warning message", "<undefined>"],
["error message", "<undefined>"]) ["error message", "<undefined>"])
filterToolTips = ("Show debug, log, and info messages.", filterToolTips = ("Show debug, log, and info messages.",
"Show debug, log, and info messages.' occurrence='2", #"Show warning messages.", "Show warning messages.",
"Show debug, log, and info messages.' occurrence='3", #"Show error messages." "Show error messages.",
) )
for expression, expect, tooltip in zip(expressions, expected, filterToolTips): for expression, expect, tooltip in zip(expressions, expected, filterToolTips):
......
...@@ -32,7 +32,7 @@ source("../../shared/qtcreator.py") ...@@ -32,7 +32,7 @@ source("../../shared/qtcreator.py")
def main(): def main():
global testFolder global testFolder
cppEditorStr = ":Qt Creator_CppEditor::Internal::CPPEditorWidget" cppEditorStr = ":Qt Creator_CppEditor::Internal::CPPEditorWidget"
proEditorStr = ":Qt Creator_ProFileEditorWidget" proEditorStr = ":Qt Creator_TextEditor::BaseTextEditorWidget"
testFolder = prepareTemplate(os.path.abspath(os.path.join(os.getcwd(), "..", "shared", testFolder = prepareTemplate(os.path.abspath(os.path.join(os.getcwd(), "..", "shared",
"simplePlainCPP"))) "simplePlainCPP")))
if testFolder == None: if testFolder == None:
......
...@@ -76,7 +76,7 @@ def __modifyFile__(fileName, modificationFunc): ...@@ -76,7 +76,7 @@ def __modifyFile__(fileName, modificationFunc):
# add some stuff to pro file # add some stuff to pro file
def __modifyProFile__(): def __modifyProFile__():
proEditorStr = ":Qt Creator_ProFileEditorWidget" proEditorStr = ":Qt Creator_TextEditor::BaseTextEditorWidget"
addConfig = ["", "CONFIG += thread", "", addConfig = ["", "CONFIG += thread", "",
"lessThan(QT_VER_MAJ, 4) | lessThan(QT_VER_MIN, 7) {", "lessThan(QT_VER_MAJ, 4) | lessThan(QT_VER_MIN, 7) {",
" error(Qt 4.7 or newer is required but version $$[QT_VERSION] was detected.)", " error(Qt 4.7 or newer is required but version $$[QT_VERSION] was detected.)",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment