summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ***egon-via-depsegon-via-depsJoerg Bornemann2015-07-317-2/+110
| | | | Change-Id: I54fa3e5b369a071435968c4a2b96763deb3ef944
* Fix importing a collection of JavaScript files.Christian Kandeler2015-07-318-26/+65
| | | | | | | | The old implementation only made the contents of a single file in the directory available (namely the last one it happened to read). Change-Id: Ib88cb738bef161bd1c2c5ad842cf7ff33ca171b6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Reset more script engine state in Loader.Christian Kandeler2015-07-311-0/+2
| | | | | Change-Id: I3d16bb9aa8b742fa37281f66ba19fc1bad5d8147 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Separate Android profile name components with '-' instead of '_'.Jake Petroules2015-07-303-3/+3
| | | | | | | | | This is more consistent with the rest of qbs and as a helpful side effect, encourages Android profiles to be re-created since their generation was recently completely overhauled. Change-Id: I1041584eb197b39d9ca3634687ea86d2fb95a2d5 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* De-friend ItemReaderASTVisitor from FileContext.Christian Kandeler2015-07-305-24/+25
| | | | | Change-Id: I6b0397b1a8952bf6f48319c3c5d41344f12fc6ea Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix compile errors causes by header cleanup.Christian Kandeler2015-07-304-0/+7
| | | | | Change-Id: I9f7bea17b70466b1e84721f3a03f723b8f3b5cae Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Code clean-up in corelib/language/.Christian Kandeler2015-07-3048-323/+170
| | | | | | | | | | | - Remove unneeded #includes (particularly from header files). - Make inline member function implementations less verbose. - De-QObjectify the Loader class and remove unneeded members & heap allocations. - Minor stuff (const issues, unneeded namespace qualifications). Change-Id: I55f2d7ed98b32faed7582bc6adfa04eb799de874 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Fix default values of wix module properties.Jake Petroules2015-07-302-3/+4
| | | | | | Task-number: QBS-832 Change-Id: I7b2df4ba78ac3b8417b2e0338b909641915fabf2 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* MSVC probe: support all architectures.Jake Petroules2015-07-293-4/+29
| | | | | Change-Id: I2331492e2fdb19560e5bef7b23d479a636b2be0c Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* MSVC: make the assembler name readable from the property binding.Jake Petroules2015-07-291-16/+14
| | | | | Change-Id: Id6775dbcc5a02678077ad0cab7e07c68ed000fc6 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Remove pointless parameter from Item::clone().Christian Kandeler2015-07-295-7/+7
| | | | | Change-Id: I49ba3b789858c76f4f11ba4169fa6712f9df8d4a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix evaluation of "product" in list properties.Christian Kandeler2015-07-294-3/+20
| | | | | | | | When collecting list values, the one from the module prototype had no scope, so "product" and "project" were not available. Change-Id: If07ac0ebe68726dc3936a7d0b3a7629d4b41abd6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Move copyProperty() to the Item class.Christian Kandeler2015-07-294-11/+10
| | | | | | | This is needed by a follow-up patch. It also seems sensible in general. Change-Id: If3604ecf83564c9439faec88d7134f3e5efed113 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Move setupItemForBuiltinDeclarations() to Item class.Christian Kandeler2015-07-298-50/+47
| | | | | | | | That's the correct place for this function. Lets us get rid of a friend declaration as well. Change-Id: I5769bb8fafde21258155bdde587044703b44a02d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add the android.nativelibrary file tag for application libraries.Jake Petroules2015-07-291-1/+1
| | | | | | | This was done for Library.qbs but missed from this file. Change-Id: Ia0f382fd8874dea0da21a9aa30dd431e37c1a73b Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* Introduce the TemporaryDir JS extension.Jake Petroules2015-07-289-0/+249
| | | | | | | Essentially a mirror of the QTemporaryDir API. Change-Id: Iaf436ba67cddc4c62027da4dabd3c7bb3442a6f4 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix java autotest.Christian Kandeler2015-07-281-15/+17
| | | | | | | | There is no guarantee that the java or the unzip executable are in the PATH, and the test must not fail if that's not the case. Change-Id: I37c30702c7dc7513d325db78b8a080b896bed38f Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Add hpp as auxiliary input for resource compilerIlya Lyubimov2015-07-282-0/+2
| | | | | | | | This makes possible to use headers auto generated by some other rule Change-Id: If1278fbfaf3ad13125a3da7f977a37f3845b329f Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Decouple ItemReader and ItemReaderASTVisitor.Christian Kandeler2015-07-288-181/+293
| | | | | Change-Id: I67191f686a3fdbc27186422c3ba3bd9f1f1b9c0c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Standardize handling of compiler flags in GCC and MSVC.Jake Petroules2015-07-282-13/+7
| | | | | | | | This ensures that both toolchains handle all permutations of the class [regular, platform] and language [common, c, cpp, objc, objcpp]. Change-Id: I6e4d41ecee22fa5f2907f51e610d64ae0678937c Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Make BuiltinDeclarations::languageVersion() an actual Version.Christian Kandeler2015-07-285-11/+11
| | | | | Change-Id: Ic49e9ab578c8cc4b6e5260a5da2667f934fbdf69 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Make BuiltinDeclarations a singleton.Christian Kandeler2015-07-2813-35/+35
| | | | | | | It has no mutable state and does not depend on any input parameters. Change-Id: I5aa4841f9377769845e9f1f1315d78c89e7d544a Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Fix MSVC build.Jake Petroules2015-07-281-2/+2
| | | | | Change-Id: Ib4c737975b94a3700becb604dca31108ca363f8d Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Don't advertise using relative paths in export items.Christian Kandeler2015-07-286-7/+7
| | | | | | | | While we do support this for compatibility reasons, let's not encourage it. Change-Id: I4856b021b2e309e35974af68fe4dc10954d3d451 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix MSVC 2012 build.Jake Petroules2015-07-283-10/+12
| | | | | Change-Id: I7a8059b6a73950405fd4756b9dc2240c2722aaa8 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Introduce HostOsInfo::hostOsVersion.Jake Petroules2015-07-272-11/+24
| | | | | | | Removes ifdefs that would make a subsequent addition awkward. Change-Id: I0412b3804f7eb92f584c88ab0aa7223933b7a24e Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix FileInfo::resolvePath().Christian Kandeler2015-07-271-0/+6
| | | | | | | | Contrary to what it claims, it did not return a clean path if the relative path was "..". Change-Id: I812e5f4c6c3689b8726c359ad92d4830b93de30a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix Windows build.Christian Kandeler2015-07-271-2/+2
| | | | | | | | Due to an MSVC bug, you cannot use string concatenation inside a QStringLiteral. Change-Id: I956e9d4c54437c53edeb378150ba11f89e07fd99 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Make installSourceBase work with absolute paths.Jake Petroules2015-07-271-3/+3
| | | | | | | This also fixes the error message, as a side effect. Change-Id: I2af7369ff2e9716d760d5a024970f1808dcf2de4 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Reduce setup information hardcoded into toolchain probes.Jake Petroules2015-07-277-89/+59
| | | | | | | This moves a step closer to making profiles as thin as possible. Change-Id: I35fa165c2fa50e9830a460521ba0e3c2c97284c6 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Sort declarations of test slots alphabetically.Christian Kandeler2015-07-274-54/+54
| | | | | | | If we want to keep them sorted, let's do it properly. Change-Id: I4c718508e51c0d05f9460068d635199cabc3d308 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Implement perfect output artifact tracking for TypeScript compiler.Jake Petroules2015-07-255-23/+219
| | | | | | | | This uses the TypeScript compiler API do to the work, similarly to the solution implemented for Java. Change-Id: I2a9c06ca9bec79af3341cb4f6effe9008e9ed276 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* fix FreeBSD buildJoerg Bornemann2015-07-243-2/+13
| | | | | | | | Task-number: QBS-828 Change-Id: I70f309b96d6756f0d6dd5f3ba5cf7dd29808a67d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Document "base" and "outer".Christian Kandeler2015-07-241-0/+32
| | | | | | Change-Id: I2879c41fccdf4f3c6dfa4321d506c0ab9b84f541 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add a TypeScript probe and use it in the modules.Jake Petroules2015-07-243-27/+117
| | | | | | | | | | This improves performance by ensursing that `tsc --version` is only invoked once on module load, as well as providing qbs with the knowledge of tsc's actual install location, which will be important in future patches. Change-Id: Ib736506a300f491ee1a7cccb3e679143ce7de89d Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Add a node.js probe and use it in the modules.Jake Petroules2015-07-242-0/+60
| | | | | Change-Id: Ie47951e621702d387ca6274cd74e6c5858f49d16 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Add a File.canonicalFilePath function.Jake Petroules2015-07-249-2/+45
| | | | | Change-Id: I0759c9c81569d0bc3cc44937b7c4d6cce6af5d29 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix build.Christian Kandeler2015-07-221-10/+10
| | | | | | | | "stdout" is not a good name for a variable. Change-Id: I37ebd3d9f3d7e6e75d4601f1f5cf1f66ddfe1706 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Be explicit about passing -O0.Jake Petroules2015-07-221-0/+2
| | | | | | | | | Generally in Qbs, undefined means to use the underlying tool's default, while an explicit value will pass a flag even if it is already default. Change-Id: I847d56f5e2abede6d49467e0bb2393958d9643e1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Add manifest support in Java module.Jake Petroules2015-07-226-3/+176
| | | | | | | | | The existing manifest property was never declared, so this never worked in the first place. Additionally, add aggregation capabilities similar to how Info.plist is handled in the DarwinGCC module. Change-Id: I93e35936bdfd271adc2892bf2288d2f66d4f87a8 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Move more Android NDK logic out of the profiles.Jake Petroules2015-07-2211-356/+321
| | | | | Change-Id: Ie7c61fde802921b48d588b2760f798431fab81bf Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix WiX autotest.Jake Petroules2015-07-221-1/+1
| | | | | Change-Id: I50390d234b1389dc2d5f3b8a28a151151ea429cd Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Introduce qbs.nullDevice.Jake Petroules2015-07-222-0/+8
| | | | | Change-Id: I84d2f1e461eb22f25c08c9a610a4f7b152c67970 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Define QT_NO_PROCESS_COMBINED_ARGUMENT_START.Jake Petroules2015-07-222-2/+2
| | | | | | | | 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>
* Move TypeScript module code into js file.Jake Petroules2015-07-212-131/+170
| | | | | | | Move only, no changes. Preparation for larger changes. Change-Id: Ia7487af68cdb7dc83c984f0e045db3e50fb6517a Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Make toolchain version in Android NDK flexible.Jake Petroules2015-07-202-29/+74
| | | | | | | This paves the way for Clang-based toolchain support. Change-Id: I426ea434c562a03cd96ece6a3f19e86a2480de07 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix autotest for OS X.Christian Kandeler2015-07-201-0/+1
| | | | | Change-Id: I4a7b804e03516d4c69ba77ba45b2884cc4364790 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Change expected APK file count due to addition of new file.Jake Petroules2015-07-201-1/+1
| | | | | | | Newer Android tools appear to synthesize this file. Change-Id: Ib5171cd9f44d5d5eca40079dbf9e8a5a8f6ec24c Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Add autotest.Christian Kandeler2015-07-202-0/+11
| | | | | | | | For a bug we used to have regarding list properties set in a Properties item when the condition was invalid. Change-Id: I177548c047a1ea2de26ff03f4b556c2d5b22948b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Always show the correct error string from the script engine.Christian Kandeler2015-07-2010-11/+19
| | | | | | | | Meaning that we check whether the value is an error or the engine has an uncaught exception, and print the respective string. Change-Id: Ie2912e28a82906c7ee9323e2f0e55c6b3de96872 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
View Lorry Controller Status