aboutsummaryrefslogtreecommitdiffstats
path: root/static.pro
Commit message (Collapse)AuthorAgeFilesLines
* Introduce module providersChristian Kandeler2019-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* qmake build: Do not install attribution.json filesChristian Kandeler2018-11-141-1/+2
| | | | | | Fixes: QBS-1315 Change-Id: I211faf975da584c054a7501fb661763f400a8d21 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix in-source qmake buildsJake Petroules2017-12-121-22/+20
| | | | | | | | This is primarily relevant for macOS, where the dmgbuild script and Python modules must be present for certain features to work. Change-Id: I57e36d9deed2c6d810e77075cce8364678facc09 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix deployment of dmgbuildJake Petroules2017-09-071-1/+4
| | | | | | | | | Specifically, this fixes use of the module within Qt Creator. It happened to go unnoticed with the command line version of Qbs. Task-number: QBS-1182 Change-Id: I449099c1063595612dac621c735050c46ff866e5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix installation of Python-related resourcesJake Petroules2017-06-091-1/+34
| | | | | | | 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-1/+8
| | | | | | | | | | 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>
* remove overquoting in copy commandOswald Buddenhagen2016-06-221-2/+1
| | | | | | | | | qmake is supposed to sufficiently quote the expandos, so manual quoting would in fact break with files with spaces. Change-Id: I381a09215af35b4849630b1084c641655e995e78 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* remove unnecessary path normalizationOswald Buddenhagen2016-05-191-1/+0
| | | | | | | | qt5 always normalizes $$files()' return value Change-Id: I06ae7bde595ae82e2ca2a25ec3269fbb877c9ae1 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* nuke unused cleanPath() functionOswald Buddenhagen2016-05-191-13/+0
| | | | | | Change-Id: I6589e7ebeef2dd90ae4cd82d478a8c6efc533911 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* use TEMPLATE = aux instead of bizarre phony target hackOswald Buddenhagen2016-05-191-24/+2
| | | | | | | | | we don't support building with VS or Xcode anyway. qt creator did the same move recently. Change-Id: Iabfbe713be5954f167f0a8a4c431bd9e935c7e20 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* fix default value of QBS_INSTALL_PREFIXJoerg Bornemann2015-05-051-0/+2
| | | | | | | | Do not install to / by default but to /usr/local. Change-Id: Ib8fc6d5410fa0d8363a6098dba5c8488279118de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* remove more Qt4 legacy from project filesJoerg Bornemann2014-10-311-14/+0
| | | | | | | This amends commit 7c82e9f3. Change-Id: Ie01db1f28856fa16edee67aaf033c7150ecb197c Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Install examples.Christian Kandeler2013-10-301-1/+3
| | | | | Change-Id: I5c27ee33bf022784da88dbfc55045621be78c68c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make phony_target hack work on mac even with qt 5.1Kai Koehne2013-05-231-1/+1
| | | | | | | | | See also change a4e593c910 in qt-creator. Change-Id: Ib41c68b9eaa7f844b624179efd24ca5ff31d3ebe Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix in-source builds of projects incorporating qbs as a subproject.Christian Kandeler2013-04-181-1/+1
| | | | | | | | If qbs is part of a larger project, we may need to copy files around even for an in-source build. Change-Id: I9e1cb70a2f7a1ae51539a2724512d9fb5f35094a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Allow fine-grained tuning of installation.Christian Kandeler2013-03-131-2/+9
| | | | | | | | | | - Potentially different prefixes for libs and plugins/modules. - Make it possible to disable installation of development files (headers, qbscore.lib on Windows). Change-Id: Ia153d17835f9f1b8d802b23c3689a2f72f656e50 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove share.pri.Christian Kandeler2013-03-121-0/+4
| | | | | | | | 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>
* properly fix DATA_FILES definitionOswald Buddenhagen2013-03-121-5/+1
| | | | | | Change-Id: Icc13f0811af9dccbcfd795bd31d31e08c3da0d55 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix compile with Qt5 on WindowsChristian Stenger2013-03-081-1/+5
| | | | | Change-Id: I9c75cb17ab96b0ccc2f7232586bb6f31bb41b935 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix shadow build with Qt 5.Christian Kandeler2013-01-141-1/+7
| | | | | | | | qmake code copied over from Qt Creator. Change-Id: Ib2100a5dd3a85d7e7b96daac41be4c98bb5d82cb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Display static files in tree for in-source buildOrgad Shaneh2012-10-151-8/+9
| | | | | Change-Id: I330cf58b13819899285f72eb62a3fc034ba50476 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Long live qbs!Joerg Bornemann2012-02-151-0/+70
Change-Id: I412793e868919a9ac99611616f292e7047f1ebcf
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 16:36:49 +0000