summaryrefslogtreecommitdiff
path: root/src/src.qbs
Commit message (Collapse)AuthorAgeFilesLines
* Update qbs submoduleChristian Kandeler2018-01-231-0/+1
| | | | | | | | To HEAD of 1.11 branch. Also do the adaptations necessary because of the branch switch. Change-Id: Ief69ef014c10397c14fcd68a9ca770d1391d5491 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update qbs submoduleChristian Kandeler2017-10-131-0/+1
| | | | | | | To HEAD of 1.10 branch. Change-Id: Ic6be03e3d0802a76f3bf2916f37b647526fb2b2a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qbs build: Rename the "qbs" sub-projectChristian Kandeler2016-07-051-1/+1
| | | | | | | | The old name would cause bogus warnings when overriding properties of the qbs module on the command line. Change-Id: I669c2ed173111981be50b28f480e692276ab1293 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qbs build: Use precompiled headers.Christian Kandeler2016-06-231-0/+1
| | | | | | | | It was an oversight that we haven't done this before. Change-Id: Ic338503f6c1ca5e6c52c9af3bdbdb92b7776cac1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Add static library for qmake project file parser.Christian Kandeler2016-06-131-2/+3
| | | | | | | This is needed to build plugins "out of source". Change-Id: If842cde86e1eb54daa3daf7f9d6f27751f657d9e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qbs build: Introduce new module "qtc".Christian Kandeler2016-06-081-18/+2
| | | | | | | | | The qtc module gathers properties that used to live in the top-level project file. This is the first step towards making it possible to build plugins against an installed Qt Creator ("out of source build"). Change-Id: Ia1514cc9c888e80be01b308e908de48980fcbdb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix project resolving with qbs master.Christian Kandeler2016-03-221-1/+2
| | | | | Change-Id: Iee12398a4897d795ea5b8b6cadfec8f234ba069d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qbs build: Adapt to new implementation of qbs.FileInfo.Christian Kandeler2016-03-021-5/+7
| | | | | | | | | | We cannot pass in a relative path as the first argument of FileInfo.relativePath() anymore, which we relied on in some places. The old implementation assumed that if both arguments were relative paths, they had an implicit common base directory. Change-Id: I55ee62e478da761cf085587c57220d5fb1ac990e Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* Fix qbs project file for json library.Christian Kandeler2016-02-051-1/+1
| | | | | Change-Id: I45e5427e406973bfa880832ed32c41c92fe3a0d1 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Introduce a Qt-free JSON implementationhjk2015-11-091-0/+1
| | | | | | | | | | | This is essentially QJson with Qt replaced by std:: features. This is useful to have in circumstances where a Qt dependency is undesirable, e.g. for the Qt Creator debugger protocol implementation in our CDB extension. Change-Id: Iec79c6b23b1e717ce1b6f4d38755287d1f479c13 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* qbs build: Remove outdated property.Christian Kandeler2015-07-181-1/+0
| | | | | Change-Id: I67e995793d1a818e6b0f2536c2410925f2edffa6 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Adapt to qbs' libexec infrastructure.Christian Kandeler2015-06-031-0/+4
| | | | | Change-Id: Ic2d609e017d201b7b3e0b3bcb08359652428aeaa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qbs build: Introduce convenience project property sharedSourcesDir.Christian Kandeler2015-02-181-1/+1
| | | | | Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update qbs submodule.Christian Kandeler2014-11-071-0/+1
| | | | | | | | To HEAD of master branch. Also do the necessary adaptations. Change-Id: I51830dee41341c9be294caf69fdb0459ed8c8bfe Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix library and plugin pathsEike Ziller2014-09-021-3/+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>
* Update qbs submodule.Christian Kandeler2014-07-231-0/+1
| | | | | | | And do the necessary adaptations. Change-Id: I35b5c3e02a7265bdc9730154d6d1aa6b19371310 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix qbs plugins path on OS X.Christian Kandeler2014-06-261-1/+3
| | | | | Change-Id: I6f6c88fdc9925e308b3032a41b4e1400a8e32952 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Fix location and rpaths of qbs command-line tools on OSX.Christian Kandeler2014-06-251-2/+3
| | | | | Change-Id: I3393ac940b60b8741e503420d9d0b44c12423bcb Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix default search and plugin path for qbs.Christian Kandeler2014-06-241-0/+4
| | | | | | | | That is, the qbs command-line frontend that we build. Task-number: QTCREATORBUG-12474 Change-Id: Ia21c24daa25fff5ffe2fe69d23bd6d30285eec9a Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-021-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/libs/qmljs/qmljsmodelmanagerinterface.cpp src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
| * qbs build: Adapt to function renaming.Christian Kandeler2014-04-151-1/+1
| | | | | | | | | | Change-Id: Ia4cc4447e59aaa4f283a7818847633bb7cf9a8aa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | When the qbs submodule is present, build its applications too.Christian Kandeler2014-04-291-5/+7
|/ | | | | | | | | | | | | So far, we have only built the library, arguing that that's all QtC needs from qbs. However, it turns out that it is useful to have the qbs executable as well, e.g. if there is a problem and the user wants to quickly compare the behavior of QtC and the command line tool with the guarantee that they're using the exact same qbs library. Task-number: QBS-558 Change-Id: Iddf94a0b304467abee313bcd52e446f02156c98b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Support configurable library location in qbs build.Christian Kandeler2014-02-281-1/+1
| | | | | | | | | And also in the qbs sub-project (for the qbs and qmake builds). This becomes possible with the qbs submodule update that is part of this patch. Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix location of qbs plugins.Christian Kandeler2014-02-271-0/+1
| | | | | | | | They are not (arch-independent) resources. Task-number: QTCREATORBUG-10074 Change-Id: If257dfc3a8a866003c84331409162699b162eb19 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update qbs submodule to HEAD of master branch.Christian Kandeler2014-01-211-1/+1
| | | | | | | | | | Includes some necessary adaptations to the QbsProjectManager plugin, namely: - Use the new library for setting up Qt profiles. - Use per-profile preferences. Change-Id: I0a639bd291d790c6da9cb4ade53841314310d5ef Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* QbsProjectManager: Support using an installed qbs.Christian Kandeler2013-09-111-3/+2
| | | | | | | | | | | | Distributions will want to make Creator work with their qbs package instead of adding it a second time via the submodule, so we support that by checking for the QBS_INSTALL_DIR environment variable. This supersedes the current mechanism using QBS_SOURCE_DIR and QBS_BUILD_DIR. Change-Id: I2cff651cd23ea47b1a1434e33f80cb74ca0fc96b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* introduce buildQbsProjectManager propertyOswald Buddenhagen2013-08-211-0/+1
| | | | | | | this will centralize some conditionals further down the line Change-Id: I53b26cc29ac3fa098a583d6ac4d28924e5a1f2a3 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Support QbsProjectManager in qbs build.Christian Kandeler2013-07-121-0/+25
| | | | | | | Qbs can come in via the submodule or as an external resource. Change-Id: I613982135e4a7eca1aeb5c9c305c9974fd65f0fe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Refactor qbs project files.Christian Kandeler2013-06-251-0/+12
- 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>
View Lorry Controller Status