summaryrefslogtreecommitdiff
path: root/qbs
Commit message (Collapse)AuthorAgeFilesLines
* Version bumpEike Ziller2016-08-291-1/+1
| | | | | Change-Id: I8fb6aa026c8f27908b789dbf909af223e8a66316 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Version bumpEike Ziller2016-08-081-4/+4
| | | | | Change-Id: Ic93d220ff0ab16174b3f5aeb299ce902056163cd Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qbs build: Fix warnings on WindowsChristian Kandeler2016-08-051-1/+4
| | | | | Change-Id: Ic62200d30be054128fd810ae85e7b8eb1900be89 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* qbs build: Remove "-s" from linker flagsChristian Kandeler2016-08-011-6/+0
| | | | | | | | It is unclear why this was added, the qmake build does not have it either, and it breaks linking on some versions of macOS. Change-Id: I878273e072808416a12cf5c973f2ceacde549f74 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix qbs build on macOSChristian Kandeler2016-07-288-19/+19
| | | | | | | "osx" -> "macos" Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Clang: Require at least LLVM 3.8.0Nikolai Kosjar2016-07-111-3/+2
| | | | | Change-Id: I2de3eef7bc06cba6298d64a9a042a01decc05384 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Version bumpEike Ziller2016-07-061-2/+2
| | | | | Change-Id: I561cf077846c4bde8294eae7723830f1c8295a13 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qbs build: Remove version part from plugin file namesChristian Kandeler2016-07-051-1/+1
| | | | | | | | The files now have the same names as in the qmake build (e.g. libCore.so rather than libCore.so.4.0.82). Change-Id: I426a8b3ff55525cc9b066bfa4288d993fe3c1b6e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Clang: Emit a warning if LLVM_INSTALL_DIR is not setv4.1.0-beta1Nikolai Kosjar2016-07-041-1/+4
| | | | | | Change-Id: I18f02e0878e2037857ccd85943c13bbac9cade6b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* qbs build: Use precompiled headers.Christian Kandeler2016-06-236-0/+26
| | | | | | | | 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>
* qbs build: Introduce libclang module.Christian Kandeler2016-06-173-23/+55
| | | | | | | | | This is The Right Way to detect libclang. Using a Probe will also slightly improve performance in qbs 1.6 due to the result caching. Change-Id: I063a8d108d02b620dda2df75dd8c014c84f27ec7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* qbs build: Do not make the ProParser a static library after all.Christian Kandeler2016-06-152-7/+11
| | | | | | | | | | | | | If ProParser is a library, all plugins depending on it (to be able to get at the include paths) will also link to it, but there must be only one instance of its data present. So we go back to building the sources as part of the QtSupport plugin, while the ProParser product is now only responsible for exporting the necessary defines and include paths. Change-Id: I9ad62343064d8aea8ddc4776a462308c4d6ae283 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* qbs build: Final steps to support building plugins "out of source".Christian Kandeler2016-06-154-51/+51
| | | | | | | | | | | | | | | | | | | | | | | - Use the entire Export block when creating a module, not just the Depends items. Adapt references to the product source directory and the "share" directory so that they point to the respective locations in the install tree. - Install dev headers for some more plugins. - Bug fixes & polishing. Create a "dev installation" like this: $ qbs qtc.make_dev_package:true qbs.installRoot:<install root> Then build your plugin against it like this: $ qbs qtc.make_dev_package:true qbs.installRoot:<install root> project.qbsSearchPaths:<install root>/qbs-resources (Using qbs from 1.5 branch; 1.5.1 requires a trivial wrapper project.) That's all. Successfully tested with all commercial plugins on Linux. Change-Id: Ie39c4717dafcd431c533421a15f2f898783d8521 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Change installNamePrefix to sonamePrefix in accordance with Qbs 1.5.Jake Petroules2016-06-132-2/+6
| | | | | | | Task-number: QTCREATORBUG-16428 Change-Id: I219a388460ba359aec76671ba1a3b01ac4509372 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Add static library for qmake project file parser.Christian Kandeler2016-06-131-1/+1
| | | | | | | This is needed to build plugins "out of source". Change-Id: If842cde86e1eb54daa3daf7f9d6f27751f657d9e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qbs build: More steps toward creating a "development installation".Christian Kandeler2016-06-137-3/+152
| | | | | | | | | | | | | | | Namely: - Install header files. - Install imports and modules. - Create modules from products and install them. This is most of what we need. The main thing still left to do is dealing with paths in Export items. These have to be translated somehow. (Currently we only copy the Depends items out of the Export items and ignore everything else.) Change-Id: I12d49fa31d1c1e05bc77a0e0ce3ec9c78c27192a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* qbs build: Introduce new module "qtc".Christian Kandeler2016-06-089-31/+118
| | | | | | | | | 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>
* qbs build: Remove some differences to qmake build results.Christian Kandeler2016-05-173-2/+4
| | | | | | | | | | | - Install library symlinks. - Do not create symlinks for plugins. - Skip some translations. - Rename some binaries. - Do not install the ptracepreload library. Change-Id: I0faa98034154e3840cd2695cab14b72c34cfc5c3 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Set the right version number on our binaries.Christian Kandeler2016-05-133-0/+5
| | | | | | | | | | While we have not encountered issues so far with using the default values, it seems more correct to set the version so that e.g. on Unix a library's soname contains the actual Qt Creator major version etc. For good measure, also set the compatibility version on OS X. Change-Id: I956c473e0b440fc87ffe1aaf99af626da733b5fb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Build documentation also when using qbs.Christian Kandeler2016-04-271-0/+33
| | | | | Change-Id: I17330fa27effc633a06bc8f0a5864e771b831476 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/4.0'Oswald Buddenhagen2016-03-221-1/+1
|\
| * Bump required Qt version to 5.5hjk2016-03-211-1/+1
| | | | | | | | | | | | Change-Id: I4f152bde842c20b0dade863ffea118fe32322c5b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Fix autotests build.Christian Kandeler2016-03-221-1/+1
| | | | | | | | | | Change-Id: I5b0ea5df0a7321c6938146a5a03b089c837ff642 Reviewed-by: hjk <hjk@theqtcompany.com>
* | Fix project resolving with qbs master.Christian Kandeler2016-03-221-2/+3
|/ | | | | Change-Id: Iee12398a4897d795ea5b8b6cadfec8f234ba069d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* qbs build: Adapt to new implementation of qbs.FileInfo.Christian Kandeler2016-03-021-4/+4
| | | | | | | | | | 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>
* Clang: Require llvm/libclang 3.6.2 as minimum versionNikolai Kosjar2016-01-141-1/+1
| | | | | | | | | ...since we had crash issues on OS X with 3.6.0/3.6.1. Released packages are already shipped with 3.6.2. Change-Id: I364288d5c7dc32beacbbdbc231c2be4e6a6818bf Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
* Clang: Fix wrong library import on WindowsYuchen Deng2016-01-051-1/+1
| | | | | | Change-Id: Iceab41ad8d8a680de39c455aba6961842a34183c Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Clang: Fix libclang depends detect on WindowsYuchen Deng2016-01-051-2/+3
| | | | | Change-Id: Ib29a193ccfa177cbfbd0f4e8111aeb2f754dddb6 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
* Fix Qt Creator executable installation for qbs.Christian Kandeler2015-12-071-2/+0
| | | | | | | Commit 59ac67c0bb broke this for non-OS X. Change-Id: Iac23a3e37bd9964af4ffb79be256f59c0b0fedb9 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* Qbs: properly install Info.plist, PkgInfo, and app icon.Jake Petroules2015-10-211-0/+2
| | | | | | | | | The icns files have also been moved into an asset catalog because "source code" as a rule should be stored in the preferred form of modification. Change-Id: I883db5704a46d8d7cf601f7fb4471619ebbc34bf Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Qbs: Adapt rpath handling to how it is normally implemented on OS X.Jake Petroules2015-08-213-6/+5
| | | | | | | | | | | | | | | | | When using rpaths on OS X, the install name prefix should always be set to "@rpath" and the rpaths should be appropriately set to the locations in which that binary looks for its dependencies. While this change is behaviorally identical, it brings the project setup in line with how developers expect these properties to be set, and thus reduces confusion. As an aside, it now correctly follows the principle of relocatability (install name prefixes like @rpath/Frameworks are only partially relocatable as opposed to @rpath alone which is fully relocatable). Change-Id: I7b5cc7a316d2608037ea9ab087029baa85aee2ba Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Adapt Qbs code to latest changes.Jake Petroules2015-08-211-1/+2
| | | | | | | | | | | | type: application actually does nothing now, as the application type is used for both bundled and unbundled products on Apple platforms. Instead, consoleApplication being set to true influences Qbs not to use a bundle. cpp.infoPlistFile became bundle.infoPlistFile in Qbs 1.4. Change-Id: I6540aa91b2db61ed4cbf2ff30bd46d69db5f9d92 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.5'Eike Ziller2015-08-041-3/+16
|\ | | | | | | Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
| * Clang: Check for required mininum LLVM/Clang versionNikolai Kosjar2015-08-041-3/+14
| | | | | | | | | | | | | | | | | | ...otherwise, if the compilation fails, the user is left without any hint. Change-Id: I753aefac0c9fbd24b148235e792fe3b3a2aea21b Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * qbs build: Add missing import.Christian Kandeler2015-07-311-0/+2
| | | | | | | | | | Change-Id: I69b38900dc7b27f1e63b699172000c3d5a208005 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | Adapt RPATHs to new libexec path.Christian Kandeler2015-07-141-4/+13
|/ | | | | | Task-number: QTCREATORBUG-14725 Change-Id: I4b5c76faa878897ca7fbf1fe01945550a2d82964 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* qbs project files: Qualify access to product properties in Export items.Christian Kandeler2015-06-302-2/+2
| | | | | | | | Such items behave "module-like" and one should therefore not count on them having access to the scope of their parent item. Change-Id: I8a323ae31218c6b1ee721ffaa65c04ccf08943bc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Introduce codemodelbackend process and libraryMarco Bubke2015-06-031-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial result of wip/clang-oop. More will follow. This allows us to invoke the completion out of the Qt Creator process and thus safes us as against libclang crashes. At this point only the completion use case is supported. Some notes on the individual components: src/libs/codemodelbackendipc * library encapsulating the inter process communication handling * used by the backend application and in a follow-up change by the creator integration src/libs/3rdparty/sqlite * version 3.8.10.2 * dependency of codemodelbackendipc, will be used to storage indexing data, among others src/tools/codemodelbackend * the backend application tests/unit: * unit tests Change-Id: I91a48e27467581a22fb760a18d8eb926008fea60 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Raise minimum Qt versionChristian Stenger2015-04-091-1/+1
| | | | | | | Has been forgotten in 9d86b7ed4e5234f1c686688d99e604af9ba15d3a. Change-Id: I4725d98d87b4cd44b363a15d5cdcc61eac4e13f0 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Load only tested plugins when invoked with -testOrgad Shaneh2015-03-242-0/+5
| | | | | | | | | | | | 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-022-46/+21
| | | | | | | | 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>
* 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>
View Lorry Controller Status