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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	src/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75
This commit is contained in:
Eike Ziller
2016-02-24 10:08:37 +01:00
parent eaffeb081e 80d93ab52a
commit 74cdce071f
18 changed files with 108 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/editor_utils.py
+3
View File
@@ -261,6 +261,7 @@ def getEditorForFileSuffix(curFile, treeViewSyntax=False):
proEditorSuffixes = ["pro", "pri", "prf"]
glslEditorSuffixes= ["frag", "vert", "fsh", "vsh", "glsl", "shader", "gsh"]
pytEditorSuffixes = ["py", "pyw", "wsgi"]
binEditorSuffixes = ["bin"]
suffix = __getFileSuffix__(curFile)
expected = os.path.basename(curFile)
if treeViewSyntax:
@@ -276,6 +277,8 @@ def getEditorForFileSuffix(curFile, treeViewSyntax=False):
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
elif suffix in proEditorSuffixes or suffix in glslEditorSuffixes or suffix in pytEditorSuffixes:
editor = waitForObject(":Qt Creator_TextEditor::TextEditorWidget")
elif suffix in binEditorSuffixes:
editor = waitForObject(":Qt Creator_BinEditor::BinEditorWidget")
else:
test.log("Trying TextEditorWidget (file suffix: %s)" % suffix)
try: