From 0655ccbe181c466f2a93ac44d298c79c1fe46ea4 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 18 Apr 2016 10:56:13 -0700 Subject: Remove items scheduled for removal in 1.6. Change-Id: I4098b281ab9c1f5bc29fe23164dd3a3303759ce0 Reviewed-by: Christian Kandeler --- doc/reference/modules/cpp-module.qdoc | 9 ---- examples/cocoa-application/CocoaApplication.qbs | 5 +-- .../CocoaTouchApplication.qbs | 5 +-- qbs-resources/imports/QbsLibrary.qbs | 2 +- share/qbs/imports/qbs/ModUtils/utils.js | 7 +--- share/qbs/modules/bundle/BundleModule.qbs | 4 -- share/qbs/modules/cpp/CppModule.qbs | 24 ----------- share/qbs/modules/cpp/DarwinGCC.qbs | 2 - share/qbs/modules/cpp/GenericGCC.qbs | 49 ---------------------- share/qbs/modules/cpp/gcc.js | 8 ---- share/qbs/modules/cpp/msvc.js | 21 ---------- share/qbs/modules/cpp/windows-msvc.qbs | 43 ------------------- src/app/config-ui/config-ui.qbs | 6 ++- src/lib/corelib/language/tst_language.cpp | 4 +- src/lib/qtprofilesetup/templates/core.qbs | 1 - tests/auto/api/tst_api.cpp | 3 -- 16 files changed, 10 insertions(+), 183 deletions(-) diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index 0980f3d9e..bc7092a09 100644 --- a/doc/reference/modules/cpp-module.qdoc +++ b/doc/reference/modules/cpp-module.qdoc @@ -409,15 +409,6 @@ \li \c{undefined} \li List of frameworks to be weakly linked. If the framework is part of your project, consider using a Depends item instead. - \row - \li installNamePrefix - \li \c{string} - \li 1.0 - \li \c{undefined} - \li The prefix for the internal install name (LC_ID_DYLIB) of a dynamic library on Darwin - (OS X and iOS). Typically this should be set to \c{"@rpath"} on modern platforms that - support it, which includes OS X 10.5 and above, and all versions of iOS. - \b Deprecated: use \c{cpp.sonamePrefix} instead. \row \li automaticReferenceCounting \li \c{bool} diff --git a/examples/cocoa-application/CocoaApplication.qbs b/examples/cocoa-application/CocoaApplication.qbs index 5e9ad9547..3a86dba48 100644 --- a/examples/cocoa-application/CocoaApplication.qbs +++ b/examples/cocoa-application/CocoaApplication.qbs @@ -45,9 +45,6 @@ CppApplication { cpp.precompiledHeader: "CocoaApplication/CocoaApplication-Prefix.pch" - // TODO: Remove in 1.6 - bundle.infoPlistFile: "CocoaApplication/CocoaApplication-Info.plist" - cpp.frameworks: ["Cocoa"] Group { @@ -55,7 +52,7 @@ CppApplication { files: [ "AppDelegate.h", "AppDelegate.m", - //"CocoaApplication-Info.plist", + "CocoaApplication-Info.plist", "CocoaApplication-Prefix.pch", "main.m" ] diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/CocoaTouchApplication.qbs index 0aa5b31d5..c92d5332a 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs +++ b/examples/cocoa-touch-application/CocoaTouchApplication.qbs @@ -45,9 +45,6 @@ CppApplication { cpp.precompiledHeader: "CocoaTouchApplication/CocoaTouchApplication-Prefix.pch" - // TODO: Remove in 1.6 - bundle.infoPlistFile: "CocoaTouchApplication/CocoaTouchApplication-Info.plist" - cpp.frameworks: [ "UIKit", "Foundation", "CoreGraphics" ] Group { @@ -55,7 +52,7 @@ CppApplication { files: [ "AppDelegate.h", "AppDelegate.m", - //"CocoaTouchApplication-Info.plist", + "CocoaTouchApplication-Info.plist", "CocoaTouchApplication-Prefix.pch", "Default-568h@2x.png", "Default.png", diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index 4d05ea004..474b67343 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -9,7 +9,7 @@ QbsProduct { targetName: (qbs.enableDebugCode && qbs.targetOS.contains("windows")) ? (name + 'd') : name destinationDirectory: qbs.targetOS.contains("windows") ? "bin" : project.libDirName cpp.defines: base.concat(type == "staticlibrary" ? ["QBS_STATIC_LIB"] : ["QBS_LIBRARY"]) - cpp.installNamePrefix: "@rpath" + cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined cpp.visibility: "minimal" cpp.cxxLanguageVersion: "c++11" bundle.isBundle: false diff --git a/share/qbs/imports/qbs/ModUtils/utils.js b/share/qbs/imports/qbs/ModUtils/utils.js index 493316850..f7284753f 100644 --- a/share/qbs/imports/qbs/ModUtils/utils.js +++ b/share/qbs/imports/qbs/ModUtils/utils.js @@ -103,31 +103,26 @@ function languagePropertyName(propertyName, fileTag) { "c": { "flags": "cFlags", "platformFlags": "platformCFlags", - "precompiledHeader": "cPrecompiledHeader", // TODO: Remove in 1.6 "usePrecompiledHeader": "useCPrecompiledHeader" }, "cpp": { "flags": "cxxFlags", "platformFlags": "platformCxxFlags", - "precompiledHeader": "cxxPrecompiledHeader", // TODO: Remove in 1.6 "usePrecompiledHeader": "useCxxPrecompiledHeader" }, "objc": { "flags": "objcFlags", "platformFlags": "platformObjcFlags", - "precompiledHeader": "objcPrecompiledHeader", // TODO: Remove in 1.6 "usePrecompiledHeader": "useObjcPrecompiledHeader" }, "objcpp": { "flags": "objcxxFlags", "platformFlags": "platformObjcxxFlags", - "precompiledHeader": "objcxxPrecompiledHeader", // TODO: Remove in 1.6 "usePrecompiledHeader": "useObjcxxPrecompiledHeader" }, "common": { "flags": "commonCompilerFlags", - "platformFlags": "platformCommonCompilerFlags", - "precompiledHeader": "precompiledHeader" // TODO: Remove in 1.6 + "platformFlags": "platformCommonCompilerFlags" }, "asm": asm, "asm_cpp": asm 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"] diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs index 3f31765c1..de1de7150 100644 --- a/src/app/config-ui/config-ui.qbs +++ b/src/app/config-ui/config-ui.qbs @@ -15,7 +15,10 @@ QbsApp { Group { condition: qbs.targetOS.contains("osx") - files: ["fgapp.mm"] + files: [ + "fgapp.mm", + "Info.plist" + ] } Properties { @@ -25,5 +28,4 @@ QbsApp { Depends { name: "bundle" } bundle.isBundle: false - bundle.infoPlistFile: "Info.plist" } diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp index 702af884e..8755f16e3 100644 --- a/src/lib/corelib/language/tst_language.cpp +++ b/src/lib/corelib/language/tst_language.cpp @@ -1912,7 +1912,7 @@ void TestLanguage::wildcards() QVERIFY(product); GroupPtr group; if (useGroup) { - QCOMPARE(product->groups.count(), HostOsInfo::isOsxHost() ? 4 : 3); + QCOMPARE(product->groups.count(), HostOsInfo::isOsxHost() ? 3 : 2); foreach (const GroupPtr &rg, product->groups) { if (rg->name == groupName) { group = rg; @@ -1920,7 +1920,7 @@ void TestLanguage::wildcards() } } } else { - QCOMPARE(product->groups.count(), HostOsInfo::isOsxHost() ? 3 : 2); + QCOMPARE(product->groups.count(), HostOsInfo::isOsxHost() ? 2 : 1); group = product->groups.first(); } QVERIFY(group); diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index 57aef089a..bdde3c77e 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -75,7 +75,6 @@ Module { property string qdocOutputDir: FileInfo.joinPaths(generatedFilesDir, "html") property string qmDir: product.destinationDirectory property string qmBaseName: product.targetName - property string qmFilesDir: qmDir // TODO: Remove in 1.6 property bool lreleaseMultiplexMode: false cpp.defines: { diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index e90237f40..dad8e78a3 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -297,9 +297,6 @@ void TestApi::buildProject_data() QTest::newRow("link static libs") << QString("link-static-lib") << relativeExecutableFilePath("HelloWorld"); - QTest::newRow("precompiled header") // TODO: Remove in 1.6 - << QString("precompiled-header") - << relativeExecutableFilePath("MyApp"); QTest::newRow("precompiled header new") << QString("precompiled-header-new") << relativeExecutableFilePath("MyApp"); -- cgit v1.2.3