From 11fb781156bb9ac0742d7c06a984533c93028aeb Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 18 Jun 2013 12:34:55 -0400 Subject: Use better property types where appropriate. Change-Id: Iee8dea7761b1b932dbd8c33a67a7088030b6561d Reviewed-by: Joerg Bornemann --- share/qbs/imports/qbs/probes/PathProbe.qbs | 8 ++--- share/qbs/imports/qbs/probes/PkgConfigProbe.qbs | 4 +-- share/qbs/modules/Qt/core/qtcore.qbs | 16 ++++----- share/qbs/modules/cpp/CppModule.qbs | 44 ++++++++++++------------- share/qbs/modules/cpp/GenericGCC.qbs | 2 +- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/share/qbs/imports/qbs/probes/PathProbe.qbs b/share/qbs/imports/qbs/probes/PathProbe.qbs index f895972ff..59efd2426 100644 --- a/share/qbs/imports/qbs/probes/PathProbe.qbs +++ b/share/qbs/imports/qbs/probes/PathProbe.qbs @@ -4,13 +4,13 @@ import "utils.js" as Utils Probe { // Inputs - property var names + property stringList names property var nameFilter property pathList pathPrefixes - property var pathSuffixes + property stringList pathSuffixes property pathList platformPaths: [ '/usr', '/usr/local' ] - property var environmentPaths - property var platformEnvironmentPaths + property pathList environmentPaths + property pathList platformEnvironmentPaths // Output property string path diff --git a/share/qbs/imports/qbs/probes/PkgConfigProbe.qbs b/share/qbs/imports/qbs/probes/PkgConfigProbe.qbs index 5a50cda8f..aca42f0de 100644 --- a/share/qbs/imports/qbs/probes/PkgConfigProbe.qbs +++ b/share/qbs/imports/qbs/probes/PkgConfigProbe.qbs @@ -11,8 +11,8 @@ Probe { property string maxVersion // Output - property var cflags - property var libs + property stringList cflags + property stringList libs configure: { if (!name) diff --git a/share/qbs/modules/Qt/core/qtcore.qbs b/share/qbs/modules/Qt/core/qtcore.qbs index da77b3e10..80ec574c1 100644 --- a/share/qbs/modules/Qt/core/qtcore.qbs +++ b/share/qbs/modules/Qt/core/qtcore.qbs @@ -20,18 +20,18 @@ Module { property string mocName: "moc" property string lreleaseName: "lrelease" property string qdocName: versionMajor >= 5 ? "qdoc" : "qdoc3" - property var qdocEnvironment - property var qdocQhpFileName - property var docPath - property var helpGeneratorArgs: versionMajor >= 5 ? ["-platform", "minimal"] : [] + property stringList qdocEnvironment + property string qdocQhpFileName + property string docPath + property stringList helpGeneratorArgs: versionMajor >= 5 ? ["-platform", "minimal"] : [] property string version property var versionParts: version.split('.').map(function(item) { return parseInt(item, 10); }) - property var versionMajor: versionParts[0] - property var versionMinor: versionParts[1] - property var versionPatch: versionParts[2] + property int versionMajor: versionParts[0] + property int versionMinor: versionParts[1] + property int versionPatch: versionParts[2] property bool frameworkBuild property bool staticBuild - property var buildVariant + property stringList buildVariant property string generatedFilesDir: 'GeneratedFiles/' + product.name // ### TODO: changing this property does not change the path in the rule ATM. property string qmFilesDir: product.destinationDirectory diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs index ca3f861be..c539c4cc6 100644 --- a/share/qbs/modules/cpp/CppModule.qbs +++ b/share/qbs/modules/cpp/CppModule.qbs @@ -11,9 +11,9 @@ Module { property bool debugInformation: qbs.debugInformation property path precompiledHeader property path precompiledHeaderDir: product.buildDirectory - property var defines - property var platformDefines: qbs.enableDebugCode ? [] : ["NDEBUG"] - property var compilerDefines + property stringList defines + property stringList platformDefines: qbs.enableDebugCode ? [] : ["NDEBUG"] + property stringList compilerDefines PropertyOptions { name: "compilerDefines" description: "preprocessor macros that are defined when using this particular compiler" @@ -84,54 +84,54 @@ Module { property string staticLibrarySuffix property string dynamicLibrarySuffix property string executableSuffix - property var dynamicLibraries // list of names, will be linked with -lname - property var staticLibraries // list of static library files - property var frameworks // list of frameworks, will be linked with '-framework ' - property var weakFrameworks // list of weakly-linked frameworks, will be linked with '-weak_framework ' - property var rpaths + property stringList dynamicLibraries // list of names, will be linked with -lname + property stringList staticLibraries // list of static library files + property stringList frameworks // list of frameworks, will be linked with '-framework ' + property stringList weakFrameworks // list of weakly-linked frameworks, will be linked with '-weak_framework ' + property stringList rpaths - property var cppFlags + property stringList cppFlags PropertyOptions { name: "cppFlags" description: "additional flags for the C preprocessor" } - property var cFlags + property stringList cFlags PropertyOptions { name: "cFlags" description: "additional flags for the C compiler" } - property var cxxFlags + property stringList cxxFlags PropertyOptions { name: "cxxFlags" description: "additional flags for the C++ compiler" } - property var objcFlags + property stringList objcFlags PropertyOptions { name: "objcFlags" description: "additional flags for the Objective-C compiler" } - property var objcxxFlags + property stringList objcxxFlags PropertyOptions { name: "objcxxFlags" description: "additional flags for the Objective-C++ compiler" } - property var commonCompilerFlags + property stringList commonCompilerFlags PropertyOptions { name: "commonCompilerFlags" description: "flags added to all compilation independently of the language" } - property var linkerFlags + property stringList linkerFlags PropertyOptions { name: "linkerFlags" description: "additional linker flags" } - property var positionIndependentCode + property bool positionIndependentCode PropertyOptions { name: "positionIndependentCode" description: "generate position independent code" @@ -146,12 +146,12 @@ Module { // Platform properties. Those are intended to be set by the toolchain setup // and are prepended to the corresponding user properties. - property var platformCommonCompilerFlags - property var platformCFlags - property var platformCxxFlags - property var platformObjcFlags - property var platformObjcxxFlags - property var platformLinkerFlags + property stringList platformCommonCompilerFlags + property stringList platformCFlags + property stringList platformCxxFlags + property stringList platformObjcFlags + property stringList platformObjcxxFlags + property stringList platformLinkerFlags FileTagger { pattern: "*.c" diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 61dde5347..da43c782e 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -9,7 +9,7 @@ import 'path-tools.js' as PathTools CppModule { condition: false - property var transitiveSOs + property stringList transitiveSOs property string toolchainPrefix property string toolchainInstallPath compilerName: 'g++' -- cgit v1.2.1