Commit b98d5822 authored by Christian Kandeler's avatar Christian Kandeler

qbs build: Use the proper way to check the Qt version

Doing this via the product condition silently switches the product off
if Qt is too old, which will leave users wondering about the reason.
Instead, use the long-supported version check functionality of the
Depends item, which will result in a clear message in case of a failure.
Also, move the check to QtcProduct. The version requirement is for all
of QtCreator, not just the plugins.

Change-Id: Id445823e0243f5ad3b7a0ccb747a90e4fb18889b
Reviewed-by: default avatarRobert Loehning <robert.loehning@qt.io>
Reviewed-by: Jake Petroules's avatarJake Petroules <jake.petroules@qt.io>
parent 19d93d29
......@@ -12,9 +12,6 @@ QtcProduct {
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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment