summaryrefslogtreecommitdiff
path: root/qbs/imports
Commit message (Collapse)AuthorAgeFilesLines
* Load only tested plugins when invoked with -testOrgad Shaneh2015-03-241-0/+1
| | | | | | | | | | | | By default, a clean settings path is used for test environment. All the default plugins are loaded, although they're not needed. This change significantly improves loading time for tests. Change-Id: I24254f3e538e3f0e6d233d0989738dc1ce238209 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qbs build: Make use of cpp.cxxLanguageVersion.Christian Kandeler2015-01-202-24/+2
| | | | | Change-Id: Ia2f1870ec67ced58ad95bc6e1953575df2b88cd8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qbs build: Make use of AutotestRunner.Christian Kandeler2014-12-191-1/+1
| | | | | | | And fix some autotest project file problems uncovered by this. Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qbs build: Remove unneeded import statements.Christian Kandeler2014-11-104-4/+0
| | | | | | | The respective items are available without it. Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-021-5/+5
| | | | | | | | Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix library and plugin pathsEike Ziller2014-09-021-1/+1
| | | | | | | | | OSX: Move libraries from PlugIns/ to Frameworks/ other: move QmlDesigner plugins to plugins directory Change-Id: Ia266a3514ce6a496061daa044b3781daae0bc272 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qbs files: Raise Qt requirement to 5.3.1Eike Ziller2014-08-291-1/+1
| | | | | | | Like we have now for the qmake build too. Change-Id: I00a4cc01f35a4d93b52951c5591dadd4b6aa5e79 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* qbs build: Hide symbols by default.Christian Kandeler2014-07-231-0/+1
| | | | | | | Like the qmake build does. Change-Id: I0791e5d09741718d356d869faa04c066ffe56f72 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs build: Get rid of CopyTransformer.Christian Kandeler2014-07-171-0/+1
| | | | | | | | | | That item was using a directory as an output artifact, which was only working by accident and often caused warning messages about failure to remove files. Use a proper module instead, which is the nicer solution anyway. Change-Id: Ib75a0ce26a24c78eb5421367995a8fc72f6a3c2a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Autotests: Fix qbs build.Christian Kandeler2014-07-161-4/+4
| | | | | | | The semantic change in product.buildDirectory broke some autotests. Change-Id: Ic9336f1e9341adacd1daa763b7ba729d7973fe58 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs build: Add convenience function for reading process output.Christian Kandeler2014-07-021-0/+11
| | | | | Change-Id: I998ec20de032b59448585c851e79912010cdac08 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QbsProjectManager: Fix rpath on OS X.Joerg Bornemann2014-06-261-2/+3
| | | | | | Task-number: QTCREATORBUG-12473 Change-Id: Ia470605c1e975c0697d25734bdc7e11d19ac7944 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qbs build: Only pass "-stdlib=libc++" to clang on Mac.Christian Kandeler2014-05-231-2/+4
| | | | | | | | | This is also what the Qt mkspecs do. Otherwise we get linker errors on some installations (where libc++abi is required). Change-Id: I1f204da8825ae4dfd4650b921c8e3f32e0ad6380 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Autotests: Fix qbs build.Christian Kandeler2014-05-221-0/+1
| | | | | | | | We accidentally added QT_NO_CAST_FROM_ASCII to the compiler command line in the last patch. Change-Id: I503d5b328d2ffb9812cd8cf79b5d52c8a76f07df Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs build: Introduce item QtcProduct.Christian Kandeler2014-05-215-67/+53
| | | | | | | | | QtcAutotest, QtcLibrary, QtcPlugin and QtcTool share quite a bit of code, which is now factored out into this new item from which they all derive. Change-Id: Ic947a19e121f37d34968b29c94dd02648da1cd5b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs build: set minimum OS X version for autotestsJoerg Bornemann2014-05-211-0/+1
| | | | | Change-Id: I5ef9956f78da4096d25851951551dca633471fc0 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Nuke plugins PROVIDER settingsOrgad Shaneh2014-05-082-8/+7
| | | | | | | | Place all plugins in lib/qtcreator/plugins Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix qbs build with clang.Christian Kandeler2014-05-081-0/+1
| | | | | | | Properties item considered harmful. Change-Id: I715b589bdcb6ef9ac35790122a1ba6f009652242 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs build: Make the autotest template available as an import.Christian Kandeler2014-05-081-0/+33
| | | | | | | Just like for QtcPlugin, QtcLibrary etc. Change-Id: I395f5863f31abba589864be3ad41ad7fc893787f Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* fix qbs clang buildJoerg Bornemann2014-05-074-4/+8
| | | | | | | | | | | The clang flags for C++11 were incomplete. The linker flag -lc++abi isn't needed. On OS X the minimum OS version must be set to 10.7. This amends 7309b6a2d9a30cc6be7087c12aec2ada65de7b36. Change-Id: I71c1b8b3f9901ecc8f04106874f5697cfaa47a26 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-023-3/+3
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/libs/qmljs/qmljsmodelmanagerinterface.cpp src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
| * qbs: Fix link warningYuchen Deng2014-04-223-3/+3
| | | | | | | | | | | | | | | | | | | | | | for targeting xp 64bit, it's should be 5.2 (5.02) LINK : warning LNK4010: invalid subsystem version number 5.01; default subsystem version assumed Change-Id: I8683a70148208ff399c6dfe3bd299b6b81206e32 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-04-143-0/+3
|\ \ | |/
| * Fix qbs build on Windows.Christian Kandeler2014-04-083-0/+3
| | | | | | | | | | | | Change-Id: Idc471dd4a9734f71e615532a4d70225435452d27 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-183-3/+3
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qbs/imports/QtcTool.qbs src/plugins/git/giteditor.cpp src/plugins/qmldesigner/qmldesignerplugin.cpp Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
| * use new base import style in qbs filesJoerg Bornemann2014-03-113-3/+3
| | | | | | | | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | enable C++11 support in qbs buildJoerg Bornemann2014-03-144-5/+34
|/ | | | | Change-Id: I64e39a4a3e3ec2ac4940f997c402fdd3fef4bf5b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs project files: Add library dir to rpaths for tools.Christian Kandeler2013-10-111-0/+4
| | | | | | | At least one tool uses libUtils, and others could very well do that too. Change-Id: I4ddda966dc18ac05fc074a4e58df9f8c5dc09d44 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-094-0/+143
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
View Lorry Controller Status