summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix missing import in moc.jsv1.5.0Joerg Bornemann2016-05-061-0/+3
| | | | | Change-Id: Iaba0d59741355b70923c24e8f9bc502c3db4856e Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Skip sanity checks by default in release mode.Christian Kandeler2016-05-041-0/+11
| | | | | | | | They can get quite expensive, particular with null builds. Allow to re- enable via environment variable. Change-Id: If8368e14f97223fc0398aa1111711c4d131a2fb4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix wrong assumption about transformer output timestamps.Christian Kandeler2016-05-045-7/+52
| | | | | | | | | | | It is true that all outputs of a transformer get the same timestamp after it has run successfully, but a new output being added afterwards will have no timestamp at all, so we cannot rely on that as part of the up-to-date check. Task-number: QBS-945 Change-Id: I5568ec9854fca46c1ca9fbd5cc95c9b1e3351c05 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add an "importingProduct" variable to the Export item.Christian Kandeler2016-05-037-1/+56
| | | | | | | It was an oversight that we did not have this before. Change-Id: I6347be273273da301ca1ee3e23ff2ddda0a1553a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Enable exceptions in qbs projectOrgad Shaneh2016-05-031-0/+1
| | | | | Change-Id: I754280c0b8b02c4693be6936b67f458f1a57ba2b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix warnings in tst_blackbox::errorInfoJoerg Bornemann2016-05-032-5/+6
| | | | | | | | | Set the name of the product in the test. Otherwise it will be named "project" (because it resides in project.qbs) and confuse us with warnings a la "Unknown property: project.fail1". Change-Id: I03ac4cd12f339637455529979ea3dfc95971fe9f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* cli module: fix compilerFlags additionПетров Сергей2016-05-031-3/+1
| | | | | Change-Id: I9397f3f18edeec23da38a8683b9d0aa8dae60bdc Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* fix imports in tst_blackbox::trackExternalProductChangesJoerg Bornemann2016-05-022-1/+2
| | | | | | Change-Id: Id07656db1318765d2d976ea1bb1a2e750ff11296 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix qmake build with icc on Windows.Christian Kandeler2016-05-024-4/+4
| | | | | | Task-number: QBS-967 Change-Id: I8a0bd11886b4e5b36d6800d0bba58c3edaf63d5f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Skip TestBlackbox::infoPlist outside OS X.Jake Petroules2016-05-021-0/+3
| | | | | Change-Id: I13ea5c51e9dd14781204fed1889fed0df23de731 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix error locationsJoerg Bornemann2016-05-021-6/+24
| | | | | | | | | | Read the content of the Error object, if there is one. Otherwise try to guess the location based on the value we just evaluated. Task-number: QBS-390 Change-Id: If1ac2a08e2d04b529656b3223ee22fe4e8895bee Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Aggregate the cpp module's Info.plist properties with the product's.Jake Petroules2016-05-025-0/+53
| | | | | | | | This was lost in translation by an earlier change. Task-number: QBS-970 Change-Id: Ia1ff38ae2f2ee5be54da05a412a7077b909763f3 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Remove DBus adaptor autotest for invalid input file names.Christian Kandeler2016-05-024-22/+0
| | | | | | | | The kind of file name required to trigger such an error (all dots) causes problems on some Windows hosts. Change-Id: I40012878d9e373da096b9a3ae37fad782be668dd Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Add missing base property to Export itemsJoerg Bornemann2016-04-294-2/+22
| | | | | | | | | In inherited Export items the base property was always empty. It was never properly set up. Change-Id: I8253357e550f9ff0f4d328d03794b0de620b788c Task-number: QBS-968 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix DBus autotest.Christian Kandeler2016-04-292-2/+3
| | | | | | | | The one that is supposed to fail needs a required dependency to the dbus module. Change-Id: I8a01f984598fad2529e832ae8cdf25772b96965a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix DBus adaptor/interface support.Christian Kandeler2016-04-298-5/+35
| | | | | | | | | It's not the base name of the qdbusxml2cpp input file that is used for the output, but, naturally, the lower-cased second-to-last part of the file extension. Change-Id: Ib6fbd8c20f4e50ea1a641a2ee6a15acec710748c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Document the relevant file tags of the Qt modules.Christian Kandeler2016-04-291-33/+157
| | | | | | | Task-number: QBS-934 Change-Id: I57292a883b9b8ea33239a3176bffad4dcd390d85 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Document the file tags of the java module.Christian Kandeler2016-04-281-0/+28
| | | | | | Task-number: QBS-934 Change-Id: I901b8bc1f6c15a373e3d998c785691db3303cc35 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix DBUS module on Windows.Christian Kandeler2016-04-271-2/+7
| | | | | | | | | The qdbusxml2cpp tool fails silently when the header file it should create has an absolute path. So use just the file name and set the working directory accordingly to appease this clever tool. Change-Id: Ifae56341c41e22b90fd49fe33efe8430a8911ab8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* DBus module: Add support for the qdbusxml2cpp tool.Christian Kandeler2016-04-2718-0/+771
| | | | | | | | This brings feature parity with qmake regarding the (undocumented) DBUS_ADAPTORS and DBUS_INTERFACES variables. Change-Id: I6c7a2278308e5eb44b4582f33615100def21d84c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix check whether a module is required.Christian Kandeler2016-04-276-11/+81
| | | | | | | | | | The "required" property in the current Depends item is not the only relevant one. We must also check this property in all higher-level Depends items. The module is only required if all of them are true. Task-number: QBS-965 Change-Id: Ie69a9accb8492b2a049df24794f54bb122b01a9e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Don't print useless error message about file read failures.Jake Petroules2016-04-271-4/+8
| | | | | Change-Id: Ib396add0795a431e2a470bd94dbe7f458e3730c3 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix use of qdoc with unrecognized file types.Jake Petroules2016-04-262-6/+15
| | | | | | | Also, improve the error message when this happens. Change-Id: If7a398e7dec83a8697e231df39392d6c2d904674 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* PkgConfigProbe: output modversionAndrew Knight2016-04-251-3/+7
| | | | | | | | | This is a commonly-used feature of pkg-config, and a lacking feature of the PkgConfigProbe item. Change-Id: I66078602aa441eb2410029f2f2624b30bce97249 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* MSVC: Fix warning about unused variableKai Koehne2016-04-221-1/+1
| | | | | Change-Id: I44e1555d4d849007df6fd3324794d9645d06074f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix default value of xcode.sdk and _sdkSettings.Jake Petroules2016-04-221-3/+6
| | | | | | | | | | | These were missed in e3bec3eb5f89c366f97ce376b3b9c953f9c71ff9 and revealed QBS-965. Backported from 9b97df88e3da322194d7ca1536b4c6d44f625927 and 62c880e7c52a55651d5cc67ffcf35b3cf8745533 in master. Change-Id: I2e94f9bdb0640ba5f791d4c3e47730f980b7a4e8 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Use native separators in error message.Christian Kandeler2016-04-211-3/+4
| | | | | Change-Id: I8f61eb9d85adab76a9f9e14e6584eb0ffecf3188 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Show proper error message for conflicting artifacts.Christian Kandeler2016-04-215-16/+51
| | | | | | | | | This is not an internal error, but can be triggered by users. Also fix the check to take all products into account and run it in release mode too. Change-Id: Ie7b1826cfa87254a114c3091a654886ea8d19b0f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add a code location to deprecation warnings.Christian Kandeler2016-04-212-9/+26
| | | | | | | | To be more helpful to users. Task-number: QBS-963 Change-Id: Ib29c088688b7e365c14a8f7925efe5a5b4e31b26 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix case of both required and non-required dependencies to a module.Christian Kandeler2016-04-2011-27/+111
| | | | | | | | | | When we have multiple dependencies to the same module, with some Depends items setting "required" to false and others setting it to true, then the final (merged) module dependency must be required. Task-number: QBS-965 Change-Id: I05183d99a2c0821ad1074f38c2f3a5d5e02faaba Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Also show inputs from dependencies when printing a rule.Christian Kandeler2016-04-201-1/+3
| | | | | Change-Id: Id498593646784bbb8eb568db2788407d223fb88c Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* 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>
* Do not use the JavaScript print() function.Jake Petroules2016-04-155-9/+9
| | | | | | | | It is known to unpredictably print to stdout vs stderr on some systems, leading to false negatives in auto tests. Change-Id: I1192110f3ddf8329c0de6da6711a2aee3729c7b2 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Don't restrict Product.version to numeric version numbers.Jake Petroules2016-04-152-5/+15
| | | | | | | | This permits using versions like "A" or "B", which are common for dynamic libraries on Apple platforms. Change-Id: I48e50df619e2599ca6215c9453c68f544cb66d16 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Remove documentation for code signing properties in the Xcode module.Jake Petroules2016-04-152-52/+1
| | | | | | | This feature is not ready for the 1.5 release; it will be in 1.6. Change-Id: I5dfdbdc9abd0931f3b10a835995d947c429a626b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix sevenZip autotest.Jake Petroules2016-04-151-4/+2
| | | | | | | | | More recent versions have changed the output format, and the "test" action no longer prints individual "testing <filename>" lines, while the "list" action still provides near identical output. Change-Id: I29665c44c5cdbf1a1dab881f6c09112cd7dd9a01 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix stripping after extracting debug symbols.Jake Petroules2016-04-151-11/+12
| | | | | | | The dsymutil+strip / objcopy approach used here is the common one. Change-Id: Icf3050c2ff201e1f0358bc028686505cbd50db12 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix enableRtti test with GCC.Jake Petroules2016-04-151-4/+11
| | | | | | | | GCC is stricter than Clang/MSVC and fails to compile certain provably meaningless constructs like dynamic_casts that will never succeed. Change-Id: I5e1a5c965395f218c4dd6340b761c308fe41282f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Work around QtScript bug.Christian Kandeler2016-04-144-7/+11
| | | | | | | | That library has problems applying higher-order functions with MSVC/64 bit. Change-Id: Ib84d4ed3abd13371385079e1f990df6fad92f4ae Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix errorInfo autotest on Windows.Jake Petroules2016-04-141-7/+7
| | | | | Change-Id: Ifec00caada76cdca3f46629d241aca9a0561ef8f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix enableExceptions autotest on Linux.Jake Petroules2016-04-141-1/+6
| | | | | Change-Id: I0eba2708bed20eeb2e812bd215f636e4a68af78d Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Move enableRtti property from Android.ndk to cpp module.Jake Petroules2016-04-1410-16/+77
| | | | | | | This is in no way Android-specific. Change-Id: I636cc44827b1c64815c0197fc724ede8abe949f8 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix handling of flat dSYM output and greatly expand test coverage.Jake Petroules2016-04-145-17/+150
| | | | | | | | | | | | | | If flat dSYM output was requested, the generated dwarf files would be placed next to the associated executable or bundle wrapper with a .dSYM extension appended. Now, the dwarf files will be placed next to the associated executable (which itself might be within a bundle) with a .dwarf extension. This follows the default behavior of dsymutil when no output file is explicitly specified. Change-Id: Iba71d4fe43b7415d33a244728ed8bce515270583 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Display proper file paths and line numbers for errors in more places.Jake Petroules2016-04-1415-22/+214
| | | | | | | | | Rule.outputArtifacts, Rule.prepare, and Artifact.filePath will now display the correct file paths and line numbers for errors thrown from those locations (including in imported JavaScript files). Change-Id: I4e3c8e60f30791f5aa4de9e3813d4890c46c09fb Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Implement properties to control use of exception handling.Jake Petroules2016-04-1419-14/+157
| | | | | | Task-number: QBS-387 Change-Id: Ia3d8bfe30b0362f1e7b6892cba32ddfb569bdbc4 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* DRY up some simple code in GenericGCC.Jake Petroules2016-04-142-53/+24
| | | | | Change-Id: Ib2e9cb84421dcc518822c0cffc5f05b50d603580 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Restore original behavior of PathProbe fileName/path properties.Jake Petroules2016-04-146-2/+54
| | | | | | | | | This is a regression caused by ea470c74e4e62831f45faaa898dac8cb06da899b. Add autotests to verify. Task-number: QBS-948 Change-Id: I012312de60e9d64107f5621a7fd87acab98190e8 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Respect Probe conditions.Christian Kandeler2016-04-145-5/+51
| | | | | | | | Apparently, we've never tested the conditions of Probe items, so the configure script was always run. Change-Id: I7e4bff6843de8a1f8eae35dd54282ab4de2a5cee Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix performance regression in bundle module for non-Darwin targets.Christian Kandeler2016-04-141-0/+5
| | | | | | | | The Probe and the validate script only need to be run for the platforms that actually support bundles. Change-Id: Ib56eb28c8b036d52d97c85345547060bb470d67b Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* Add a validate script to the bundle module.Jake Petroules2016-04-138-169/+1394
| | | | | | | | | | | Also, adjust autotests to be more flexible. Some product types (for example, application extensions) may not exist in older versions of Xcode. This fixes the bundleStructure autotest. Change-Id: I2e73cd65f50f44017780001e9e0d5fb184edba31 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
View Lorry Controller Status