aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update list of Qt modules required by apps linking against libqbscore.v1.0.1Christian Kandeler2013-06-272-2/+2
| | | | | | | Since we now use QtXml in the library, clients need to link against it. Change-Id: I4ede03041c01f9c0268316050747c3108db10842 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add modules Qt.multimedia and Qt.multimediawidgetsJoerg Bornemann2013-06-272-0/+16
| | | | | | | Task-number: QBS-340 Change-Id: I996c103d128f1c84c8e68cf4cc4ab44685f249e9 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* adjust READMEJoerg Bornemann2013-06-271-12/+26
| | | | | | | Shamelessly stolen from Qt Creator. Change-Id: I896208e39cafb337d5b35ea95674fd1c362d83b4 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* qbs-config-ui: Fix output of lists.Christian Kandeler2013-06-271-1/+1
| | | | | Change-Id: Id76b495e55896e30fb2a121f672cbcfc51e5c5c0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* MSVC: do not collect static lib from object inputsJoerg Bornemann2013-06-261-2/+2
| | | | | | | | There is no point in attaching static libraries to object artifacts. MSVC is the only toolchain where we did this. Change-Id: I81e80b5ba4bfedbbb7cb3a9394c73709d7d091c9 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Add support for setting the compiler character set.Jake Petroules2013-06-265-2/+28
| | | | | | Task-number: QBS-332 Change-Id: I7dda39be44c307071225c47de7141aec3e259f01 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix exception handling in property bindingsJoerg Bornemann2013-06-265-13/+29
| | | | | | | Task-number: QBS-320 Change-Id: I778e2758991f0f04b940625fc0c931a05446cd34 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix handling of weak frameworks with path names.Jake Petroules2013-06-261-1/+1
| | | | | | | | | Previously if a path to a framework to be weakly linked was given (as opposed to a framework name), it was strongly linked. The correct flag to mark the library path as weakly linked is now applied. Change-Id: I523fd84ba0967e68906611b32305aaf371b1a6b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* undefine input/output if they're not availableJoerg Bornemann2013-06-261-0/+4
| | | | | Change-Id: Ie750e42d382b5304c9ec568e7588bc82a36ed358 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Overwrite existing symlinks in framework bundle artifacts.Jake Petroules2013-06-251-4/+4
| | | | | | Change-Id: I1d3a54889ab27605af1bb2fcdc73c0687afb1709 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove TestBlackbox::codegenJoerg Bornemann2013-06-252-8/+3
| | | | | | | This is now tested by TestBlackbox::build_project. Change-Id: Ib64c06d10634aa2e6b5213cd9536e229cb5e3882 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix static library dependenciesJoerg Bornemann2013-06-243-3/+2
| | | | | | | Task-number: QBS-294 Change-Id: Ie285cb98db052176a563f52a187279b5dae4c1bf Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* enhance link_staticlib test for QBS-294Joerg Bornemann2013-06-247-11/+97
| | | | | | | Fix follows. Change-Id: I79e34e460710c3ea17bef397eace6b65d004d0e9 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove dead code from GenericGCC.qbsJoerg Bornemann2013-06-241-6/+2
| | | | | | | | This is a copy & paste artifact and does nothing due to the wrong usage of Array.concat. Change-Id: Ie99bcecacba5be0e167b661d4e4bc5ce18c09189 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove unused variableJoerg Bornemann2013-06-241-1/+0
| | | | | | Change-Id: I2221adf838f4c33ae279705ad93141ebce30338e Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Improve handling of changes to restored build graph.Christian Kandeler2013-06-2411-125/+81
| | | | | | | | | Instead of painstakingly inserting new product pointers into an existing build graph, do it the other way around and put existing build data into the newly resolved project. This is much more robust. Change-Id: If38e4a5e14c6a5faedb0c590e86aa5efc7844e39 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add XmlDom generator/parser to JavaScriptBogDan Vatra2013-06-247-4/+530
| | | | | | | Task-number: QBS-55 Change-Id: I53e9c0c2a784851244219dde9ffe752816e65d0a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Implement support for prefix headers (Xcode) / forced includes (MSVC).Jake Petroules2013-06-244-0/+20
| | | | | | | Task-number: QBS-313 Change-Id: Idc66a671a9c634ef142887fb374d99da3ba96bb1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Refactor compiler and linker flags handling to avoid long arg lists.Jake Petroules2013-06-242-105/+73
| | | | | Change-Id: I2eae85620a62f2343e99e6755a4047fa7ced9345 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add String.startsWith and String.endsWith to JavaScript.Jake Petroules2013-06-241-0/+5
| | | | | Change-Id: I6ddcce0fbc3aed9927dee79aa9fbc61ea353f793 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix PathProbe.fileName.Jake Petroules2013-06-241-3/+5
| | | | | | | The property was shadowed by a local variable and thus always undefined. Change-Id: Ic8993269a74bea6776b54237afe408b69f77ce7c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add isValid() method to (Group|Product|Project)DataTobias Hunger2013-06-214-0/+45
| | | | | Change-Id: I119110c0f95e2b46cfb048460b8197fb45a38cb5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Store list of files that are part of the projectTobias Hunger2013-06-2013-9/+64
| | | | | | | | | | | Store a list of all files that are referenced when resolving the project as part of the project. This list is then processed to check whether the project needs to be re-resolved. Change-Id: Iccb8928a5349546c22a9615256a505bebf5de567 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix linking of static libraries with relative paths.Jake Petroules2013-06-201-1/+1
| | | | | | | Task-number: QBS-327 Change-Id: I12552c582e6e61f613c2249077c1db42854d548c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Use "stringList" in the documentation as it's an actual data type now.Jake Petroules2013-06-204-24/+24
| | | | | Change-Id: I689223c4f49bd9378c328ba50653e4df7097b8eb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix some trivial JavaScript warnings.Jake Petroules2013-06-192-7/+7
| | | | | Change-Id: I0e5d27c15cf11fa309c5b5f67cb06f605b982922 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Use better property types where appropriate.Jake Petroules2013-06-195-37/+37
| | | | | Change-Id: Iee8dea7761b1b932dbd8c33a67a7088030b6561d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove existing shared library symlinks before creating them.Jake Petroules2013-06-191-0/+5
| | | | | | | | | This resolves "file exists" errors and also will properly update the link targets if the product's artifact name changes (i.e. because the targetName or version changed). Change-Id: Ibd691e5c364a8ab80122b0c85a5d19328c080f8c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update processInfoPlist docs to reflect reality.Jake Petroules2013-06-191-1/+1
| | | | | | | | The functionality in question was implemented by 4d3373d04abbccb7fc5bb743eaf75b9c9199313c. Change-Id: I5b475bd34222674b10637ec9498df6088bc76908 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update targetOS docs with the full list of possible OS values.Jake Petroules2013-06-191-1/+35
| | | | | | | | This now matches what's in evaluatorscriptclass.cpp and includes iOS Simulator which was added with the targetOS/hostOS change. Change-Id: I5269fbe5d8a859cd22235a9f10c4328e32b103cf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Implement the infoPlistFormat property.Jake Petroules2013-06-193-4/+66
| | | | | | | Task-number: QBS-329 Change-Id: I749123ba13e537e476dc76767254bc9029a1c1cc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Move BuildGraphLoader into its own set of files.Christian Kandeler2013-06-197-548/+640
| | | | | Change-Id: Icd11a83337a34d3544bfd59c1ab93c9d2ccb4dea Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Don't create symlinks for the dylib binary when building frameworks.Jake Petroules2013-06-191-0/+1
| | | | | | | Task-number: QBS-322 Change-Id: I9b4f0108668dd5b9d37f97c2cf5f7586ee309879 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* allow qbs to be built without rpathJoerg Bornemann2013-06-184-4/+11
| | | | | | | | | | | Some Linux distros discourage the use of rpath. Specify CONFIG+=disable_rpath to turn off rpath usage on Linux and OS X. Task-number: QBS-309 Change-Id: I3658470aef525f5406d728c48ab2e6f86a3c62cd Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix loading of the generic unix cpp moduleJoerg Bornemann2013-06-181-1/+3
| | | | | | Change-Id: I8315b68c99da555eaa229a15049a164928077ac3 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* add String.contains to JavaScriptJoerg Bornemann2013-06-181-0/+3
| | | | | | | | | Provided for symmetry with Array and to alleviate the effects of QBS-330. Change-Id: Idca1edfd0c26624313fbb598d8d2017fe1511780 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Check for multiple occurrences of items in SubProject item.Christian Kandeler2013-06-184-6/+30
| | | | | | | And potentially elsewhere too, if the Item::child() function is used. Change-Id: I4a5f53e6b1a0f0f49908ce1b8cd34ffce903c38c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix MinGW run environmentJoerg Bornemann2013-06-181-0/+6
| | | | | | | | Task-number: QBS-280 Change-Id: I120679ce5dd72958a995fedda3353e2ffab5f7ad Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* s/Error/ErrorInfo/Tobias Hunger2013-06-181-1/+1
| | | | | Change-Id: I9bb6c9e4b2bc54c25c0b91a2e590db09cf729d41 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make hostOS the default of targetOS againJoerg Bornemann2013-06-181-1/+1
| | | | | | | | Otherwise we break profiles that do not set targetOS. This is the usual case for host toolchains on Linux. Change-Id: I8fdba89806ba560a3ab70f23a73b61247f6b508c Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Introduce function that gets a single child item of some type.Christian Kandeler2013-06-184-20/+16
| | | | | | | | | This is useful for cases where at most one sub-item of a specific type is allowed. Calling code no longer needs to iterate over the child items manually. Change-Id: I6177ab328fed5ad564cf42917f1e6953c717baa3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Some minor improvements to the Error class.Christian Kandeler2013-06-1856-281/+296
| | | | | | | | | | | | | - Rename "Error" to "ErrorInfo", to make clear that this class conveys information about errors, including that there might not actually be one. - Rename "ErrorData" to "ErrorItem", to make clear that these are parts of an aggregate structure. - Introduce ErrorInfo::hasError() for quick checking of whether an error occurred. Change-Id: Icea6ed5240d6d14bd30e9cea189c6babd7004792 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make use of contains() where appropriate.Jake Petroules2013-06-186-34/+34
| | | | | Change-Id: I93279572f422ea3b14d7c8467caae746f71e1fac Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change targetOS and hostOS to lists, and remove targetPlatform.Jake Petroules2013-06-1838-148/+237
| | | | | Change-Id: I33317c857a319e0fa25c9e0d0cc69abc4ad3fabb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make the toolchain property a list.Jake Petroules2013-06-1818-31/+42
| | | | | | | | | | | This allows us to differentiate between clang and gcc toolchains, and also allows us to easily apply conditions to multiple related toolchains (gcc, clang, mingw are all considered part of the gcc toolchain family). The probes now also correctly set the toolchain. Change-Id: Ic5d01fe7fe25dd5e5937cbff7d9253f180571533 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* bump version number to 1.0.1Joerg Bornemann2013-06-182-2/+2
| | | | | Change-Id: Ic3695d6d57486c929b8537497b75d7b2645272ef Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* adjust tst_language to latest changesJoerg Bornemann2013-06-181-2/+2
| | | | | | | | | SetupProjectParameters takes "flat" build configs now. This fixes the soft assert in the language test that was introduced in aa74bd71956464adc12249055f8f9e29fe3bd5ad. Change-Id: Idddf7eca9b5fbac06ae1e56bc1b7e1a93003e75f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* convert profile values to the right property typeJoerg Bornemann2013-06-183-4/+92
| | | | | | | | | Profile values will be converted to the type of their corresponding property. Now it is possible to set string lists of length one or boolean values in profiles. Change-Id: I7fa8bee556376e683030cf02790597c56e6bf494 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* yield error on unknown type in property declarationJoerg Bornemann2013-06-173-0/+10
| | | | | | | | | The declaration property schnusel foobidoo will now lead to an error message. Change-Id: If3632b65a6ba5c4d80602df0823c6284f1cf088b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix usage of Properties item in Qt modulesJoerg Bornemann2013-06-172-1/+4
| | | | | | | | We need to provide the else case for Properties items. This fixes the qbs build of qbs on OS X. Change-Id: I5afeaa3d7fc7328a1c9a94575f744c212a9344ee Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>