summaryrefslogtreecommitdiff
path: root/qbs
Commit message (Collapse)AuthorAgeFilesLines
* fix usage of internal module names in qbs project filesJoerg Bornemann2014-08-141-2/+2
| | | | | Change-Id: I4afdddfe4d92e80ea831f130716c7713103b1f26 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: Avoid some warningsJoerg Bornemann2014-07-231-2/+2
| | | | | Change-Id: Id308bdcc916f7bdf931e45b0f02ea0b1ebe12320 Reviewed-by: hjk <hjk121@nokiamail.com>
* qbs build: Get rid of CopyTransformer.Christian Kandeler2014-07-172-0/+33
| | | | | | | | | | 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-271-6/+6
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
| * Replace deprecated construct in qbs files.Christian Kandeler2014-03-271-6/+6
| | | | | | | | | | | | | | "{in,out}put.fileName" -> "{in,out}put.filePath". Change-Id: Icf55489cdf2187f9f1a6f413054af1fba8025f4c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-184-4/+4
|\ \ | |/ | | | | | | | | | | | | | | 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-114-4/+4
| | | | | | | | | | | | 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 build: Fix warning about deprecated property.Christian Kandeler2014-02-211-1/+1
| | | | | Change-Id: Id1bbd4f3132a98aa981a82a23c85e90830c55583 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Rename pluginjsonmetadata.xsl -> qtcreatorplugin2json.xslhjk2013-12-201-1/+1
| | | | | | | | | The original name inconveniently starts with 'plugin', creating a conflict for shell tab completion when trying to enter src/plugins/... taking extra keystrokes to resolve. Change-Id: I7fa59d767aa900f73cd643dfab0d5b2131652a2d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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-095-0/+119
| | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qbs project files: Rename defaults.js to functions.js.Christian Kandeler2013-09-191-0/+0
| | | | | | | The old name does not fit anymore. Change-Id: I9e270e6e55ee94edb3dd2dc58c01188be1f91793 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix qbs build.Christian Kandeler2013-09-191-0/+13
| | | | | | | | There was more stuff broken by the switch to Qt Quick 2 than were originally noticed, and the original fix was buggy as well. Change-Id: I2b3e0619af923c52aba809355ac271b67097adf1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Move some functions out of defaults.js and make them project properties.Christian Kandeler2013-09-091-19/+0
| | | | | | | | | The one that is left is the only one that's actually a function taking real input. This saves a number of includes. Change-Id: I77e777bbf6ed7ed4086f9a40de4dc3dd8c91a7af Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/2.8'Oswald Buddenhagen2013-07-251-0/+12
|\ | | | | | | | | | | | | Conflicts: src/plugins/cpptools/cppmodelmanager.cpp Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
| * qbs files: Append debug suffix for librariesOrgad Shaneh2013-07-221-0/+12
| | | | | | | | | | | | | | Share plugins and libraries suffix logic Change-Id: I79f61459a0348937fcadd9791f549364c657b21f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-07-111-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/projectexplorer/projectexplorer.cpp Change-Id: I37e550646f877b50693043894976a693ac22ad5e
| * Adapt qbs files to qbs.fileinfo renaming.Christian Kandeler2013-07-091-1/+1
| | | | | | | | | | | | | | Also update qbs submodule so Creator can open itself. Change-Id: Iaa70d5e83d07a1120e795046ebbd8995159aa2db Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Add QTCREATOR_COMPAT_VERSIONEike Ziller2013-07-091-0/+1
|/ | | | | | | | | | | Necessary for keeping compatibility within a minor series. When bumping versions, the compatVersion now needs to be taken into account too. Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qbs updates.Christian Kandeler2013-07-081-0/+1
| | | | | | | | | | - Make project files buildable with current qbs. - Update qbs submodule to enable Qt Creator to open these project files. - Fix an invalid access that caused a soft assert. Change-Id: I976d19240112d1ff048e51036e6702383735352b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Remove pointless project property forwardings in pluginspec.qbs.Christian Kandeler2013-07-081-15/+6
| | | | | | | | | They might have been necessary in ancient times, but nowadays project properties can be accessed in prepare scripts. Change-Id: I209b3c7d0caba7c2f4fc2dda80e57b16d8255fe0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Refactor qbs project files.Christian Kandeler2013-06-251-1/+1
| | | | | | | | | | | | - Use sub-projects. - Move the main application and the application header products into dedicated files. As a result, qtcreator.qbs becomes much simpler to understand, consisting now of just a bunch of global properties and a few sub-project references. Change-Id: Ic7300d489d3982394be5ad1d12a79a2914320298 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless indirectionOswald Buddenhagen2013-05-061-2/+1
| | | | | Change-Id: I91664e892cd442d6b25a332944dd57e36078d947 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/2.7'Oswald Buddenhagen2013-04-181-2/+2
|\
| * Fix module name capitalization in pluginspec.qbs.Christian Kandeler2013-04-181-2/+2
| | | | | | | | | | Change-Id: I66ca1ad22f8a857582e6d3fdb0bf2dfc8334628a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | auto-generate <dependencyList> in .pluginspec filesOswald Buddenhagen2013-04-111-0/+21
| | | | | | | | | | | | Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | remove bogus uppercasing of the replaced variable nameOswald Buddenhagen2013-04-021-1/+1
| | | | | | | | | | Change-Id: I8b506a7ab52a12f3ab8a006788fea7ab5c29c8b8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | define QT_CREATOR centrallyOswald Buddenhagen2013-04-021-0/+1
|/ | | | | | | | | | numerous "3rdparty" libraries have respective #ifdefs, and consequently the define is added in several places. it's quite a mess with the .pr? and .qbs files, though. solve the problem by sidestepping it. Change-Id: I5a6b1ba7cfe96b44f0a4f4ef9738900906a44316 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qbs files: remove superfluous version specifications from importsJoerg Bornemann2013-03-111-1/+1
| | | | | Change-Id: I5f439e850cbfbb0a1a4802e2dd063687a75afc68 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Adapt qbs files to new module property access syntax.Christian Kandeler2013-02-211-7/+7
| | | | | | Change-Id: Idf2c04e250be7fcbbb927f423b5651d58a0d4bac Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Adapt qbs project files to new installation approach.Christian Kandeler2013-01-241-14/+1
| | | | | | | This need a qbs build >= commit 5cdf94de to work properly. Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Generalize QT_NO_CAST_FROM_ASCIIOrgad Shaneh2013-01-161-1/+2
| | | | | Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0 Reviewed-by: hjk <qthjk@ovi.com>
* qbs files: Compile everything with QT_NO_CAST_TO_ASCIIOrgad Shaneh2012-11-221-1/+2
| | | | | | | It appears in qtcreator.pri Change-Id: Iea74d4d06146f94fd1022eaae3074da88d6e22f3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
View Lorry Controller Status