aboutsummaryrefslogtreecommitdiffstats
path: root/qbs-resources
Commit message (Collapse)AuthorAgeFilesLines
* Make "bin" the libexec path on WindowsChristian Kandeler2017-05-301-1/+2
| | | | | | | | Otherwise, our binary distributions will not work out of the box, as the process launcher is not in the same place as the libraries. Change-Id: Ied375fa48e5c2cb037d3cb2108296126ee3be4cc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Version bumpChristian Kandeler2017-05-241-1/+1
| | | | | Change-Id: I80c5c219cb7399f8cffb17ac793e0e3a170346a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make the documentation embeddable in other projectsChristian Kandeler2017-03-101-0/+3
| | | | | | | | This is for the qbs build. We've already done it for qmake. Task-number: QTCREATORBUG-13124 Change-Id: I14ffd9d5184cef8378da377190107ff4496a815a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Bump required Qt version to 5.6Christian Kandeler2017-02-271-1/+1
| | | | | | | | | | | 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>
* Enable QT_STRICT_ITERATORS in debug modeChristian Kandeler2017-01-161-0/+2
| | | | | | | This can help us find subtle problems in that area. Change-Id: Ie36faeeb11c2faca16809bce12a643edd8658008 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge 1.7 into masterChristian Kandeler2016-12-091-2/+3
|\ | | | | | | Change-Id: I3056fcaa14715d084938046cda6087c923f3dd84
| * Fix propagation of defines to dependencies from QbsLibraryJake Petroules2016-12-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge 1.7 into masterChristian Kandeler2016-11-262-3/+5
|\| | | | | | | Change-Id: I4942dca52ff7920ec0363343dc938948833568cc
| * qbs build: Don't use relative paths in product parent itemsChristian Kandeler2016-11-232-2/+4
| | | | | | | | | | | | | | | | 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>
| * qbs build: Use correct module name "Qt.testlib" instead of "Qt.test"Christian Kandeler2016-11-181-1/+1
| | | | | | | | | | Change-Id: I124b339edf6f3c466e85a361ace9849003e51812 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Version bumpChristian Kandeler2016-11-111-1/+1
|/ | | | | Change-Id: Icd60d29f5c823f34cf1c3424875b5eaa25ca7904 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Append minor version number to soname of all qbs libsJoerg Bornemann2016-11-031-0/+2
| | | | | | | | | 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>
* Don't install static library productsJake Petroules2016-09-082-2/+3
| | | | | Change-Id: I09e87843b5df2d7f1f1a7f8fc0558f40ec97fe9a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Version bumpChristian Kandeler2016-08-011-1/+1
| | | | | Change-Id: I165c3fcb81c396e8733efdc571e486b9732ea4e6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge 1.5 into 1.6Jake Petroules2016-06-281-1/+1
|\ | | | | | | Change-Id: If1a2c368170d89d5e6e11b08a32b37901d51eb1d
| * Bump version to 1.5.2.Christian Kandeler2016-06-091-1/+1
| | | | | | | | | | Change-Id: I93af50141a6180fb6663f5ee5d1463f57a56bd9e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Version bump to 1.5.1.Christian Kandeler2016-05-111-1/+1
| | | | | | | | | | Change-Id: I5a42c678d17951c7da12a88683bbd32fb2ed5f4f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Generate a proper install tree for the dist target.Jake Petroules2016-06-162-0/+7
| | | | | | | | | | | | | | | | 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-075-4/+33
| | | | | | | | | | | | | | | | | | | | 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>
* | Bump required Qt version to 5.4.0Orgad Shaneh2016-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/1.5'Joerg Bornemann2016-05-031-1/+7
|\| | | | | | | | | | | | | | | Conflicts: src/lib/corelib/jsextensions/environmentextension.cpp src/lib/corelib/language/scriptengine.h Change-Id: I77e4626218612656d0963d1bfc643d9f9e7f4edd
| * Enable exceptions in qbs projectOrgad Shaneh2016-05-031-0/+1
| | | | | | | | | | Change-Id: I754280c0b8b02c4693be6936b67f458f1a57ba2b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * Disable "insecure" warnings on qbs build with MSVCOrgad Shaneh2016-04-191-1/+6
| | | | | | | | | | | | Task-number: QBS-957 Change-Id: I2b5c8391e9dac90dd513e506548f356abfe9059e Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Remove items scheduled for removal in 1.6.Jake Petroules2016-04-221-1/+1
| | | | | | | | | | Change-Id: I4098b281ab9c1f5bc29fe23164dd3a3303759ce0 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Version bump.Christian Kandeler2016-04-181-1/+1
|/ | | | | Change-Id: If4e5825a4e2ae3504ab8121faa1e7a1e92980243 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge branch 1.4 into master.Christian Kandeler2015-07-311-1/+1
|\ | | | | | | Change-Id: I2ff37ef7c00063f738f7691071c4b638dd2dc7c8
| * Don't advertise using relative paths in export items.Christian Kandeler2015-07-281-1/+1
| | | | | | | | | | | | | | | | While we do support this for compatibility reasons, let's not encourage it. Change-Id: I4856b021b2e309e35974af68fe4dc10954d3d451 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge branch 1.4 into master.Christian Kandeler2015-07-241-1/+1
|\| | | | | | | Change-Id: I79f2638a024a807151a12d1f0b701d6533a3311f
| * Define QT_NO_PROCESS_COMBINED_ARGUMENT_START.Jake Petroules2015-07-221-1/+1
| | | | | | | | | | | | | | | | This will be present in Qt 5.6, and prevents use of dangerous overloads of QProcess::start. Change-Id: Ibd58091bcae1f326ab62ad14deef7a99138cdc6b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * Version bump to 1.4.2.Christian Kandeler2015-07-151-1/+1
| | | | | | | | | | Change-Id: I865b23f2fa70131a89817d0476bcb43fa18fb726 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Version bump to 1.4.1.Christian Kandeler2015-04-241-1/+1
| | | | | | | | | | Change-Id: I3ade2895beb5a0dab87c91c82131c460feb8b817 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Bump version to 1.5.0.Christian Kandeler2015-04-241-1/+1
|/ | | | | Change-Id: I6a0b087d4fd16054e64b7355abff5c11848c3eab Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Prevent automatic casting from char* to QString.Christian Kandeler2015-04-231-0/+1
| | | | | | | | | | Reason 1: Internationalization. Reason 2: Performance issues due to inadvertant QString instantiations in hot code paths. Task-number: QBS-780 Change-Id: I37c740dd828e11c5b0000a0dd472a519d032d71c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Refactor bundle (CFBundle) support across all of Qbs.Jake Petroules2015-01-132-0/+3
| | | | | | | | | | | | | | | This is the foundation for better bundle support, including static frameworks, loadable modules ("bundles" i.e. plugins), and custom bundle types. This also simplifies the difference between bundle and non-bundle product types from a Qbs user's perspective, and allows more fine-grained control over the construction of and use of bundles. This patch also implicitly adds support for static frameworks. Task-number: QBS-643 Task-number: QBS-642 Change-Id: I65d8d7040603a6ea0ff2c11360234eba6802ad35 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Enable C++11.Christian Kandeler2014-12-183-0/+3
| | | | | Change-Id: I8b0513e59c259d0535c6d0299ed64f531ae977c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add AutotestRunner for qbs project.Christian Kandeler2014-12-181-1/+1
| | | | | Change-Id: I604503fe0fe2d422fa6beeb788482f47a6a1b947 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qbs build: Set minimum Qt version.Christian Kandeler2014-10-311-0/+3
| | | | | Change-Id: I4cd893b63d58b22001a1728a9adca78db005f8c7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qbs build: Introduce convenience item QbsProduct.Christian Kandeler2014-10-305-0/+97
As base product for QbsApp, QbsLibrary etc. Has little functionality at the moment, but will get more soon. Change-Id: I29ac78db2ff1ba109dd09a55e7593b2beeaba741 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>