Remove items scheduled for removal in 1.6.

Change-Id: I4098b281ab9c1f5bc29fe23164dd3a3303759ce0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

7 files changed, 0 insertions, 151 deletions

diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs
index 88fb6ecd6..7e5e3a32c 100644
--- a/share/qbs/modules/bundle/BundleModule.qbs
+++ b/share/qbs/modules/bundle/BundleModule.qbs
@@ -260,10 +260,6 @@ Module {
         patterns: ["Info.plist", "*-Info.plist"]
     }
 
-    // TODO: Remove in 1.6 (deprecated, backwards compatibility)
-    property path infoPlistFile
-    Group { name: "Info.plist"; files: bundle.infoPlistFile ? [bundle.infoPlistFile] : [] }
-
     Rule {
         condition: qbs.targetOS.contains("darwin")
         multiplex: true
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 18ae4df1d..c0d7f3a8b 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -50,15 +50,6 @@ Module {
     property bool useObjcPrecompiledHeader: false
     property bool useObjcxxPrecompiledHeader: false
 
-    // TODO: Remove these in 1.6
-    property path cxxPrecompiledHeader: precompiledHeader
-    // ### default to undefined on non-Apple platforms for now - QBS-346
-    property path precompiledHeader
-    property path cPrecompiledHeader: precompiledHeader
-    property path objcPrecompiledHeader: qbs.targetOS.contains("darwin") ? precompiledHeader : undefined
-    property path objcxxPrecompiledHeader: qbs.targetOS.contains("darwin") ? precompiledHeader : undefined
-    property path precompiledHeaderDir: product.buildDirectory
-
     property stringList defines
     property stringList platformDefines: qbs.enableDebugCode ? [] : ["NDEBUG"]
     property stringList compilerDefines
@@ -130,27 +121,12 @@ Module {
                         be set."
     }
 
-    property string installNamePrefix
-    PropertyOptions {
-        name: "installNamePrefix"
-        description: "The prefix for the internal install name (LC_ID_DYLIB) of a dynamic library \
-                      on Darwin (OS X and iOS)."
-    }
-
     property pathList includePaths
     property pathList systemIncludePaths
     property pathList libraryPaths
     property pathList frameworkPaths
     property pathList systemFrameworkPaths
 
-    // TODO: Remove in 1.6 (deprecated, backwards compatibility)
-    property pathList linkerScripts
-    Group {
-        name: "qbs_cpp_linkerscript"
-        files: cpp.linkerScripts || []
-        fileTags: ["linkerscript"]
-    }
-
     property string assemblerName
     property string assemblerPath: assemblerName
     property string compilerName
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs
index 053fa16c3..7b9d5ce94 100644
--- a/share/qbs/modules/cpp/DarwinGCC.qbs
+++ b/share/qbs/modules/cpp/DarwinGCC.qbs
@@ -54,8 +54,6 @@ UnixGCC {
                           ? FileInfo.joinPaths(xcode.toolchainPath, "usr", "bin") : base
     sysroot: xcode.present ? xcode.sdkPath : base
 
-    sonamePrefix: installNamePrefix // TODO: Remove in 1.6 (deprecated, backwards compatibility)
-
     setupBuildEnvironment: {
         for (var key in buildEnv) {
             v = new ModUtils.EnvironmentVariable(key);
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 6f54fe924..04bdc5a13 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -395,55 +395,6 @@ CppModule {
         }
     }
 
-    // TODO: Remove in 1.6
-    Transformer {
-        condition: cPrecompiledHeader !== undefined
-        inputs: cPrecompiledHeader
-        Artifact {
-            filePath: product.name + "_c.gch"
-            fileTags: "c_pch"
-        }
-        prepare: {
-            return Gcc.prepareCompiler.apply(this, arguments);
-        }
-    }
-
-    Transformer {
-        condition: cxxPrecompiledHeader !== undefined
-        inputs: cxxPrecompiledHeader
-        Artifact {
-            filePath: product.name + "_cpp.gch"
-            fileTags: "cpp_pch"
-        }
-        prepare: {
-            return Gcc.prepareCompiler.apply(this, arguments);
-        }
-    }
-
-    Transformer {
-        condition: objcPrecompiledHeader !== undefined
-        inputs: objcPrecompiledHeader
-        Artifact {
-            filePath: product.name + "_objc.gch"
-            fileTags: "objc_pch"
-        }
-        prepare: {
-            return Gcc.prepareCompiler.apply(this, arguments);
-        }
-    }
-
-    Transformer {
-        condition: objcxxPrecompiledHeader !== undefined
-        inputs: objcxxPrecompiledHeader
-        Artifact {
-            filePath: product.name + "_objcpp.gch"
-            fileTags: "objcpp_pch"
-        }
-        prepare: {
-            return Gcc.prepareCompiler.apply(this, arguments);
-        }
-    }
-
     FileTagger {
         patterns: "*.s"
         fileTags: ["asm"]
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index d7842c4e0..ebc07d525 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -470,14 +470,6 @@ function compilerFlags(product, input, output) {
         args.push('-include', pchFilePath);
     }
 
-    // TODO: Remove in 1.6
-    if (!pchOutput && ModUtils.moduleProperty(input, 'precompiledHeader', tag)) {
-        pchFilePath = FileInfo.joinPaths(
-            ModUtils.moduleProperty(product, "precompiledHeaderDir"),
-            product.name + "_" + tag);
-        args.push('-include', pchFilePath);
-    }
-
     var positionIndependentCode = input.moduleProperty('cpp', 'positionIndependentCode')
     if (effectiveType === EffectiveTypeEnum.LIB) {
         if (positionIndependentCode !== false && !product.moduleProperty("qbs", "toolchain").contains("mingw"))
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index c671f8abe..cf507a643 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -143,27 +143,6 @@ function prepareCompiler(project, product, inputs, outputs, input, output) {
     else if (tag === "c")
         args.push("/TC");
 
-    // precompiled header file
-    // TODO: Remove in 1.6
-    var pch = ModUtils.moduleProperty(input, "precompiledHeader", tag);
-    if (pch) {
-        if (pchOutput) {
-            // create PCH
-            args.push("/Yc");
-            args.push("/Fp" + FileInfo.toWindowsSeparators(pchOutput.filePath));
-            args.push("/Fo" + FileInfo.toWindowsSeparators(objOutput.filePath));
-            args.push(FileInfo.toWindowsSeparators(input.filePath));
-        } else {
-            // use PCH
-            var pchHeaderName = FileInfo.toWindowsSeparators(pch);
-            var pchName = FileInfo.toWindowsSeparators(ModUtils.moduleProperty(product, "precompiledHeaderDir")
-                + "\\.obj\\" + product.name + "_" + tag + ".pch");
-            args.push("/FI" + pchHeaderName);
-            args.push("/Yu" + pchHeaderName);
-            args.push("/Fp" + pchName);
-        }
-    }
-
     var commands = [];
     var usePch = ModUtils.moduleProperty(input, "usePrecompiledHeader", tag);
     if (usePch) {
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index cce1a547b..98a88b2b9 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -73,7 +73,6 @@ CppModule {
     separateDebugInformation: true
 
     property bool generateManifestFile: true
-    property bool generateManifestFiles: generateManifestFile // TODO: Remove in 1.6
     property path toolchainInstallPath
     architecture: qbs.architecture
     staticLibraryPrefix: ""
@@ -133,48 +132,6 @@ CppModule {
         }
     }
 
-    // TODO: Remove in 1.6
-    Transformer {
-        condition: cPrecompiledHeader !== undefined
-        inputs: cPrecompiledHeader
-        Artifact {
-            fileTags: ['obj']
-            filePath: {
-                var completeBaseName = FileInfo.completeBaseName(product.moduleProperty("cpp",
-                        "cPrecompiledHeader"));
-                return ".obj/" + Utilities.getHash(completeBaseName) + '_c.obj'
-            }
-        }
-        Artifact {
-            fileTags: ['c_pch']
-            filePath: ".obj/" + product.name + '_c.pch'
-        }
-        prepare: {
-            return MSVC.prepareCompiler.apply(this, arguments);
-        }
-    }
-
-    Transformer {
-        condition: cxxPrecompiledHeader !== undefined
-        inputs: cxxPrecompiledHeader
-        explicitlyDependsOn: ["c_pch"]  // to prevent vc--0.pdb conflict
-        Artifact {
-            fileTags: ['obj']
-            filePath: {
-                var completeBaseName = FileInfo.completeBaseName(product.moduleProperty("cpp",
-                        "cxxPrecompiledHeader"));
-                return ".obj/" + Utilities.getHash(completeBaseName) + '_cpp.obj'
-            }
-        }
-        Artifact {
-            fileTags: ['cpp_pch']
-            filePath: ".obj/" + product.name + '_cpp.pch'
-        }
-        prepare: {
-            return MSVC.prepareCompiler.apply(this, arguments);
-        }
-    }
-
     Rule {
         id: compiler
         inputs: ["cpp", "c"]