From fdd6cb3195c7845a2b8f32445ab3e38bb951ed60 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 30 Sep 2013 12:07:41 +0200 Subject: Change property types from "string" to "path" where applicable. Change-Id: I09cb3d854d8bd0e95760eae8c0e9a06d760498b4 Reviewed-by: Joerg Bornemann --- share/qbs/modules/Qt/QtModule.qbs | 6 +++--- share/qbs/modules/Qt/core/core.qbs | 14 +++++++------- share/qbs/modules/cpp/CppModule.qbs | 2 +- share/qbs/modules/cpp/DarwinGCC.qbs | 6 +++--- share/qbs/modules/cpp/GenericGCC.qbs | 8 ++++---- share/qbs/modules/cpp/windows-mingw.qbs | 2 +- share/qbs/modules/cpp/windows-msvc.qbs | 4 ++-- share/qbs/modules/qbs/common.qbs | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'share/qbs/modules') diff --git a/share/qbs/modules/Qt/QtModule.qbs b/share/qbs/modules/Qt/QtModule.qbs index f71e39e8a..2b38e92de 100644 --- a/share/qbs/modules/Qt/QtModule.qbs +++ b/share/qbs/modules/Qt/QtModule.qbs @@ -7,9 +7,9 @@ Module { Depends { name: "Qt.core" } property string qtModuleName - property string binPath: Qt.core.binPath - property string incPath: Qt.core.incPath - property string libPath: Qt.core.libPath + property path binPath: Qt.core.binPath + property path incPath: Qt.core.incPath + property path libPath: Qt.core.libPath property string qtLibInfix: Qt.core.libInfix property string repository: Qt.core.versionMajor === 5 ? 'qtbase' : undefined property string includeDirName: 'Qt' + qtModuleName diff --git a/share/qbs/modules/Qt/core/core.qbs b/share/qbs/modules/Qt/core/core.qbs index 6677cd420..55f4ca8bb 100644 --- a/share/qbs/modules/Qt/core/core.qbs +++ b/share/qbs/modules/Qt/core/core.qbs @@ -14,17 +14,17 @@ Module { property string repository: versionMajor === 5 ? "qtbase" : undefined property stringList config: [] property stringList qtConfig: [] - property string binPath - property string incPath - property string libPath - property string pluginPath - property string mkspecPath + property path binPath + property path incPath + property path libPath + property path pluginPath + property path mkspecPath property string mocName: "moc" property string lreleaseName: "lrelease" property string qdocName: versionMajor >= 5 ? "qdoc" : "qdoc3" property stringList qdocEnvironment property string qdocQhpFileName - property string docPath + property path docPath property stringList helpGeneratorArgs: versionMajor >= 5 ? ["-platform", "minimal"] : [] property string version property var versionParts: version.split('.').map(function(item) { return parseInt(item, 10); }) @@ -35,7 +35,7 @@ Module { property bool staticBuild property stringList buildVariant property string generatedFilesDir: "GeneratedFiles/" + product.name - property string qmFilesDir: product.destinationDirectory + property path qmFilesDir: product.destinationDirectory // private properties property string libraryInfix: cpp.debugInformation ? 'd' : '' diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index f6ca753c1..239e11fd8 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -83,7 +83,7 @@ Module { property pathList frameworkPaths property pathList systemFrameworkPaths property string compilerName - property string compilerPath: compilerName + property path compilerPath: compilerName property stringList compilerWrapper property string staticLibraryPrefix property string dynamicLibraryPrefix diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs index 5c4f70010..bdcaa2082 100644 --- a/share/qbs/modules/cpp/DarwinGCC.qbs +++ b/share/qbs/modules/cpp/DarwinGCC.qbs @@ -95,9 +95,9 @@ UnixGCC { return dict; } - readonly property string platformInfoPlist: platformPath ? [platformPath, "Info.plist"].join("/") : undefined - readonly property string sdkSettingsPlist: sysroot ? [sysroot, "SDKSettings.plist"].join("/") : undefined - readonly property string toolchainInfoPlist: toolchainInstallPath ? [toolchainInstallPath, "../../ToolchainInfo.plist"].join("/") : undefined + readonly property path platformInfoPlist: platformPath ? [platformPath, "Info.plist"].join("/") : undefined + readonly property path sdkSettingsPlist: sysroot ? [sysroot, "SDKSettings.plist"].join("/") : undefined + readonly property path toolchainInfoPlist: toolchainInstallPath ? [toolchainInstallPath, "../../ToolchainInfo.plist"].join("/") : undefined Rule { multiplex: true diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 28ef1719b..95105ef0b 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -11,11 +11,11 @@ CppModule { property stringList transitiveSOs property string toolchainPrefix - property string toolchainInstallPath + property path toolchainInstallPath compilerName: 'g++' property string archiverName: 'ar' - property string sysroot: qbs.sysroot - property string platformPath + property path sysroot: qbs.sysroot + property path platformPath property string toolchainPathPrefix: { var path = '' @@ -30,7 +30,7 @@ CppModule { } compilerPath: toolchainPathPrefix + compilerName - property string archiverPath: { return toolchainPathPrefix + archiverName } + property path archiverPath: { return toolchainPathPrefix + archiverName } property bool createSymlinks: true diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs index 81a7659fa..1c563478e 100644 --- a/share/qbs/modules/cpp/windows-mingw.qbs +++ b/share/qbs/modules/cpp/windows-mingw.qbs @@ -16,7 +16,7 @@ GenericGCC { compilerDefines: ['__GNUC__', 'WIN32', '_WIN32'] property string windresName: 'windres' - property string windresPath: { return toolchainPathPrefix + windresName } + property path windresPath: { return toolchainPathPrefix + windresName } setupBuildEnvironment: { var v = new ModUtils.EnvironmentVariable("PATH", ";", true); diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index ff34148a5..effe15a04 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -19,8 +19,8 @@ CppModule { compilerName: "cl.exe" property bool generateManifestFiles: true - property string toolchainInstallPath - property string windowsSDKPath + property path toolchainInstallPath + property path windowsSDKPath property string architecture: qbs.architecture || "x86" staticLibraryPrefix: "" dynamicLibraryPrefix: "" diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs index f48ddffc8..10ffc5181 100644 --- a/share/qbs/modules/qbs/common.qbs +++ b/share/qbs/modules/qbs/common.qbs @@ -24,7 +24,7 @@ Module { property bool install: false property string installDir property string installPrefix: "" - property string sysroot + property path sysroot PropertyOptions { name: "buildVariant" -- cgit v1.2.1