summaryrefslogtreecommitdiff
path: root/qbs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.0'Eike Ziller2023-04-241-1/+1
|\ | | | | | | Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079
| * qbs build: Fix pluginjson moduleChristian Kandeler2023-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | The "product" qualification was missing for "sourceDirectory". This currently happens to work due to scope pollution in the qbs implementation. Change-Id: I61758023d39d00505c586c1e5ad78185a69c0db1 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/10.0'Eike Ziller2023-04-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/plugins/python/pipsupport.cpp src/plugins/qtsupport/exampleslistmodel.cpp src/plugins/qtsupport/examplesparser.cpp tests/auto/examples/tst_examples.cpp Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664
| * qbs build: Fix qtc moduleChristian Kandeler2023-04-041-1/+1
| | | | | | | | | | | | | | | | There should be no symbol "Qt" in that module's scope; it's a qbs bug this worked so far. Change-Id: Iddf69669656b41fa7a7a96b2fae4f6584275812d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Bump version to 10.0.1Eike Ziller2023-03-291-2/+2
| | | | | | | | | | Change-Id: I6828aa83a6ce828a12b30e1a0d942ec64f582cbe Reviewed-by: David Schulz <david.schulz@qt.io>
| * Bump version to 10.0.0Eike Ziller2023-03-171-5/+5
| | | | | | | | | | Change-Id: I396d3d42deb825e3cd34728e38989a6ad4f09006 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Bump version to 11.0.0-beta1Eike Ziller2023-03-241-5/+5
| | | | | | | | | | Change-Id: I6f87635449be080dcc532168c0180945f4ddc02c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Qbs build system: Add a component for test files groupsAlessandro Portale2023-03-211-0/+6
|/ | | | | | | | | Mainly in order to enforce a unified group name across QtC libraries and plugins. Change-Id: I6eafe0f9d227ec73d8c9029675866c67063768fb Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* qbs build: Fix gtest_gmock moduleChristian Kandeler2023-03-101-4/+4
| | | | | | | | | There was a module name appearing where it shouldn't have. This just worked accidentally due to a bug in the qbs implementation. Change-Id: I768b5cefd82f201138e6e07c72867ec8cb62dd2b Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Bump version to 10.0.0-rc1Eike Ziller2023-03-061-3/+3
| | | | | Change-Id: I3aee0fbdd05a3ebc438c4ff62a43dafb6856e7a7 Reviewed-by: David Schulz <david.schulz@qt.io>
* Bump version to 10.0 beta2 and copyright yearEike Ziller2023-02-201-4/+4
| | | | | Change-Id: I633df92077441d6eab1390259769488687803a9f Reviewed-by: David Schulz <david.schulz@qt.io>
* Update qbs submodule to HEAD of 2.0 branchChristian Kandeler2023-02-071-9/+15
| | | | | Change-Id: If53431a0cf8bf412a28e606b0712e0acb26e07f5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Bump version to 10.0.0-beta1Eike Ziller2022-10-051-3/+3
| | | | | Change-Id: Ieb90096775fecfb4bfe1228372a1a3b0d9512faf Reviewed-by: David Schulz <david.schulz@qt.io>
* Fix Qbs build on WindowsChristian Stenger2022-08-171-0/+2
| | | | | Change-Id: I0d03a73731eb02852d34626ef243597214597ee8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Require Qt 6.2 for building Qt CreatorEike Ziller2022-07-111-6/+2
| | | | | | | Change-Id: I43f7bf123e359b4e312269f645a9d26aeeeb6d7a Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <hjk@qt.io>
* Bump version to 9.0.0-beta1Eike Ziller2022-07-081-3/+3
| | | | | Change-Id: If64527bc1f5af72f488a96bb134e70a4194515af Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 8.0.0Eike Ziller2022-07-071-5/+5
| | | | | Change-Id: Ibf884cf0128e6e24e09c0b04e20a4a8ba26313d7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Bump version to 8.0.0-rc1Eike Ziller2022-06-291-3/+3
| | | | | Change-Id: I6784f126f9492a7968027f5edb995c94cc097ca3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qbs build: Fix building with MSVC and Qt >= 6.3Christian Kandeler2022-06-171-0/+11
| | | | | Change-Id: I59439217575bdcc170f38382129fa5f13edb23e2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Bump version to 8.0.0-beta2Eike Ziller2022-06-171-3/+3
| | | | | Change-Id: I02a09e916d11c7ce28b2d58ba7517e582e14be06 Reviewed-by: David Schulz <david.schulz@qt.io>
* Fix qbs buildChristian Stenger2022-04-291-2/+2
| | | | | | | Amends 88781a003ff. Change-Id: I5b44d89cc1b536d0d533cd29fc3a06005a7c80d3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/7.0'Eike Ziller2022-02-222-1/+66
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/mcusupport/mcupackage.cpp src/plugins/mcusupport/mcusupportoptions.cpp src/plugins/mcusupport/mcusupportoptions.h src/plugins/mcusupport/mcusupportoptionspage.cpp src/plugins/mcusupport/mcusupportplugin.cpp src/plugins/mcusupport/mcusupportsdk.cpp Change-Id: Ib423e9f23877176f01b188104b0a179ed32c4770
| * Qbs: Factor out gtest dependency checkChristian Stenger2022-02-221-0/+65
| | | | | | | | | | | | | | ..to make it re-usable. Change-Id: I7653ee7b3ced5fb9d2b7262aecdab12438628928 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Disable -Wmissing-field-initializers when building with GCCChristian Kandeler2022-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | This warning is enabled with -Wextra, but incomplete aggregate initialization is quite common in modern C++ due to direct member initialization, and we make use of that in Creator in several places. Change-Id: I585dd70e7c5c52e4549f1c5e3b8d16cc40b260ce Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Bump version to 7.0-beta2Eike Ziller2022-02-141-3/+3
| | | | | | | | | | Change-Id: Id6c117792e2dbf3a15fcafcc815a243535357f41 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Bump version to 8.0 betaEike Ziller2022-02-111-3/+3
|/ | | | | Change-Id: I03a99d3b134a2116eb12e6d4e98b994d684f133c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Tests: Fix manual plugin view testChristian Stenger2022-02-111-0/+2
| | | | | | | Amends b822b3f9e207. Change-Id: Ibbed286a8626396319738194f417cedc84332011 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Tests: Provide qbs files for some manual testsChristian Stenger2022-02-031-0/+21
| | | | | | Change-Id: I6c5c839dc199379edaf4c43ae4d6a0ed6ebdf751 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix qbs buildChristian Kandeler2022-01-191-1/+1
| | | | | | | Amends 704f239b55. Change-Id: I18a0c52850340a8ed73fe236b6304102f631e370 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/6.0'Eike Ziller2022-01-191-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri Change-Id: I04ea68c9e20dc331b1f12b77c8b6f6b4db38c836
| * Update copyright yearEike Ziller2022-01-191-1/+1
| | | | | | | | | | Change-Id: I42049e2b3a78ee3968e3df7dfea229c3927c3a75 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 6.0.3Eike Ziller2022-01-191-2/+2
| | | | | | | | | | Change-Id: I77600bb39157c7c228e1fd0aee86c4f3ec9e7e65 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 6.0.2Eike Ziller2021-12-171-2/+2
| | | | | | | | | | Change-Id: I4e6fcbded04028bf20433984f0679fafa54da310 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 6.0.1Eike Ziller2021-12-021-2/+2
| | | | | | | | | | Change-Id: Idc7519d7b74968cb6bdb473ff3dabff18ad0cee5 Reviewed-by: David Schulz <david.schulz@qt.io>
| * Bump version to 6.0.0Eike Ziller2021-11-111-5/+5
| | | | | | | | | | Change-Id: I68af70325909705107b2e880011c72d0b75000ae Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 6.0-rc1Eike Ziller2021-10-281-3/+3
| | | | | | | | | | Change-Id: I08fc4a48ad6089e4477230824317ae0f1bd408e5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Bump version to 6.0.0-beta2Eike Ziller2021-10-141-3/+3
| | | | | | | | | | Change-Id: If15ba5f3b6484a7b649baac5bd0eb25147cc10db Reviewed-by: David Schulz <david.schulz@qt.io>
* | Bump requirement to Qt 5.15.2Eike Ziller2022-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5.15.2 includes API that makes transitioning to Qt 6 easier. We currently have workarounds for Qt 5.14 in place that we can remove when requiring 5.15.2, and we also can stop adding workarounds for new code. Change-Id: I920fdccc41d755a6ad39cb5161cd916999fee755 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Robert Löhning <robert.loehning@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Bump version to 7.0Eike Ziller2021-10-081-3/+3
|/ | | | | Change-Id: Icc31b9c768480885593794b59a1997c352ad774c Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Meson: Fix autotestsChristian Kandeler2021-09-161-3/+8
| | | | | Change-Id: I5f690efe9db19ef8ae6f86ed5556b4939bb52a05 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Bump version to 6.0 betaEike Ziller2021-06-291-3/+3
| | | | | Change-Id: I945c2bc0f400191efdfd37523a66ffedee0deb09 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Remove ClangRefactoring and ClangPchManagerEike Ziller2021-06-151-1/+0
| | | | | | | | | | | | This removes the plugins and tools, and removes all the tests that would fail to build because of that. Fixes: QTCREATORBUG-25659 Change-Id: I8adb5d503fc8eea313bcaada421f309dbbfa8c26 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* qbs build: Prefer KSyntaxHighlighting from systemChristian Kandeler2021-05-111-0/+2
| | | | | | | Note that the system package will only be found with qbs >= 1.20. Change-Id: I361b774d6b35fdbd0386144d4e9812f02f7841e5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* qbs build: Use exportingProduct in Export itemsChristian Kandeler2021-05-112-2/+2
| | | | | | | | The use of product in Export items is deprecated and will be removed in one of the next qbs versions. Change-Id: I2644a69012db4a4b4842066784913f4160d3d80a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* qbs build: Make ImageViewer build with Qt 6Christian Kandeler2021-05-101-1/+2
| | | | | Change-Id: If934d2df162e043102ba65d9c3de4fb7fc121540 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.15'Eike Ziller2021-05-101-4/+15
|\ | | | | | | Change-Id: Ic839ab43a723ab22cc83e5b0d823ec6121cb6701
| * sqlite: Fix qbs buildChristian Kandeler2021-05-071-4/+15
| | | | | | | | | | Change-Id: I919fd20c445510231e66c08d3dafd5c1b5696ac7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Revert "Revert "Merge remote-tracking branch 'origin/4.15'""Eike Ziller2021-05-071-10/+1
| | | | | | | | | | | | | | | | | | | | | | This reverts commit f0a86d45104f585b7aeef07fcc68cea24061aedb. Reverting a merge doesn't "undo" it - the changes would be lost forever even with subsequent merges. So we need to revert the revert to get the changes. Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | Revert "Merge remote-tracking branch 'origin/4.15'"Marco Bubke2021-05-061-1/+10
| | | | | | | | | | | | | | | | | | This reverts commit 888ca0dd20ff647970fc85340e108cfa34d78c3a. Reason for revert: wrong patchset Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.15'Tim Jenssen2021-05-061-10/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/libs/sqlite/sqlitebasestatement.h src/plugins/qmldesigner/qmldesignerplugin.cpp Change-Id: I0fa0a8a7feffed24c0d2bc26eca86590f1156755
View Lorry Controller Status