| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Building Qbs statically did not work since Qbs 1.17 because the application
target did not correctly track the plugins as a dependency. The condition in
qbs.pro was simply wrong.
Fixes: QBS-1594
Change-Id: Id906423bd0d8d85b7a4f3342df4b9d39f60c4e36
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Allow the project to be build without tests. This is useful, for
example, when uploading the source code to a Launchpad.net PPA: the
builders there are rather slow, and we don't need to build the tests in
order to get a functional package.
Change-Id: I747af77163c9f7379810c89e34dd230249c344a4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
| |
... to 5.14. We need >= 5.12 for a recent QRegularExpression patch, and
5.14 is also what Qt Creator is currently on.
Change-Id: I674e7b617acaed2bf2f668a31f82e800f05ccfc8
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This static library contains the MSBuild and Visual Studio solution
object model classes and serialization code, without any qbs
project model specifics. The latter goes into the generator
plugin itself. The Xcode generator will follow the same separation
of concerns design when it is introduced.
Change-Id: I0a7aca2457c7b7474e0a0a127a3ce5fbec7682f6
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
| |
When building statically, it's important that plugins are built before
the application which is going to use them.
Change-Id: I0e32650b96a2e18c82a884501e7b478f7febc528
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This adds QtScript as a git submodule to build the qbsscriptengine
library.
QtDeclarative support has been stripped out. We don't need that.
Windows CE and Symbian platform support has been removed.
JIT has been disabled, which improves resolve/rule execution by 8%.
[ChangeLog] Bundled QtScript as a submodule.
Task-number: QBS-913
Change-Id: Idfbaf06eb2cef3985e5eae955f231686499f7754
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
|
|
|
|
|
| |
... and remove the workarounds that are no longer needed.
Change-Id: Ie0ae19279633784f8cea3bdbe4a9eeaa308689aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
This guarantees that clients (such as Qt Creator) will always have up
to date information.
Change-Id: I1fe7d8ae8cd6960681f41e78635576cde3f17083
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QBS-1183
Change-Id: I53f1a8f44f5ea727c797a8cf3c37948ac7fc3fea
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
| |
This amends a8df8bc96.
Change-Id: I503799daa0120c2423cb20867c70b5e4b0810374
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
...and fit the generator plugins into this new plugin structure.
Plugins are now handled entirely by the build system in a generic manner
and no part of qbscore (code or build files) has a direct reference to
any plugin regardless of whether qbs is being built as shared or static
libraries.
Change-Id: I4a20546ce275df71083ee22c2cb67f781c4de764
Reviewed-by: Joerg Bornemann <joerg.bornemann@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>
|
|
|
|
|
|
|
|
| |
With this change we don't need a separate Module class in Coin for
Qbs to exclude cross-compilations.
Change-Id: I92e26b668615aeea1cba7fd0ff05d58387c058ee
Reviewed-by: Jake Petroules <jake.petroules@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>
|
|
|
|
|
|
|
| |
This will be used by the upcoming Java output artifact scanner.
Change-Id: I04dd36ee6a6a7913b604bdda73c14879b2854721
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I058eedd2d9dcaad1eaac1f4407f4f698133a774b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Use correct dependencies instead.
Change-Id: I894a5b4f5bb5fe7ed57a18433c14b7fbb8a33e36
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
| |
Change-Id: I1c00a577b8b94c5114138b35da1f7e15ddad3344
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
| |
Otherwise all changes to the implementation will have to be duplicated
in IDEs.
Change-Id: I61e6d4fa1ee9b724eb5d9de9f233dc915a6c8bc3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
It does not scale to repeat the whole contents of the reference manually in
several tables of contents. Instead, make it opaque at the top-level
and use the \group feature to get at least an automatic table of contents
for the lowest level (items and modules at the moment).
Change-Id: I80a3334a43f62481f74c21ad9d68e913c8b3098a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
The contents of share/ is already handled in static.pro for copying to
the build directory, to put the installation stuff there as well.
Change-Id: I285a62ea93a2d2ee9332b4533409ffe4517a781d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
| |
Change-Id: I003f991cb143de6af87a7b9a058cbb41efcbf50e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
| |
The documentation should not be in a single blob. Start the modularizing
effort by putting the item descriptions into dedicated files.
Change-Id: Ie96fc9397a1d32125ff774fe2ed6dde06cb457d6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
|
|
| |
Copy-paste fail!!!
Change-Id: Ifaa2a84325f0da75b61cacfccd099ec8835217c7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: I1721501cbc54580298b42a47b4ca68a11e33ab6c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
| |
The version string is now available as QBS_VERSION define.
It's defined in qbs_version.pri.
Change-Id: I09924334f182ee2349fe1b823d07d38089b84e04
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: Ib525b5ddbd7763dfae6c29770cd9c421807a8ba8
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
| |
The removed files are already referenced in static.pro.
Now they appear only once in Qt Creator's locate widget.
Change-Id: I7c586890a078b7c29be087284e0044561990bbff
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ic16e55acc93a7ee53a1fc55f01f56a11aaef6fca
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: I3c0af98120ae1dce5f39608a6193bec02ca6f1b4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
| |
Change-Id: I2bc576c02ed52d051280072f2726476a5f16e8a9
|
|
Change-Id: I412793e868919a9ac99611616f292e7047f1ebcf
|