aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-091-2/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/fileutils.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/genericdirectuploadservice.cpp src/tools/qtcreatorcrashhandler/main.cpp Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
| * qbs files: change file tag of Qt5 plugin metadata filesJoerg Bornemann2012-10-081-2/+2
| | | | | | | | | | Change-Id: I3d20ad6efe4c6ed8cd87717ef4fdd58a739ad634 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-09-191-1/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.qbp src/libs/QtcLibrary.qbs src/plugins/QtcPlugin.qbs src/tools/QtcTool.qbs Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
* | Support built-in testing infrastructure with qbs build.Christian Kandeler2012-09-131-0/+12
|/ | | | | | | | I.e. define WITH_TESTS for debug builds or if the respective environment variable is set. Change-Id: I2764ece50d0783e8cb030b1695e6f59cf6063248 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix qbs code styleYuchen Deng2012-06-191-4/+7
| | | | | Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Add qbs files for androidDaniel Teske2012-04-251-1/+7
| | | | | Change-Id: I1739879579245303795fc7c6d5bc2206ffb44bcb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qbs files: generate json files from .pluginspec files for Qt5Joerg Bornemann2012-04-131-1/+29
| | | | | Change-Id: I70ce3d8b6ead88b2bb7a595c8aaf465d441ffe98 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Qbs: Allow provider specification for pluginsOrgad Shaneh2012-04-051-1/+1
| | | | | Change-Id: I2016da500a9e81d8b2065c4c1c26a15d59c15abf Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* add qbs filesJoerg Bornemann2012-02-201-0/+62
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 14:17:38 +0000