aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/api/testdata
Commit message (Collapse)AuthorAgeFilesLines
* Invalidate project after certain unsuccessful re-resolving attempts.Christian Kandeler2014-07-303-0/+24
| | | | | | | Namely, if the build data has been mangled by the re-resolving attempt. Change-Id: Ibe020a6bda38a335f95e2d2cef4f37fac3199a7d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* API: Be smarter about adding files already matched by wildcards.Christian Kandeler2014-07-232-0/+8
| | | | | | | | | | | The project file does not need an update in this case. Actually, that would even lead to an error on the next project resolving, as the file would then be listed twice (once explicitly and once matched by a pattern). Task-number: QBS-653 Change-Id: If56969c36d1bba3f9194621690c2e1f25229ee9e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add missing metatype registration.Christian Kandeler2014-07-161-0/+4
| | | | | | | | The code path where this is relevant has apparently never been taken, so add an autotest as well (and fix the wording of the error message). Change-Id: I314f1cb888264d30920a58f4e9cbbbf01fbcc4e6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* deprecate Artifact.fileName in favor of Artifact.filePathJoerg Bornemann2014-07-163-3/+3
| | | | | | | | 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>
* Put a system-wide lock on the build directory.Joerg Bornemann2014-07-161-0/+4
| | | | | | | | | | | | | So that two qbs instances can't overwrite each other's build graphs. In practice, this is probably most relevant for IDEs, as these hold a build graph for potentially long periods of time. Facilitates QLockFile that was introduced in Qt 5.1. For older Qt versions, no locking happens. Task-number: QBS-162 Change-Id: Ib598617fb1742eb57b6a017f40b9631d1d54e627 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add and make use of convenience item QtGuiApplication.Christian Kandeler2014-07-141-2/+1
| | | | | | | | | | Using this item, building a Qt gui app against a static Qt will work out of the box. Also add the less useful QtApplication for completeness. Change-Id: Idca1dbd3085659ebaf563f7df89f73b9daaf7001 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make it possible to set profiles per product.Christian Kandeler2014-07-023-0/+44
| | | | | | | | | | | Use case 1: Build product A for architecture X and product B for architecture Y (e.g. host tools vs target libraries). Use case 2: Build product A for architectures X and Y and product B only for architecture X (e.g. Android multi-arch packages). Change-Id: I2eb721c37cdd12c298ee12bad60e21e94b04676b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Properly treat "usings" as inputs when applying rules.Christian Kandeler2014-06-022-5/+0
| | | | | | | | | This allows non-multiplex rules with only "usings" and no "inputs" to work as expected, that is they create one transformer per "usings" element. Change-Id: Iba5144f81b082043878f3eefc111846b6d05646a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix "Add Files" functionality.Christian Kandeler2014-06-021-0/+7
| | | | | | | | This was broken for the case of a product with no existing binding, even accessing a null pointer. This is also covered by the autotest now. Change-Id: I088dbac08627b08f903dbe77bd824997592adb09 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/1.2'Joerg Bornemann2014-04-282-1/+12
|\ | | | | | | | | | | | | | | | | Conflicts: qbs_version.pri share/qbs/modules/cpp/msvc.js version.js Change-Id: Id00deaf66737efd0e35230e2bddd41de1a6de60d
| * Prevent user code from hanging qbs during resolving.Christian Kandeler2014-04-161-0/+5
| | | | | | | | | | | | | | | | | | Long-running commands are handled already, but badly written project files could still hang qbs with e.g. infinite JS loops on the right hand side of a binding. Such code can now also be interrupted. Change-Id: Ie0d114bd37d540e764d5ec5bb323c91bfd64a67a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Fix "inifiniteLoop" test for Qt 4.Christian Kandeler2014-04-151-1/+7
| | | | | | | | | | | | | | QThread::sleep() is protected there. Change-Id: If7b6dbabd594c0a0eaf4ea2b7c691c7e9c00c55a Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Expose in the API whether a product can be run.Christian Kandeler2014-04-221-0/+10
|/ | | | | | | | The list of target artifacts is typically not yet available after resolving, but we already know the product type. Change-Id: I8bf98901b4123197b8d8b9ac4a4b351f251ee987 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make "infinite-loop" test app not actually run infinitely.v1.2.0Christian Kandeler2014-04-142-2/+4
| | | | | | | Otherwise, a failing test will leave a CPU-burning process behind. Change-Id: Ie9cb2e608f0cb3f1e1ad7491948666f8ac6fc87c Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Add (failing) autotest for QBS-552.Christian Kandeler2014-04-114-0/+57
| | | | | Change-Id: Idea84b324ddccc62721ff0025ffb85c55dd82a80 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add XFAIL autotest for QBS-537.Christian Kandeler2014-03-244-0/+6
| | | | | Change-Id: I98aa65cee4e448efa6b9ab32f2165e4cc77429ec Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Do not match files in build directories as source files.Christian Kandeler2014-01-274-0/+5
| | | | | | | | This can currently happen if the user builds in the source dir and uses recursive wildcards. Change-Id: I5f3be03313640af046478ca55a381f14605176d4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Allow directories in "references" properties.Christian Kandeler2013-12-059-0/+18
| | | | | | | | | | | Such a construct will work if the given directory contains exactly one project file, identified by the ".qbs" extension. This saves annoying redundancies of the form "references: 'mysubproject/mysubproject.qbs'". Change-Id: Ief0f52f788189b7fb2e4764b692159b570fe444c Task-number: QBS-454 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* API: Allow adding files to a group with a directory prefix.Christian Kandeler2013-11-212-0/+10
| | | | | | | This case is not problematic. Change-Id: I388df6180b231364a8e185eb85aee5adff417965 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add API for adding groups and files.Christian Kandeler2013-11-2011-0/+21
| | | | | | | This is a necessary feature for proper IDE support. Change-Id: I296beb5beae514f70babf3da1b5544726e9df82e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add failing autotests for bugs.Christian Kandeler2013-10-292-0/+6
| | | | | Change-Id: I217eac496994fdddf6a4577bddd79f3d76bba450 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add failing autotest for QBS-424.Christian Kandeler2013-10-233-0/+22
| | | | | Change-Id: I6a1194981bf6f679ac931a9871281c4866f3bd20 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add missing data for test case.Christian Kandeler2013-08-262-0/+11
Should have been part of 9f2e842af96885b6d358d32340a212790cf5cfd5. Change-Id: Ic73f1f91124f1139a13e656d677b07f842ca6afc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>