aboutsummaryrefslogtreecommitdiffstats
path: root/share/share.qbs
Commit message (Collapse)AuthorAgeFilesLines
* Introduce module providersChristian Kandeler2019-01-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | If a dependency is not found, we now search for a matching module provider that can generate one for us. We also provide a generic fall-back provider which uses pkg-config to locate the dependency (but could be extended to incorporate other methods in the future). This is the most important part of this change for practical purposes, as it makes hundreds of popular libraries available for use in qbs projects without users having to write any boilerplate code. In a future patch, a module provider could also be used to implement the functionality of the qtprofilesetup library, relieving users of the need to create a profile for building Qt applications. [ChangeLog] The Depends item now falls back to pkg-config to locate dependencies whose names do not correspond to a qbs module. Fixes: QBS-1107 Change-Id: Ifd4f05c237cf58cd9fe707c3da648d3dbb33e82b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove support for in-build-dir-execution of the qbs qbs buildJoerg Bornemann2018-07-121-27/+4
| | | | | | | | | | 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>
* Split modules and imports into two different groupsJake Petroules2017-12-141-2/+11
| | | | | | | | | | This is not only slightly more organized but also fixes `make check` with in-source qmake builds as a side effect, because the automatically generated files in share/qbs/python and share/qbs/qml-type-descriptions will not get picked up again as source files. Change-Id: Ia9049a4ccb018d2be052611edf42484b9aaaafb7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Allow fully overriding the QML type info build and install pathsJake Petroules2017-11-021-2/+0
| | | | | | | Amends 6cb626668a Change-Id: I876f4b72a5d6ee20721b3746861f615e750c9be1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Automatically generate the QML type descriptions as part of the buildJake Petroules2017-11-011-1/+80
| | | | | | | | 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>
* Fix installation of Python-related resourcesJake Petroules2017-06-091-1/+2
| | | | | | | They should also be copied for non-installed builds. Change-Id: Ic90af9990506e942ddab969ea0b7f38594d87622 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add some third party Python modules for use in dmg moduleJake Petroules2017-05-291-3/+23
| | | | | | | | | | They are all MIT or BSD 3-clause licensed. They will be used in a followup commit in order to aid in the creation of DMG files on macOS. Change-Id: Icdca2bc8604ee058ea807e9570a3ac9fb6d903d9 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Generate a proper install tree for the dist target.Jake Petroules2016-06-161-0/+10
| | | | | | | | 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>
* qbs build: Move build config properties into a dedicated module.Christian Kandeler2016-06-071-3/+5
| | | | | | | | | | 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>
* qbs build: Don't use directories as input artifacts.Christian Kandeler2015-05-071-6/+16
| | | | | | | | This is not officially supported and is no longer necessary with qbs.installSourceBase. Change-Id: I7eb0567192a608f583daaa49dee5e5d361770101 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix typo in share.qbs.Christian Kandeler2014-07-161-1/+1
| | | | | Change-Id: I95a93d0fa27dc68d8a3d1efbcb4563ee6fa8b72f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix qbs build of API autotest.Christian Kandeler2014-07-161-1/+1
| | | | | | | | The "share" directory was no longer being found due to the recent semantic change for product.buildDirectory. Change-Id: I89eee64aa18510fe592765e32a99784f0659d400 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* deprecate Artifact.fileName in favor of Artifact.filePathJoerg Bornemann2014-07-161-1/+1
| | | | | | | | This property is actually a file path, not a mere name. Task-number: QBS-579 Change-Id: I04e8f03eac97b5f86fe743a4923888a3d2a82c5d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix deprecation warning in qbs project filesJoerg Bornemann2014-03-061-1/+1
| | | | | Change-Id: Ie8f639550fa4509fbec70092fabfaf44342546f2 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Install examples.Christian Kandeler2013-10-301-0/+6
| | | | | Change-Id: I5c27ee33bf022784da88dbfc55045621be78c68c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make built-in JavaScript extensions available on demand.Christian Kandeler2013-07-031-0/+1
| | | | | | | | | | | | This entails the following: - Project files can get access to built-in extensions in all contexts via import statements such as "import qbs.TextFile". - In turn, the automatic injection of these extensions in rules and probes no longer happens, i.e. one always has to explicitly import the required extension. Change-Id: Ib1e42c078354c564e417f80dd47897c7f41e7569 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make the qbs project files embeddable in another project.Christian Kandeler2013-07-031-2/+2
| | | | | | | The qmake project files already have this ability. Change-Id: I9d01609525b410a7cf0bb86865aa85c5435bad03 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Prepare qbs project files for selective inclusion.Christian Kandeler2013-07-021-0/+24
Namely: - Move product "share" into its own file. - Move version number definition into its own file. This will make it easier to pull in only parts of the sources in an aggregating project (e.g. an IDE that does not need the executables). Change-Id: I41b724fe8a0b20d957b924fe0a827263add43dce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>