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

More Nokia -> Digia/QtProject changes

Browse Source 
Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Eike Ziller
2012-10-09 12:21:04 +02:00
committed by Tobias Hunger
parent 2b56943a8e
commit 1504ca67fb
27 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/qtcreator.py
+2 -2
View File
@@ -69,7 +69,7 @@ def __removeTmpSettingsDir__():
deleteDirIfExists(os.path.dirname(os.path.dirname(tmpSettingsDir)))
def substituteTildeWithinToolchains(settingsDir):
toolchains = os.path.join(settingsDir, "Nokia", 'qtcreator', 'toolchains.xml')
toolchains = os.path.join(settingsDir, "QtProject", 'qtcreator', 'toolchains.xml')
origToolchains = toolchains + "_orig"
home = os.path.expanduser("~")
os.rename(toolchains, origToolchains)
@@ -118,7 +118,7 @@ def substituteUnchosenTargetABIs(settingsDir):
CLOSED = 2
on64Bit = __is64BitOS__()
toolchains = os.path.join(settingsDir, "Nokia", 'qtcreator', 'toolchains.xml')
toolchains = os.path.join(settingsDir, "QtProject", 'qtcreator', 'toolchains.xml')
origToolchains = toolchains + "_orig"
os.rename(toolchains, origToolchains)
origFile = open(origToolchains, "r")