Merge 1.10 into master

Change-Id: Iecddc2722d22d7c15d4b32efd676fa8e7c00e99f

4 files changed, 12 insertions, 20 deletions

diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 17cfb4905..dc175e875 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -167,17 +167,17 @@ Module {
     property string linkerName
     property string linkerPath: linkerName
     property stringList linkerWrapper
-    property string staticLibraryPrefix
-    property string dynamicLibraryPrefix
-    property string loadableModulePrefix
-    property string executablePrefix
-    property string staticLibrarySuffix
-    property string dynamicLibrarySuffix
-    property string loadableModuleSuffix
-    property string executableSuffix
-    property string debugInfoSuffix
-    property string debugInfoBundleSuffix
-    property string variantSuffix
+    property string staticLibraryPrefix: ""
+    property string dynamicLibraryPrefix: ""
+    property string loadableModulePrefix: ""
+    property string executablePrefix: ""
+    property string staticLibrarySuffix: ""
+    property string dynamicLibrarySuffix: ""
+    property string loadableModuleSuffix: ""
+    property string executableSuffix: ""
+    property string debugInfoSuffix: ""
+    property string debugInfoBundleSuffix: ""
+    property string variantSuffix: ""
     property bool createSymlinks: true
     property stringList dynamicLibraries // list of names, will be linked with -lname
     property stringList staticLibraries // list of static library files
@@ -185,7 +185,7 @@ Module {
     property stringList weakFrameworks // list of weakly-linked frameworks, will be linked with '-weak_framework <name>'
     property string rpathOrigin
     property stringList rpaths
-    property string sonamePrefix
+    property string sonamePrefix: ""
     property bool useRPaths: true
     property bool useRPathLink
     property string rpathLinkFlag
diff --git a/share/qbs/modules/cpp/UnixGCC.qbs b/share/qbs/modules/cpp/UnixGCC.qbs
index 2b4b3b018..3ac279b26 100644
--- a/share/qbs/modules/cpp/UnixGCC.qbs
+++ b/share/qbs/modules/cpp/UnixGCC.qbs
@@ -38,11 +38,8 @@ GenericGCC {
     staticLibraryPrefix: "lib"
     dynamicLibraryPrefix: "lib"
     loadableModulePrefix: "lib"
-    executablePrefix: ""
     staticLibrarySuffix: ".a"
     dynamicLibrarySuffix: ".so"
-    loadableModuleSuffix: ""
-    executableSuffix: ""
     debugInfoSuffix: ".debug"
     imageFormat: "elf"
     systemRunPaths: ["/lib", "/usr/lib"]
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index 65a219c50..08788481d 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -41,8 +41,6 @@ GenericGCC {
                qbs.toolchain && qbs.toolchain.contains("mingw")
     priority: 0
     staticLibraryPrefix: "lib"
-    dynamicLibraryPrefix: ""
-    executablePrefix: ""
     staticLibrarySuffix: ".a"
     dynamicLibrarySuffix: ".dll"
     executableSuffix: ".exe"
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 6c000f7ac..653f58212 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -110,9 +110,6 @@ CppModule {
                                                                   : undefined
     architecture: qbs.architecture
     endianness: "little"
-    staticLibraryPrefix: ""
-    dynamicLibraryPrefix: ""
-    executablePrefix: ""
     staticLibrarySuffix: ".lib"
     dynamicLibrarySuffix: ".dll"
     executableSuffix: ".exe"