diff options
Diffstat (limited to 'qbs')
-rw-r--r-- | qbs/imports/QtcLibrary.qbs | 5 | ||||
-rw-r--r-- | qbs/imports/QtcPlugin.qbs | 7 | ||||
-rw-r--r-- | qbs/imports/QtcProduct.qbs | 5 | ||||
-rw-r--r-- | qbs/imports/QtcTool.qbs | 1 | ||||
-rw-r--r-- | qbs/modules/libclang/functions.js | 4 | ||||
-rw-r--r-- | qbs/modules/libclang/libclang.qbs | 9 | ||||
-rw-r--r-- | qbs/modules/qtc/qtc.qbs | 14 |
7 files changed, 25 insertions, 20 deletions
diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index af6eb04bad..faa3900a99 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -1,10 +1,11 @@ import qbs 1.0 +import qbs.FileInfo import QtcFunctions QtcProduct { type: ["dynamiclibrary", "dynamiclibrary_symlink", "qtc.dev-module"] installDir: qtc.ide_library_path - installTags: ["dynamiclibrary", "dynamiclibrary_symlink"] + installTags: ["dynamiclibrary", "dynamiclibrary_symlink", "debuginfo_dll"] useNonGuiPchFile: true Depends { condition: qtc.testsEnabled @@ -12,7 +13,7 @@ QtcProduct { } targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: qtc.ide_library_path + destinationDirectory: FileInfo.joinPaths(buildDirectory, qtc.ide_library_path) cpp.linkerFlags: { var flags = base; diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index f72dd5b352..95198a62ef 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -5,18 +5,15 @@ import QtcFunctions QtcProduct { type: ["dynamiclibrary", "pluginSpec", "qtc.dev-module"] installDir: qtc.ide_plugin_path - installTags: ["dynamiclibrary"] + installTags: ["dynamiclibrary", "debuginfo_dll"] useGuiPchFile: true property var pluginJsonReplacements property var pluginRecommends: [] property var pluginTestDepends: [] - property string minimumQtVersion: "5.6.2" - condition: QtcFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion) - targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: qtc.ide_plugin_path + destinationDirectory: FileInfo.joinPaths(buildDirectory, qtc.ide_plugin_path) Depends { name: "ExtensionSystem" } Depends { name: "pluginjson" } diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index c6b130effe..ef19ce4987 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -8,7 +8,7 @@ Product { version: qtc.qtcreator_version property bool install: true property string installDir - property string installSourceBase + property string installSourceBase: destinationDirectory property stringList installTags: type property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs" property bool useNonGuiPchFile: false @@ -20,6 +20,7 @@ Product { Depends { name: "cpp" } Depends { name: "qtc" } Depends { name: product.name + " dev headers"; required: false } + Depends { name: "Qt.core"; versionAtLeast: "5.6.2" } Properties { condition: Utilities.versionCompare(Qt.core.version, "5.7") < 0 @@ -36,8 +37,6 @@ Product { cpp.useCxxPrecompiledHeader: useNonGuiPchFile || useGuiPchFile cpp.visibility: "minimal" - Depends { name: "Qt.core" } - Group { fileTagsFilter: installTags qbs.install: install diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs index 304e2e87a9..1b38968650 100644 --- a/qbs/imports/QtcTool.qbs +++ b/qbs/imports/QtcTool.qbs @@ -5,6 +5,7 @@ QtcProduct { type: ["application"] consoleApplication: true installDir: qtc.ide_libexec_path + installTags: base.concat(["debuginfo_app"]) useNonGuiPchFile: true cpp.rpaths: { diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index fe61da62dd..3b74066562 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -1,7 +1,7 @@ var Environment = require("qbs.Environment") var File = require("qbs.File") var FileInfo = require("qbs.FileInfo") -var MinimumLLVMVersion = "3.9.0" +var MinimumLLVMVersion = "5.0.0" // CLANG-UPGRADE-CHECK: Adapt minimum version numbers. var Process = require("qbs.Process") function readOutput(executable, args) @@ -33,7 +33,7 @@ function llvmConfig(qbs, qtcFunctions) { var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmConfigVariants = [ - "llvm-config", "llvm-config-3.9", "llvm-config-4.0", "llvm-config-4.1" + "llvm-config", "llvm-config-5.0", "llvm-config-6.0", "llvm-config-7.0", "llvm-config-8.0", ]; // Prefer llvm-config* from LLVM_INSTALL_DIR diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs index 402e492217..e4253cc105 100644 --- a/qbs/modules/libclang/libclang.qbs +++ b/qbs/modules/libclang/libclang.qbs @@ -50,14 +50,15 @@ Module { }) property stringList llvmToolingCxxFlags: clangProbe.llvmToolingCxxFlags property bool toolingEnabled: !Environment.getEnv("QTC_NO_CLANG_LIBTOOLING") - && Utilities.versionCompare(llvmVersion, "3.9") > 0 - && Utilities.versionCompare(llvmVersion, "4") < 0 + && Utilities.versionCompare(llvmVersion, "5") > 0 + && Utilities.versionCompare(llvmVersion, "6") < 0 validate: { if (!clangProbe.found) { - console.warn("Set LLVM_INSTALL_DIR to build the Clang Code Model." + console.warn("No usable libclang version found." + + " Set LLVM_INSTALL_DIR to build the Clang Code Model." + " For details, see doc/src/editors/creator-clang-codemodel.qdoc."); - throw "No usable libclang found"; + throw new Error(); } } } diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 54578cc0f7..a710ad05ab 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,24 +4,30 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.5.1' + property string qtcreator_display_version: '4.6.0-beta1' property string ide_version_major: '4' property string ide_version_minor: '5' - property string ide_version_release: '1' + property string ide_version_release: '82' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '4' property string ide_compat_version_minor: '5' - property string ide_compat_version_release: '0' + property string ide_compat_version_release: '82' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release property string qtcreator_copyright_year: '2018' + property string qtcreator_copyright_string: "(C) " + qtcreator_copyright_year + " The Qt Company Ltd" + + property string ide_display_name: 'Qt Creator' + property string ide_id: 'qtcreator' + property string ide_cased_id: 'QtCreator' + property string ide_bundle_identifier: 'org.qt-project.qtcreator' property string libDirName: "lib" property string ide_app_path: qbs.targetOS.contains("macos") ? "" : "bin" - property string ide_app_target: qbs.targetOS.contains("macos") ? "Qt Creator" : "qtcreator" + property string ide_app_target: qbs.targetOS.contains("macos") ? ide_display_name : ide_id property string ide_library_path: { if (qbs.targetOS.contains("macos")) return ide_app_target + ".app/Contents/Frameworks" |