Commit 89225167 authored by Robert Loehning's avatar Robert Loehning

Squish: Removing now unused constant defaultQtVersion

Its use was being removed in 6078d7e0

Change-Id: Ib27d7e9a7596fc6358edc1e4a09962951d105752
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent 161b818b
......@@ -33,7 +33,7 @@ import re
# the application compiled by Creator
def modifyRunSettingsForHookInto(projectName, kitCount, port):
prepareBuildSettings(kitCount, 0)
# this uses the defaultQtVersion currently
# this uses the default Qt version which Creator activates when opening the project
switchViewTo(ViewConstants.PROJECTS)
switchToBuildOrRunSettingsFor(kitCount, 0, ProjectSettings.BUILD)
qtVersion, mkspec, qtBinPath, qtLibPath = getQtInformationForBuildSettings(kitCount, True)
......
......@@ -275,11 +275,9 @@ origSettingsDir = os.path.abspath(os.path.join(os.getcwd(), "..", "..", "setting
if platform.system() in ('Windows', 'Microsoft'):
sdkPath = "C:\\QtSDK"
origSettingsDir = os.path.join(origSettingsDir, "windows")
defaultQtVersion = "Qt 4.7.4 for Desktop - MinGW 4.4 (Qt SDK)"
else:
sdkPath = os.path.expanduser("~/QtSDK")
origSettingsDir = os.path.join(origSettingsDir, "unix")
defaultQtVersion = "Desktop Qt 4.7.4 for GCC (Qt SDK)"
srcPath = os.getenv("SYSTEST_SRCPATH", sdkPath + "/src")
overrideStartApplication()
......
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