aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 4.13.1Eike Ziller2020-08-261-2/+2
| | | | | Change-Id: I94246bd22b4868f5c99f334d1360c88ea136d24c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.13.0Eike Ziller2020-08-141-5/+5
| | | | | Change-Id: Id1d2ebca1c2bca86683a3172bfe2f95123e1b897 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 4.13.0-rc1Eike Ziller2020-07-271-3/+3
| | | | | Change-Id: Icc4b98903a16d05d978ad27c2aeffac8dbf22227 Reviewed-by: David Schulz <david.schulz@qt.io>
* Bump version to 4.13 beta2Eike Ziller2020-07-141-3/+3
| | | | | Change-Id: I836987b4c4e28c65cb67c2efba595ed92d071b6a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* sqlite: Fix qbs buildChristian Kandeler2020-06-161-0/+49
| | | | | | | | | Exporting the full sqlite interface can lead to run-time conflicts with the system sqlite that Qt's SQL support pulls in. So re-build the sources for the unit test, as in the qmake build. Change-Id: I8394b9c0aa4e21704bc84600f40b8f5d706ad66d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* qbs build: Add autotest dependency to QtcAutotestChristian Kandeler2020-06-041-0/+2
| | | | | | | So we can easily mark tests as flaky via build properties. Change-Id: Ib1ad8e212980c9eb5622534fb9b20ad31128b91e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Disable ClangRefactoring by defaultEike Ziller2020-06-021-1/+1
| | | | | | | | | | It is too unstable even for experimental status. Change-Id: I38e483eaece00aec0211a81414c6c5a000bf283f Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* qbs build: Make clang plugins build with libclang-cppChristian Kandeler2020-05-262-14/+9
| | | | | Change-Id: Ifbae5f2a124e5c36126391d48b0a186bd153d678 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-261-1/+2
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: Ic39945a0e3e140a9467b4b4f572929257ff3a324
| * qbs build: Clang: Adapt llvm-config variants to check forNikolai Kosjar2020-05-221-1/+2
| | | | | | | | | | Change-Id: Ib961efe9b72acdfc383cade2053a4a1126e99132 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Bump version to 4.12.2Eike Ziller2020-05-221-2/+2
| | | | | | | | | | Change-Id: I734d8571ab672cbbccaebe6d3d1a97cd15f31831 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-152-1/+8
|\| | | | | | | | | | | | | Conflicts: src/plugins/mcusupport/mcusupportsdk.cpp Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6
| * qbs build: Take differences between clang and "apple clang" into accountChristian Kandeler2020-05-121-0/+1
| | | | | | | | | | | | | | | | In particular, clang with version number 10 is not really clang 10 on macOS. Change-Id: I8be489fa9cffd63c1ea8f13d181686ab1a575ec6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * qbs build: Fix excessive clang 10 warnings for qbs submoduleChristian Kandeler2020-05-111-1/+7
| | | | | | | | | | Change-Id: Ie1bb9833e00412d753b32c8267a9e9413aa66a7d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-05-063-1/+10
|\| | | | | | | Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
| * qbs build: Disable clang tooling plugins for llvm >= 10Christian Kandeler2020-05-052-1/+5
| | | | | | | | | | | | | | They won't build with the new version. Change-Id: I77c94817290418b0a97222465f0f8a8660053fae Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Qbs build: Suppress excessive warnings from Qt with clang 10Christian Kandeler2020-05-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We get these thousands of times: /usr/include/qt/QtCore/qbytearray.h:586: warning: definition of implicit copy constructor for 'QByteRef' is deprecated because it has a user- declared copy assignment operator [-Wdeprecated-copy] inline QByteRef &operator=(const QByteRef &c) ^ /usr/include/qt/QtCore/5.14.2/QtCore/private/qmetatype_p.h:111: warning: use of logical '||' with constant operand [-Wconstant-logical-operand] Change-Id: I5f97f23d9b62ef1cd8d07495c46598d2a34a6d85 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Bump versionEike Ziller2020-04-281-2/+2
| | | | | | | | | | Change-Id: Ieb662d20d5bba2e410039bcdeb2459129601187a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version -> 4.12.0Eike Ziller2020-04-081-5/+5
| | | | | | | | | | Change-Id: I6894b5b095393981d9d42569ad43024e40711f94 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Update minimum Qt for Qbs buildsChristian Stenger2020-04-021-1/+1
| | | | | | | | | | Change-Id: I5920b5c1bcdd0f186c9de6c1bb690334a5193051 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Bump master->4.13.0-beta1Eike Ziller2020-03-201-5/+5
|/ | | | | Change-Id: Ia25db16341e45f75c893c21c159775fd3428b538 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump versionEike Ziller2020-03-191-3/+3
| | | | | Change-Id: I1139e1c10311fda9f46367dcb397fa674050f7da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version -> 4.12 beta2Eike Ziller2020-03-061-3/+3
| | | | | Change-Id: I9da6834efe5d1423dc3d5a47d9472c50dc26d44c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Qbs: Fix QC version brandingChristian Stenger2020-02-131-1/+1
| | | | | Change-Id: Idb15a97db6637c0218053c3754e09716a52a2f96 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.11'Eike Ziller2020-02-071-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I4e339410b17df4098f17e3bb621e1c02e3f8026b
| * Bump version to 4.11.2 and copyright year to 2020Eike Ziller2020-02-061-3/+3
| | | | | | | | | | Change-Id: I8e97c8f3e38dd1a6fe64e47cd30d73d3d5622425 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Version bump to 4.11.1Eike Ziller2019-12-161-2/+2
| | | | | | | | | | Change-Id: I31c53f92acd02c380e44ecea534b178a3fb5458c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 4.11.0Eike Ziller2019-11-291-5/+5
| | | | | | | | | | Change-Id: I167a84606f707529e21c208d019241ed8d7c0ce0 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | qbs build: Add litehtml supportChristian Kandeler2019-12-191-0/+2
| | | | | | | | | | Change-Id: Ia78ab35a5e844d5b2a1ee18752445c887228981f Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Update version to 4.12 betaEike Ziller2019-12-061-5/+5
|/ | | | | Change-Id: I13641e62b01b126493be852e5db3ef76044918f7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* macOS: Fix execution of helper executables with UIEike Ziller2019-11-051-1/+1
| | | | | | | | | | | | | | The qt.conf that is written into the Resources/ folder is used for the main Qt Creator executable, so that cannot be used for the helper executables. Move the executables one more level down and add a separate qt.conf for them. Fixes: QTCREATORBUG-23120 Change-Id: Icd8842d246a1bc0e8d44656e2bc580d6698afbda Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Bump version -> 4.11.0-rc1Eike Ziller2019-11-041-3/+3
| | | | | Change-Id: I495bd3961c718a2090ac1999f56c195e95cd53b1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version -> 4.11 beta2Eike Ziller2019-10-211-3/+3
| | | | | Change-Id: Iea7b87cc19309eb4c3a921fa29d1b40170aaacc8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.10'Tim Jenssen2019-07-121-1/+8
|\ | | | | | | Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728
| * qbs build: Suppress GCC 9 warnings also in qbs submoduleChristian Kandeler2019-07-091-1/+8
| | | | | | | | | | | | | | Amends 7b2d41a972. Change-Id: I3500b57fa2424f522ffe16e5413a7593601215c0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Tim Jenssen2019-07-041-7/+11
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/libs/utils/synchronousprocess.cpp src/plugins/baremetal/iarewtoolchain.cpp src/plugins/cmakeprojectmanager/cmakeproject.cpp tests/unit/unittest/CMakeLists.txt Change-Id: I124ad492df403286751e175d27fe36487ddf6d07
| * qbs build: Suppress some GCC 9 warningsChristian Kandeler2019-07-021-7/+11
| | | | | | | | | | | | | | | | Otherwise, we get thousands of warnings from Qt, e.g.: qvariant.h:275:25: warning: implicitly-declared ‘constexpr QVariant::Private& QVariant::Private::operator=(const QVariant::Private&)’ is deprecated [-Wdeprecated-copy] Change-Id: I8b3bbfae6791adca8bcfacc7ad5ab46701474aa4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Bump version to 4.10.0-rc1Eike Ziller2019-06-281-3/+3
| | | | | | | | | | Change-Id: I95991a4f46be2f2bc1600ca38d14b9b03269fc0b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.10'Eike Ziller2019-06-211-3/+3
|\| | | | | | | Change-Id: I452d5cbf27c1a0d43a890cef74cb8f0b9646bf60
| * Bump versionEike Ziller2019-06-201-3/+3
|/ | | | | Change-Id: I5d2298e71837e3c146196f75a9bd1472771f1949 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Centralize -Wno-comment for GCCOrgad Shaneh2019-04-231-1/+4
| | | | | | | It's also needed in clangrefactoringbackend, unittest etc... Change-Id: I9c758d52b34798d75610a4633bc7c5e7ceb0c00b Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Clang: Fix build with clang-8Ivan Donchevskii2019-04-171-2/+2
| | | | | | | | | | Clang-Tidy checks and Clazy flags updated. CLANG-UPGRADE-CHECK done. Change-Id: I1ca585c5c3c77a7f183719df9c262603150914e8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Qbs: Enable ClangRefactoring by defaultOrgad Shaneh2019-04-111-1/+1
| | | | | | | This amends commit 89e70ca785df08b448997927d7c28145f599857f. Change-Id: I09f7075075e2244a031e4c20496272f382ec020d Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Merge remote-tracking branch 'origin/4.9'Orgad Shaneh2019-03-012-1/+5
|\ | | | | | | Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181
| * Fix build of command-line qbs with qbsChristian Kandeler2019-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | The plugin path we pass as a define to the qbs sources contained the "/ qbs/plugins" suffix which qbs already adds itself. Therefore, the command-line qbs was not functional. Change-Id: I2bfb967f998e69bbe4da760a1f517e1f40e4f055 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Clang: Build clangformat only if clang/Format/Format.h existsNikolai Kosjar2019-02-211-0/+4
| | | | | | | | | | | | | | ...in the LLVM_INSTALL_DIR. Change-Id: I974f32759bca7fb467524bf61ff7967098748f0e Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Bump minimum Qt version (to build Qt Creator) to 5.11Alessandro Portale2019-02-151-1/+1
| | | | | | | | | | | | | | | | | | Recent adaptations to Qt 5.13's API deprecations require using APIs which were introduces in Qt 5.11. Change-Id: I6c077d824c9ce716e019543b290c355a5d512fad Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.9'Eike Ziller2019-02-081-1/+1
|\| | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: I278bc79cb64705471b360d0b8d06a8db17db7904
| * Merge remote-tracking branch 'origin/4.8' into 4.9Eike Ziller2019-02-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0
| | * Bump copyright yearEike Ziller2019-02-071-1/+1
| | | | | | | | | | | | | | | Change-Id: I532c92311fda448fc272ab31e26ad562d9fb3ce5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>