aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* use Item::PropertyDeclarationMap where appropriateJoerg Bornemann2014-03-252-2/+2
| | | | | Change-Id: Id1449ecbc4b3e3f4302ccb3a5f7c397a58937456 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix potential infinite loop in build dir cleaning.Christian Kandeler2014-03-181-1/+3
| | | | | | | | | | We should not even try to remove any empty directories outside the actual build tree, as they might not belong to us. Task-number: QBS-533 Change-Id: Ia5f4caf97155b0a1711add1bb5efd5f8fa08562b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Combine createGccProfile and createMingwProfile.Jake Petroules2014-03-121-25/+16
| | | | | | | They were substantially similar. Change-Id: I2ec29d7eb1691b3c2d8de7075843b88773c7cb63 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Correctly set toolchain prefix for GCC cross compilers.Jake Petroules2014-03-121-1/+12
| | | | | Change-Id: I3e1c73a22ff2abd9ce7d64515a2830aaf076095c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Improve human readability of and consolidate probe functions.Jake Petroules2014-03-121-10/+10
| | | | | Change-Id: Ibc9b695e86981d346faff2c1dc05c93cccfdd0f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add new qml item ScannerMaxim Zaitsev2014-03-1223-166/+598
| | | | | | | This item allows to write custom dependency scanners in modules. Change-Id: I6cb49969973ee29896d1909e7a16bf5da50f8aef Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix compilation on OS XJoerg Bornemann2014-03-111-0/+2
| | | | | Change-Id: I9e360e1b4c9e37807208aa85cb6bf4e9b7498e14 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* make the qbs.PropertyList extension available on all platformsJoerg Bornemann2014-03-062-2/+22
| | | | | Change-Id: I4ab90b63f6139d9743a7251ff574f6b4b37e123d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Compile with C++11/libc++Eike Ziller2014-03-061-6/+8
| | | | | Change-Id: I5ca0743ecef0010b07df76557e94b3913a0e2417 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Detect MinGW on all platforms.Jake Petroules2014-03-041-9/+22
| | | | | Change-Id: I4e93aadf5b196087942af1b427cfef8d6b7dc72b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Normalize signal/slot signaturesOrgad Shaneh2014-03-033-5/+5
| | | | | Change-Id: I88e51bf4c33bbeeacb22a94b735d1faf4f76023f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Recognize more MinGW machine names.Jake Petroules2014-03-031-4/+10
| | | | | Change-Id: I92730e0a2c604044869808ffcf6772dd23809625 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Canonicalize more architectures.Jake Petroules2014-03-032-10/+12
| | | | | Change-Id: Ib792d1d933fee0cfaf1a968517946b407b8072e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* do not export ScriptEngine and LoaderJoerg Bornemann2014-02-282-5/+2
| | | | | Change-Id: I7e27a387a27b7ef082f3a26e2a147557d585b40f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* introduce loadExtension functionJoerg Bornemann2014-02-282-0/+81
| | | | | | | Task-number: QBS-302 Change-Id: Ie488ba3504c84758cab89fa3646723e8b5d6f440 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* store search paths in file contextJoerg Bornemann2014-02-285-1/+19
| | | | | | | This will be needed for loading extensions from JS files. Change-Id: I1810a5d6afc0427904c2b7502ff4dc91e9507a48 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* introduce loadFile function for loading JS filesJoerg Bornemann2014-02-285-15/+87
| | | | | | | Task-number: QBS-302 Change-Id: I7c36c1ed00905fd3ca47448486a75f0b42108a8a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* give FileContext and ResolvedFileContext a common baseJoerg Bornemann2014-02-2812-56/+183
| | | | | Change-Id: I76f0e5e0b9f99a6f33c3381436ee6c4879e36a68 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Introduce PropertyList functions isEmpty and clear.Jake Petroules2014-02-282-0/+18
| | | | | | | | These functions test whether the PropertyList object has any data loaded, and clears any existing data from the object, respectively. Change-Id: I9dfa0e7629dccd3090fc0d5de33481c8e7caf424 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add support for writing a PropertyList object directly to a file.Jake Petroules2014-02-282-0/+16
| | | | | | | This is useful for writing binary plists. Change-Id: I5cc9bae13ad5fbc3119a582c70af671db67790ff Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Centralize plist writing code.Jake Petroules2014-02-282-47/+90
| | | | | Change-Id: I2502d93fc5b1d76e3a71e7517594eab4b7962e67 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move ResolvedFileContext to separate filesJoerg Bornemann2014-02-288-65/+152
| | | | | Change-Id: I066ea8aa826c254de82b9591ab4b6eec23665b0d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* rename name variable to filePathJoerg Bornemann2014-02-281-9/+9
| | | | | | | Because, that's what it is. Change-Id: Ic97cd21f545c839c96b03f62ff1b6f10aea5e8a6 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* rename JsImport.fileNames to filePathsJoerg Bornemann2014-02-284-14/+14
| | | | | | | Because that's what it is. Change-Id: I0b018e3ff5902f63b1b9067d2ce0ee46edfdac91 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix includes in scriptengine.hJoerg Bornemann2014-02-281-2/+2
| | | | | Change-Id: Iaafcfcd916ca1fe19a7f6268b5a08a7c1a0a518c Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Make the "lib" part of plugin and library locations configurable.Christian Kandeler2014-02-2710-14/+28
| | | | | | | | Can now be set to e.g. "lib64" if required. Task-number: QBS-343 Change-Id: I6f34ade37f39400cc5fde63133a464565feb34c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Include languageinfo.h in qbs.h.Christian Kandeler2014-02-271-0/+1
| | | | | Change-Id: I829f66f21aebef1c81903eb255b6a09a6ca15f71 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* introduce qbs::LanguageInfo classJoerg Bornemann2014-02-279-79/+170
| | | | | | | | | This public API can be used to get information about the qbs language items. Currently it's only used for qbs-qmltypes. This change will enable us to un-export ScriptEngine and Loader. Change-Id: I0c92c7f6e37f6444c51198729cbb5435dc90bb40 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Shut up warning by stupid compilers.Christian Kandeler2014-02-271-0/+3
| | | | | Change-Id: I90b8e60680aa1d6d2f02a6a4f91ab5bf218c64c8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add support for reading the plist format in the PropertyList extension.Jake Petroules2014-02-272-3/+34
| | | | | Change-Id: I6ed526b13e0cc418b89c3d95fad04e930049b08c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add support for reading JSON plists in the PropertyList extension.Jake Petroules2014-02-271-5/+21
| | | | | Change-Id: I3e0386373c2b4a530a9c4c77f5db6d84c7d0043f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Rename PropertyList API functions for better self-documentation.Jake Petroules2014-02-272-12/+12
| | | | | Change-Id: I5435e99c68646340bf6a2608819cfaef31146646 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix potential uncaught exception when reading files with PropertyList.Jake Petroules2014-02-271-3/+3
| | | | | Change-Id: I4182704fa75b15a24c9d8dfceba02f40fc57928b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Properly retain/release the propertyListObject held by the plist object.Jake Petroules2014-02-271-1/+3
| | | | | Change-Id: I0e47a41ee9206ac91fa890af443e3c660183d1a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Use localizedDescription instead of description when printing NSErrors.Jake Petroules2014-02-271-4/+4
| | | | | | | This messages will be much more user-friendly and context-appropriate. Change-Id: I57cf08f9c3f866e65cd506ffb9a7fda3304933c2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Use the same string conversion functions names as in QtCore.Jake Petroules2014-02-271-21/+23
| | | | | Change-Id: I1e120436a2cdc4503004dd1b981d2b059313c7b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Do not share product properties with artifacts.Christian Kandeler2014-02-2612-66/+87
| | | | | | | | | | | | | | Since products potentially share their property maps with their groups, artifacts get product properties such as "name" and "destinationDirectory". This is strange and can mess with change tracking. Therefore we split up the product's property map in two: One contains the module properties and is potentially shared with groups, the other has the actual product properties and is not shared. This patch also removes a workaround from an autotest that was required until now to prevent a false positive in change tracking. Change-Id: Ia1f1f0ce32669fd893a99f809753df526bf1442a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* use filePath instead of fileName where applicableJoerg Bornemann2014-02-253-17/+17
| | | | | | | | This fixes the recently introduced deprecation warnings. Task-number: QBS-258 Change-Id: I10660270895ec89a1444d596922c22e9658ca3ab Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* rename fileName property in prepare scripts to filePathJoerg Bornemann2014-02-251-1/+7
| | | | | | | | | | | The fileName property of input/output in prepare scripts actually represents a file path and is therefore renamed to filePath. The old fileName property is deprecated but continues to work for a while. Task-number: QBS-258 Change-Id: I54524998571557d21f3aaebc0437be168207992e Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Do not put the plugins where the resources are.Christian Kandeler2014-02-255-19/+19
| | | | | | | | | | | That's not where they belong. Also make less assumptions about the file path leading to them. Ideally, we should also do the latter for the stuff in share/, but then someone would have to touch the horrific qmake code in static.pro. Task-number: QTCREATORBUG-10074 Change-Id: Ide9c4b83dcf0cd7a62b57643b79caf05662358cb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* rename variable in Transformer::translateFileConfigJoerg Bornemann2014-02-251-6/+6
| | | | | Change-Id: I928eff9d1912146492c3801952e3bdd06adf412f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* introduce ScriptEngine::setDeprecatedPropertyJoerg Bornemann2014-02-252-0/+28
| | | | | | | A convenience method to set up deprecated properties. Change-Id: I1e967e9ab42b00bdb157523c09efe996e7d53a15 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Don't treat warnings as errors.Christian Kandeler2014-02-242-3/+0
| | | | | | | | It's too much hassle if e.g. the warnings come from header files. Task-number: QTCREATORBUG-11431 Change-Id: I12af8b4a2bc525f2d7c415659e9a51f8e92790e6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Try harder not to store a corrupted build graph.Christian Kandeler2014-02-243-1/+19
| | | | | | | | | | | - Check status of output stream at the end of the serialization process. - Check whether the data can actually be written to the disk. - Write the magic string only at the very end, so that if storing gets interrupted halfway through (e.g. due to a crash), we won't try to load this file on the next invocation. Change-Id: I43fed5e9a3516d4d6d66960b4af597019d1d0297 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Ignore pri file entries with en empty rhs.Christian Kandeler2014-02-211-1/+1
| | | | | | | Otherwise, things like empty include paths can end up in our modules. Change-Id: I8cff8653c4be5beae8f7c6c8c4c87b7ca38ef025 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix some sub-optimal use of the persistence facility.Christian Kandeler2014-02-2111-80/+91
| | | | | | | | | | | - Commands were potentially saved twice, and so were their strings. - Strings in RescuableArtifactData objects were potentially saved twice. - Remove an unneeded include of persistence.h from a header file. - Make all PersistentObject::{load,store} methods private to make it clear that they may only be called via PersistentPool. Change-Id: I17c94201dc8bc57b89132d00f3db2ec0ae2e7922 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Allow the user to specify a custom place for settings.Christian Kandeler2014-02-2130-99/+217
| | | | | | Task-number: QBS-509 Change-Id: I4ad32c648121068880d652e3ba39d4eea59dfbc3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add command line parser classes to config-ui and setup-qt.Christian Kandeler2014-02-2110-68/+369
| | | | | | | These tools will soon get more options. Change-Id: I72ea2a180376b2e70c0c5b1119460adb3768e622 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add helpful output to assertion for file path absoluteness.Christian Kandeler2014-02-211-1/+2
| | | | | Change-Id: I16ec6f5d236cf0a6591dc9ff4b9b180fb936ed82 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make parameter of PersistentPool::storeContainer() const.Christian Kandeler2014-02-201-2/+2
| | | | | | | A store function, you see, only reads from its parameter! Change-Id: I6df151c87223d96341ac8e10af60c1a77880279e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>