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

Merge branch '3.4' of git://code.qt.io/qt-creator/qt-creator into 3.4

Browse Source
This commit is contained in:
Eike Ziller
2015-03-05 13:28:39 +01:00
parent 86378da3be 7142402429
commit 4a1b6c1fd8
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/system/suite_general/tst_rename_file/test.py
View File

@@ -55,15 +55,13 @@ def main():
previous = filenames[-1]
for filename in filenames:
tempFiletype = filetype
if filetype == "QML" and previous[-4:] != ".qml":
if previous in ("test", "TEST"):
if tempFiletype in ("Headers", "Sources", "QML"):
tempFiletype = "Sources"
else: # then it must be Resources
tempFiletype = "Other files"
elif filetype == "QML" and previous[-4:] != ".qml":
tempFiletype = "Other files"
# following is necessary due to QTCREATORBUG-10179
# will be fixed when Qt5's MIME type database can be used
if ((filenames[-1] in ("main.cpp", "utility.cpp") and previous[-4:] != ".cpp")
or (filenames[-1] == "utility.h" and previous[-2:].lower() != ".h")
or (filetype == "Resources" and previous[-4:] != ".qrc")):
tempFiletype = "Other files"
# end of handling QTCREATORBUG-10179
renameFile(templateDir, usedProFile, projectName + "." + tempFiletype,
previous, filename)
# QTCREATORBUG-13176 does update the navigator async
@@ -99,7 +97,7 @@ def renameFile(projectDir, proFile, branch, oldname, newname):
if platform.system() == 'Darwin':
waitFor("macHackActivateContextMenuItem('Rename...')", 5000)
else:
if oldname.endswith(".qrc"):
if oldname.lower().endswith(".qrc"):
menu = ":Qt Creator.Project.Menu.Folder_QMenu"
else:
menu = ":Qt Creator.Project.Menu.File_QMenu"