| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Archive tries to locate those modules via pkg-config and fails; just
ingore those if docs are not required.
Change-Id: Ia8743810905f5f2e21687286b09d92d34744e327
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Apparently, windeployqt copies all resources into the directory of the
first binary it encounters on the command line. So make sure that binary
is qbs.exe and not one of our plugins, as we want the libs to end up
under bin/.
Change-Id: Ib23f1b355a058ca1deec5e10535c68dc9170a2bf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
| |
Change-Id: I48e8efd18b026e2d8f58e2ae2ddc60b67c9acf68
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Creation of qbs modules for Qt is now done on demand during project
resolving. The qmake executable(s) are looked up via PATH or taken from
the Qt.qmakeFilePaths provider property. As a result, Qt projects can
now be built without a profile.
The qtprofilesetup library is gone; its code is now in the module
provider. I kept the C++ -> JavaScript conversion as straightforward as
possible and mostly resisted the temptation to "optimize".
The setup-qt tool still exists and mainly sets Qt.qmakeFilePaths.
[ChangeLog] It is no longer required to call setup-qt before building Qt
projects.
Change-Id: I5b7e4711ec47b996911c499f29d8129d90e4731e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
| |
The qbs project file must work with older qbs versions, so we can't use
newly introduced properties right away.
This partially reverts d6345df9d5.
Change-Id: I3074aa1460e9f8897820be5b6f70b61636b14be5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
| |
The naming was misleading - prefixes had the same logical meaning as
platformPaths, despite the fact completely different
PathProbe.pathSuffixes property exists.
Change-Id: Ie593b5e03d27de4f8aafed821a3b37cc1b3b0b9e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
| |
The windeployqt output lists translation files that are not actually
copied.
Change-Id: Ic23fbacfdd7cf8f2931da55e0ec33c31e934aa7e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
|
|
|
|
|
|
| |
This is used in the tests.
Change-Id: I9c88c5cc47e4ea9dde88e726fe8dda997656a81f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
...instead of listing each one explicitly.
Change-Id: I14bac3372081b3a73855d78e3585fdfa77105751
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This allows Qt to be installed as part of Qbs by default instead of only
when the archive package is built. Currently, this is enabled by default
only for installations of Qt on macOS which are relocatable (have rpath
in QT_CONFIG).
This way it will not interfere with package managers like
Homebrew/MacPorts which do not use rpath - for example, when building
against a version of Qt installed by a package manager (which is typically
built with absolute sonames), you're assumed to be building software to
be packaged by that package manager, and therefore you want to rely on
Qt as a "system" package and not copy it locally.
It can also be explicitly switched off on the command line using
products.qbsqt.deployQt:false
This also refactors the logic a bit.
Change-Id: I70b46d8fac08d34520ceab18405fa8a672158711
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\
| |
| |
| | |
Change-Id: Iab942ed25d06038cf8c172eb70dcd8e9a720e1c8
|
| |
| |
| |
| |
| | |
Change-Id: If9d17164d623ff389b5b0a6b042f67dc70daf1ae
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Version numbers were not being compared properly, leading 1.10.0 to be
at the bottom of the list below 1.6.0.
Change-Id: I62fcc63c5514ea461c3dadb10c5f17610e107709
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|/
|
|
|
|
|
|
| |
Now that we generate the qbs.qmltypes file during the build, it is no
longer needed.
Change-Id: I3180f55074b291d645abad65437d0cba4c80df25
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
qbs-create-project, the generator plugins, and the man page (on Unix)
will now be added to the archive packages.
Task-number: QBS-1218
Change-Id: Idad9f71ef5c1f91ab1b5b620d95cac0c1b9a85e5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|\
| |
| |
| | |
Change-Id: I962adbe6a7a805e9250807a31e87580a86b1d067
|
| |
| |
| |
| |
| |
| |
| | |
This suppresses advertising messages from showing up in the build log.
Change-Id: I5aa34b061d04d314b0ac6b83fb9c569dafca462d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I5320b7c62d6a80089df75c2caca79c15602c01e5
|
| |
| |
| |
| |
| |
| | |
Change-Id: I0128f3dc7869efb5db2ac3dbb5a5aa140e5e8b98
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Adapt scripts as necessary.
Change-Id: Ib5ad4d1b6bc0e47cb6b4994cfb924efc1c3ebdc4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I1afd65616c4c4d717eb4b376402d60ad52b2cebb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Unlike Windows, we don't use the equivalent deployqt tool here, because
it is designed to work only on application bundles and not loose
collections of executables and libraries.
Change-Id: I6da952a746b162d5c26d6a6642ceb9da6e9ecb14
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|/
|
|
|
|
|
| |
Base it on QbsProduct, which handles some bits automatically.
Change-Id: I280e6b31cddfa8f1551e7282e8d946d70f8fb60b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
The dist product must not be built by default.
Change-Id: I6126c29d3f9a7ea366974526d3b121dab147cdab
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This script is for OUR release process, and doesn't need to be more
general than that especially when wrapping such a small git command.
Also clean it up a bit make it properly exit on error.
Change-Id: I117a01b344f3afe6360e58b2408f352e33dde356
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is maintained by upstream developers and so should just be a part
of the official release process to begin with. This has been tested with
the Docker-based release instructions and provides the additional
security property to Chocolatey users of having an authoritative source
from which to obtain to the .nupkg which can then be installed without
network access to packages.chocolatey.org.
Change-Id: I6d20201451cd3a7f080a81c1dee6b515671e2105
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
|
This prepares for adding products for additional release packages.
Change-Id: I38d8745764ee6044589ff6298b739dde17d573c1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|