summaryrefslogtreecommitdiff
path: root/qbs
Commit message (Collapse)AuthorAgeFilesLines
* Fix qbs build for qbs >= 1.10Christian Kandeler2017-09-261-0/+2
| | | | | | | | Shadowing modules does no longer work from qbs 1.10 on; we need to give our implementation of qbsbuildconfig a higher priority. Change-Id: I703b780d564c43ebc2a4318f683537f10c4e5f3c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Bump version to 4.4.1Orgad Shaneh2017-09-061-2/+2
| | | | | Change-Id: Ib65ad133f580fe0cca76ea31752134343b986dd6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump minimum Qt version to 5.6.2Eike Ziller2017-08-291-1/+1
| | | | | | | | Starting to use macos qmake scope. 5.6.3 should be around soon so we can still regression test latest two patch levels. Change-Id: I14f67a26e26c50f6dd0fb8b621f13780b0b05f76 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* qbs build: Support new variable QTCREATOR_COPYRIGHT_YEARChristian Kandeler2017-08-241-0/+2
| | | | | | Change-Id: I2b5ca4f93456857b0c4ac8b7960982b28f5f0761 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.4.0Orgad Shaneh2017-08-181-5/+5
| | | | | Change-Id: I1f282d5d30f76d9e0a3c2a32bab7de7933d349fa Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.4 rc1Eike Ziller2017-07-261-3/+3
| | | | | Change-Id: I7d78ce4ed70a14cfea95cfac4a852ba715e64fb1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Define COPYRIGHT_YEAR in build filesKai Koehne2017-07-251-0/+2
| | | | | | | | | | | | This allows us to use the copyright year also in the following patch that adds it as metadata to the windows executable. Ideally we'd unify IDE_YEAR and IDE_AUTHOR (because they're only used together anyway) but that would break translations. Change-Id: If0f84eaeb22e9ba71b2b29798324b76a91eda78f Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qbs build: Adapt to renamed Qt.core propertyChristian Kandeler2017-07-101-1/+1
| | | | | Change-Id: Ie05ad37ae7711a6deb152c5aa0a926e9b83b082b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/4.3' into 4.4Eike Ziller2017-07-101-0/+2
|\ | | | | | | | | | | | | Conflicts: qtcreator.qbs Change-Id: Ic5e268326d93172208de291d31a716e437b9cedf
| * Qbs: fix bundle installation with Qbs 1.8Jake Petroules2017-07-071-0/+2
| | | | | | | | | | | | | | | | | | | | This patch also sets the minimumQbsVersion to 1.7 because that's the version that is actually documented as being required in the README. Change-Id: I862daaf5fa34ab2cc5db47581689e08aa34f0910 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Explicitly specify the minimum macOS version in the qtcjson libraryJake Petroules2017-06-231-1/+1
| | | | | | | | | | | | | | | | Also don't set the value in more than one place. Change-Id: Iea1dc1d4e127c12d6333799dda91749eb2d604d4 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Orgad Shaneh2017-06-202-2/+6
|\ \ | |/ | | | | Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b
| * Fix deployment target on macOSJake Petroules2017-06-122-2/+6
| | | | | | | | | | | | | | | | According to the README, the minimum version is 10.8, but the code did not reflect that reality. Change-Id: I2bbaeefe614cba5b5fa8413b68202bb75f346d70 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Version bumpEike Ziller2017-05-241-2/+2
| | | | | | | | | | Change-Id: Ifb7f3bf865a53b5bab06b2cd58d2a64eecbe2f21 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump versionEike Ziller2017-05-101-5/+5
| | | | | | | | | | Change-Id: I744550af5e37d5863b42534608f2c8289b22c674 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Fix version informationEike Ziller2017-04-251-5/+5
|/ | | | | | | master will become 4.4 Change-Id: I2c32496cdf9bad1c46d89e71145034e248e78171 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Specify Qt Creator's "display version" in qtcreator.pri/qtc.qbsEike Ziller2017-04-211-0/+1
| | | | | | | | | | | | | | Currently it is set by passing defines to qmake, which complicates package build setups. Set the display version where the numerical version is defined. This also makes it available to developer builds. Also switch around the display version and numerical version in the about dialog, since e.g. "4.3.0-rc1" is more descriptive than "4.2.83". Change-Id: I26dda427975acdc6cc169f8d625f57918167cf19 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Version bump for RCEike Ziller2017-04-191-2/+2
| | | | | Change-Id: I75dde3f981e3b7d72c181a5f0b582c7261d38e32 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Embed the qbs documentation also when building with qbsChristian Kandeler2017-03-101-0/+3
| | | | | | Task-number: QTCREATORBUG-13124 Change-Id: I214a92a03a6d0fa75c1cceca1909c68add09d2c8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/4.2' into 4.3Eike Ziller2017-03-091-1/+0
|\ | | | | | | | | | | | | | | Conflicts: doc/src/qtcreator.qdoc tests/system/suite_general/suite.conf Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a
| * Doc: Remove unused QTC_LICENSE_TYPE defineEike Ziller2017-03-061-1/+0
| | | | | | | | | | Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Version bumpEike Ziller2017-01-231-1/+1
| | | | | | | | | | Change-Id: I013dc48c3aedc3d586f626e47a9e1f306b4bcefe Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump versionEike Ziller2016-12-201-1/+1
| | | | | | | | | | Change-Id: Ia998360a90a2decc6a7e81f11b64adb367c217b0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Version bumpEike Ziller2016-12-011-4/+4
| | | | | | | | | | Change-Id: I25f835a66200a1f578deff65ca83aeb02c217790 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Move mimetype definitions to plugin specsEike Ziller2017-02-271-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | - Avoids the hassle of QRC files and manually registering mime types - Avoids performance regressions because of mime types that are registered after mime database has been used - Makes it technically possible to detect that a disabled plugin could handle a mime type if it was enabled Change-Id: I373008b1b56e9c6b4853055f20b3eeb112a6eff9 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Bump C++ version to 14Marco Bubke2017-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Our compilers support some features which are part of the C++ 14 feature set. Some off them are silently compiled with the C++ 11 setting. For example: [foo=bar] {} is actually working with GCC but is part of C++ 14. Change-Id: Icf2c3806e26c675f8251768c6ad54ba4da186d11 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Add defines for relative data pathsEike Ziller2016-12-011-0/+8
| | | | | | | | | | | | | | | | | | Derive the relative paths used in code from the paths used by the build system. Change-Id: I208ee55d3c1ee76921734f5c1c6c40d3fcb9724c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/4.2'Orgad Shaneh2016-11-283-0/+7
|\ \ | |/ | | | | Change-Id: I259a402bc896fc2e359cc96b7510453ac9a9a552
| * qbs build: Fix passing on include dir for intrinsics of libclangNikolai Kosjar2016-11-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 31258ec5555d929f4cd33e2836e24b470cf6908b qbs build: Introduce libclang module. "llvmVersion" was overlooked. Because of this, the definition of CLANG_RESOURCE_DIR in clangcodemodel.qbs led to an invalid path which eventually was discarded. Change-Id: Ia1eb50cf738df4affbedc99849bf5326a8e8fb19 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * qbs build: Don't use relative paths in product parent itemsChristian Kandeler2016-11-232-0/+4
| | | | | | | | | | | | | | | | We should be explicit about where we assume the source files to be. The base directory might change in the future. Change-Id: Ifd53c2586f5c67a72ed928130647083d467a3e30 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Eike Ziller2016-11-161-2/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/clangrefactoring/refactoringengine.cpp src/tools/clangrefactoringbackend/source/symbolfinder.cpp Change-Id: I7c1c87f3b8ade43a07f6668565501042e967fa8b
| * Clang: Require LLVM >= 3.9.0Nikolai Kosjar2016-11-151-2/+2
| | | | | | | | | | | | | | | | We already ship with a cherry-picked change from version 3.9. Change-Id: Iad09ac8db470506c5de0321f3a2346c549b11b31 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Orgad Shaneh2016-11-143-3/+3
|\ \ | |/ | | | | Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
| * qbs build: Fix the names of some Qt modules in Depends itemsChristian Kandeler2016-11-103-3/+3
| | | | | | | | | | | | | | | | It's "testlib", not "test". And "designercomponents" is actually a private module. Change-Id: I1a14d107bb5568b4f3807558ec6ed11937ac816a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Version bump for after 4.2-betaEike Ziller2016-10-271-2/+2
| | | | | | | | | | Change-Id: Ide9a51c899914531e9d23a2adf614d424a2746d8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.2'Eike Ziller2016-10-241-2/+3
|\ \ | |/ | | | | Change-Id: Ied7c5b01ade2a71e92541fcced2935adcf143421
| * Clang: Fix using forward slashes for CLANG_RESOURCE_DIR in qbsNikolai Kosjar2016-10-211-2/+2
| | | | | | | | | | | | Change-Id: I251567529ec33ef76043006c68749724208cc811 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * clangcodemodel: Use forward slashes for CLANG_RESOURCE_DIR defineFriedemann Kleint2016-10-211-2/+3
| | | | | | | | | | | | | | | | | | | | Adapt qmake and qbs files, fixing warnings on Windows: clangutils.cpp(78): warning C4129: 'o': unrecognized character escape sequence clangutils.cpp(78): warning C4129: 'L': unrecognized character escape sequence clangutils.cpp(78): warning C4129: 'l': unrecognized character escape sequence Change-Id: I7a5fe674665437582457645f2a081e1e38d5df77 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Version bumpEike Ziller2016-10-121-2/+2
|/ | | | | Change-Id: I673bd70a9a0df4466b3e1eb4197162fcbd4b2140 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Project: Disable deprecated functionsOrgad Shaneh2016-10-101-1/+2
| | | | | | Change-Id: Ifd26ab4237664c0887b521e867cf801a65d49fcd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.1'Orgad Shaneh2016-08-052-7/+4
|\ | | | | | | Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
| * 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>
* | Merge remote-tracking branch 'origin/4.1'Orgad Shaneh2016-07-298-19/+19
|\ \ | |/ | | | | Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f
| * Fix qbs build on macOSChristian Kandeler2016-07-288-19/+19
| | | | | | | | | | | | | | "osx" -> "macos" Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Version bumpEike Ziller2016-07-191-4/+4
| | | | | | | | | | Change-Id: I6b125d5c86e8526281c46d1fbf4cebb36b5f592d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.1'Eike Ziller2016-07-113-6/+5
|\ \ | |/ | | | | | | | | | | | | Conflicts: README.md src/plugins/modeleditor/actionhandler.cpp Change-Id: I65c2885593b881eda94872168a3891cab9cafe71
| * 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>
View Lorry Controller Status