| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
We recently merged a patch that used Qt 5.10 functionality. Let's use
this opportunity to increase the minimum required Qt version. We choose
5.11, since that is also Qt Creator's requirement.
Change-Id: I729a7e840ab9cdafb8f9fba604e413cd4b822bed
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
The code worked only if qbs.installPrefix was empty.
Change-Id: I9ba69f10c976b4a2b71ae4934c4cdac58895882a
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This is not supported. People must use the content of the installation
directory instead.
This reduces complexity of qbs' own project files.
Change-Id: I39f8bb4d5252b0631a64b3aac01f83b09b28ae0f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This module generates .pc files for products, optionally attempting to
derive some of the entries from the contents of the Export item.
[ChangeLog] Added new module "Exporter.pkgconfig" for creating pkg-
config metadata files.
Task-number: QBS-1232
Change-Id: Ic41e645e4462e8f85ad6c2025fb967e88d3438f9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
So that we can easily test this functionality in the absence of a
statically built Qt.
Change-Id: I9c8f296222bc3155cb95219d4ababfd34e1e7e7b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\
| |
| |
| | |
Change-Id: Iebe7584bd2978a8f8be093c6b366033076f83e74
|
| |
| |
| |
| |
| |
| | |
Change-Id: I250d1b6a1c228a02818f509d1f389fb8ccc273c1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
... and remove the workarounds that are no longer needed.
Change-Id: Ie0ae19279633784f8cea3bdbe4a9eeaa308689aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This module generates qbs modules from products, providing an interface
to them for use by external projects.
[ChangeLog] Added new module "Exporter.qbs" for creating qbs modules
from products.
Task-number: QBS-1231
Change-Id: I9f0cf04b441aaf279cf19a84fd94d97a8cea9de8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
...as opposed to relying on the qbs binary existing in the same
directory as the test binaries and being usable from that location. This
is necessary for some generators (as they generate projects which call
the same qbs binary as they were generated with) where an invocation on
the qbs binary in the non-installed location may fail to find dependent
libraries when invoked from an outside environment.
Change-Id: I4d35a6f70df3ad4c48b202f73399ffe1704f78ca
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This will enable us to simplify some of our templates.
Qt Creator requires C++14 as well, so we won't break it.
Change-Id: I577347ef12c53ff2ec59e88344ff181b27a0d50c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|/
|
|
|
|
|
| |
... rather than separately in the derived items.
Change-Id: I3f036ad45269daaa44aabfcd017c524083c84399
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
| |
They got accidentally removed in 5a1bb1db8e.
Change-Id: I75a78507eddd9c225d846870d9515807c6117f27
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
| |
It was left over.
Change-Id: I0104b5ef046a0d31b3d780a079f8ecc5c9abb5e6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Document it, and install the dependencies in the Docker images.
For the man page build, the installed version of the qbs app is now used
to get the help text rather than the non-installed version, since the
non-installed version may not be able to find all library dependencies
(like Qt) on some platforms by default. The build also now depends on
the other executables as well since their presence affects the output of
qbs --help.
Change-Id: Ic9896231aa76a346180bf30f7b2483391f5e4ea0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Exporting a list of rpaths from a target is completely bogus as-is,
because a target cannot know a dependee's install location relative to
itself. This patch instead has each target category (executables in bin,
libraries in lib, libexec binaries in libexec/qbs, and plugins in
lib/qbs/plugins) set its relative installation directory at the product
level, and then an appropriate rpath is created for the target by
calculating a relative path from the target to the lib directory in the
context of an installed build. This also has the advantage that rpaths
are now calculated dynamically at build time rather than hardcoded, so
if a user changes the directory depth of pluginsInstallDir, for example,
everything will be adjusted automatically. Each target also therefore
now has an rpath pointing exactly to its immediate dependencies, instead
of relying on the parent process to inherit the rpath entries. Among
simply being correct, this also has the advantage that any target can
now be loaded correctly by another process which itself sets no rpath
happening to point to the qbs lib directory.
Change-Id: I8fdf24b74ef60426cea0930b7941479919226fd2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Qbs currently promises BC for the same minor release. Therefore, set the
compatibility version to the same as the SONAME version. In addition to
the mere declaration for correctness, this also helps to allow the OS
to prevent loading a mismatched qbs binary and libraries if such a
situation happens to occur.
Change-Id: Ic1cfdcab29e1efd6c51872d650d77f2ea7f2bbf1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
cpp.soVersion is only defined for GCC-like compilers.
Change-Id: I26c12a47534458cf4ed805e6e70b5579f9a15ebb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
| |
It's time. This property was introduced in 1.7.
Change-Id: Ief8ef2b05c12922be3f8b6a82d4de3dfb0068066
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
For example, this allows a Qt profile to be set only for the Qt test
suite, which avoids default profile properties "polluting" the results
of other test suites.
Change-Id: Ie6eb7131a9ce6b90c21b4e33e41f8f32df0e01e8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
This makes debugging with proper symbolication possible on macOS.
Change-Id: Iad28ba3cdc2b33d099e5b80687b17d2335af4e5e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
This influences the version number embedded in platform metadata, such
as CFBundleVersion on macOS. QbsLibrary already does this.
Change-Id: Ie6a41e5f440ef940be333404183adb280581cd31
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
It is a mistake that the NativeBinary item currently pulls in the bundle
module unconditionally (and also that the module is enabled everywhere).
We want to change that. Prepare for the change by removing all
unconditional accesses to the module's properties.
Change-Id: If57b8222c1a0e2b09c33520882446fa71401f1f1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
Also export necessary symbols that they need.
Change-Id: I3023893a3da82cf0d86b0d08df38943db867cf3a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Use that instead of QbsFunctions.qbsVersion() and read it in
qbs_version.pri; this has the advantage that simple text processing
tools can retrieve the project version without having to parse
JavaScript. It's also set from only one place now.
Change-Id: Icfd2a6bf12b794b55c9ba31934a96b4483224eae
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
This makes for much better feedback to the user in case of an outdated
Qt version.
Change-Id: I2223ea35f618ed06a6eb2f01916c1a85cec009cc
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
| |
This more general function was introduced in Qbs 1.6.0, which happens to
be the self-hosted build's minimum Qbs version requirement.
Change-Id: I3b9c2cf7c1cf7c30a966df9011959d89cac05950
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ia649515656a42e1e170aa26e419177d0a34530e6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
It seems natural to use the LTS release as the minimum required version,
and we get rid of a number of #ifdefs.
[ChangeLog] Building qbs now requires Qt 5.6
Change-Id: I327ebb179a20e6372fa5ae765e0f3753fb9e9efa
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
This can help us find subtle problems in that area.
Change-Id: Ie36faeeb11c2faca16809bce12a643edd8658008
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\
| |
| |
| | |
Change-Id: I3056fcaa14715d084938046cda6087c923f3dd84
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The Export of cpp.defines could not possibly have ever worked as triple
equals comparison of a string and array will always be false. Fix that,
and then fix the resultant build errors by avoiding the addition of
the QBS_STATIC_LIB define to an importing dynamic library, and warning
in the case where the same translation unit will be seen with different
visibility settings in different contexts.
This also fixes warnings in generator plugins due to the different
visibility.
Change-Id: Icf91bfd5644c436ddea819cce61b7a4b654c0db4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I4942dca52ff7920ec0363343dc938948833568cc
|
| |
| |
| |
| |
| |
| |
| |
| | |
We should be explicit about where we assume the source files to be. The
base directory might change in the future.
Change-Id: Ia1668169e78ce8334d1807e54acf085756257a2e
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I124b339edf6f3c466e85a361ace9849003e51812
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|/
|
|
|
| |
Change-Id: Icd60d29f5c823f34cf1c3424875b5eaa25ca7904
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
| |
For the qbs build this feature is turned off to be able
to build qbs 1.7 with qbs 1.6.
Task-number: QBS-1002
Change-Id: I983b61c870f8516fb992e2379c5acb86f02dc104
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I09e87843b5df2d7f1f1a7f8fc0558f40ec97fe9a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: I165c3fcb81c396e8733efdc571e486b9732ea4e6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
| |
Now adds Incredibuild files and Windows import libraries, and removes
some unnecessary files which bloat the distribution.
Change-Id: I5ec15b0bc5ae29fa1f6a5ecca314fc083756eb17
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Qt Creator will do the same in order to be able to build plugins that
are not part of the main source tree. This means the qbs build and
install settings can no longer be controlled by properties in a higher-
level project file, but need to come from a module.
Change-Id: I20c0a4538395c8ee838b33f35be84ee59f601f90
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Required for using new functions of QTimer.
Get rid of workarounds and helper functions that support previous
versions.
Change-Id: I13bec075ce3014083120834a402bdc213df10be9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/lib/corelib/jsextensions/environmentextension.cpp
src/lib/corelib/language/scriptengine.h
Change-Id: I77e4626218612656d0963d1bfc643d9f9e7f4edd
|
| |
| |
| |
| |
| | |
Change-Id: I754280c0b8b02c4693be6936b67f458f1a57ba2b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
|
| |
| |
| |
| |
| |
| | |
Task-number: QBS-957
Change-Id: I2b5c8391e9dac90dd513e506548f356abfe9059e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: I4098b281ab9c1f5bc29fe23164dd3a3303759ce0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
|
|/
|
|
|
| |
Change-Id: If4e5825a4e2ae3504ab8121faa1e7a1e92980243
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|\
| |
| |
| | |
Change-Id: I2ff37ef7c00063f738f7691071c4b638dd2dc7c8
|
| |
| |
| |
| |
| |
| |
| |
| | |
While we do support this for compatibility reasons, let's not encourage
it.
Change-Id: I4856b021b2e309e35974af68fe4dc10954d3d451
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|\|
| |
| |
| | |
Change-Id: I79f2638a024a807151a12d1f0b701d6533a3311f
|