Commit 87e8f03c authored by Christian Kandeler's avatar Christian Kandeler

Set the right version number on our binaries.

While we have not encountered issues so far with using the default
values, it seems more correct to set the version so that e.g. on Unix
a library's soname contains the actual Qt Creator major version etc.
For good measure, also set the compatibility version on OS X.

Change-Id: I956c473e0b440fc87ffe1aaf99af626da733b5fb
Reviewed-by: Eike Ziller's avatarEike Ziller <eike.ziller@qt.io>
parent 7c583698
......@@ -16,6 +16,8 @@ QtcProduct {
var flags = base;
if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb
if (qbs.targetOS.contains("osx"))
flags.push("-compatibility_version", project.qtcreator_compat_version);
return flags;
}
cpp.installNamePrefix: "@rpath"
......
......@@ -32,6 +32,8 @@ QtcProduct {
var flags = base;
if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb
if (qbs.targetOS.contains("osx"))
flags.push("-compatibility_version", project.qtcreator_compat_version);
return flags;
}
......
......@@ -2,6 +2,7 @@ import qbs 1.0
import QtcFunctions
Product {
version: project.qtcreator_version
property string installDir
Depends { name: "cpp" }
......
......@@ -3,6 +3,7 @@ QTCREATOR_PRI_INCLUDED = 1
QTCREATOR_VERSION = 4.0.82
QTCREATOR_COMPAT_VERSION = 4.0.82
VERSION = $$QTCREATOR_VERSION
BINARY_ARTIFACTS_BRANCH = master
# enable c++11
......
......@@ -12,7 +12,10 @@ win32 {
DESTDIR = $$IDE_LIBRARY_PATH
osx: QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/Frameworks/
osx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/Frameworks/
QMAKE_LFLAGS += -compatibility_version $$QTCREATOR_COMPAT_VERSION
}
include(rpath.pri)
TARGET = $$qtLibraryName($$TARGET)
......
......@@ -84,7 +84,10 @@ exists($$PLUGINJSON_IN) {
DISTFILES += $$PLUGINJSON
}
osx: QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/
osx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/
QMAKE_LFLAGS += -compatibility_version $$QTCREATOR_COMPAT_VERSION
}
include(rpath.pri)
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
......
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