Commit Graph

404 Commits

Author SHA1 Message Date
Christian Kandeler
98589279cd Fix qbs build
Change-Id: I1d0d14adf12dbae0014f6b852a29c1eab942be3d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-08-08 04:34:58 +00:00
Eike Ziller
42a8b5b432 Merge remote-tracking branch 'origin/14.0'
Change-Id: Id00d72a8707d122b72d89ed0ecf03ad5ed8230d2
2024-07-11 12:10:59 +02:00
Christian Kandeler
332db8de18 qbs build: Do not use relative paths in Export items
Those will be interpreted relative to the importing product in the
future.

Change-Id: I57f6159053acf1e0334d3289de1f93545e2e871b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-08 14:41:55 +00:00
Christian Stenger
79de38d8cb GoCmdBridge: Add to qbs build
Change-Id: Iac64b8e813f90f727c7469073ea491628ab3014d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-07-03 04:09:37 +00:00
Eike Ziller
06a01d56a5 Bump version to 14.0.0-rc1
Change-Id: I09803077f7387a2ace85a074498c9f503a7d190a
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-06-28 12:35:35 +00:00
Eike Ziller
12c1731489 Merge remote-tracking branch 'origin/14.0'
Conflicts:
	src/plugins/qmljseditor/qmljseditingsettingspage.cpp
	src/plugins/qmljseditor/qmllssettings.h

Change-Id: I49b97101467a6e80653c0f5f3e3fe5801dca5274
2024-06-21 13:54:42 +02:00
Christian Stenger
1ab00ae5ec Fix Qbs build
Amends f5dde31558.

Change-Id: I409b872ccab2bfe825df3c993aaf942d327e9381
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-06-21 05:26:08 +00:00
Eike Ziller
f22660facb Bump version to 14.0.0-beta2
Change-Id: I1ca19c9cb6f7d8bfec665300c23389ba22e93c1e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-14 12:33:32 +00:00
Eike Ziller
a2a5cab07c Merge remote-tracking branch 'origin/14.0'
Change-Id: I240ecca23ec82e54699fcf11ba1d801d0a8c09f0
2024-06-14 11:27:59 +02:00
Marcus Tillmanns
ddd137f3b1 Lua: Move lua plugins into normal plugin folder
Change-Id: I14ab0bb755a4279bc255673596fe084cd556433c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-13 10:26:29 +00:00
Eike Ziller
d49934604b Merge remote-tracking branch 'origin/14.0'
Change-Id: Ia809bda892afe5321aaaca2275f24baaf9569abc
2024-06-12 11:36:13 +02:00
Christian Kandeler
6c6b01faa8 qbs build: Fix building documentation
qdoc needs a new environment variable these days.

Change-Id: I29eb64c2d3ee7555fc99a928971eaccaac8317bf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-06-12 08:30:20 +00:00
Eike Ziller
bb904d878f Bump version to 15.0.0-beta1
Change-Id: Ie40901ed9205ce93f0307cb912d5c626469bc53d
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-06-03 10:25:25 +00:00
Christian Kandeler
73824ad1f2 ClangFormat: Fix qbs build
Prevent LLVM from smuggling -fno-rtti into the command line.

Change-Id: Idc428c8f7e4808233cdc3bcb25e46613573f59b4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-05-31 05:28:40 +00:00
Christian Stenger
f1277f6cf2 Lua: Add lua plugins to qbs build
Change-Id: I4c8428e64c5e322582742e686bf921ebea7df842
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-05-31 04:32:09 +00:00
Eike Ziller
41c781891f Qbs build: Fix copyright year again
Amends the last merge

Change-Id: Ia8d81e77a447345af48d42ed5f3f7fdbbef5eda2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-21 07:14:45 +00:00
hjk
e678da9934 Require C++20
Change-Id: Id6581a4c32ec6411195edb51339f017e4ddb51ff
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-02-22 11:22:09 +00:00
Eike Ziller
5334081270 Bump version to 14.0.0-beta1
Change-Id: I62f28969f68889f628fb37e8a1eb390a62bd6e46
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-02-15 12:57:11 +00:00
Christian Stenger
a5c4c34c9a Raise minimum supported libclang
ClangFormat needs 14.0+ nowadays.

Change-Id: Ib5e38c79c5ec629fed4e5d8da5435769a71b2626
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-15 07:16:28 +00:00
Eike Ziller
58972890cc Bump version to 13.0.0-beta1
Change-Id: Ibdf1ae2189f5dea88e2a02fccf551e3ed159bb02
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-29 09:27:12 +00:00
Christian Kandeler
fca94a8366 qbs build: Fix manual tests
- Remove dependency on project.withAutotests by adding local
{Qt,Cpp}Application overrides that alias QtcManualTest. This way, the
respective products are a QtcManualTest when inside Qt Creator, while
also working outside the source tree.
- Rename QtcManualtest to QtcManualTest. (The reason QtcAutotest is not
camel-cased is because "autotest" is a single word.)
- Plus some minor clean-ups.

Change-Id: Idd77191f0b433d6d7443c639eebda383ab110082
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-20 10:22:21 +00:00
Christian Kandeler
a217fa0c22 qbs build: Clean up testing infrastructure
- Rename ambiguously named "testsEnabled" property to "withPluginTests"
  and fix the wrong uses.
- Move AutotestRunner out of main project file and into tests.qbs.
- Move "withAutotests" property into qtc module. We cannot remove it
  from the main project file just yet, because some manual tests do not
  make use of QtcManualTest at the moment.
- Do not remove the autotests from the project tree if autotests are
  disabled. Instead, just disable the products.

Change-Id: I74a4cc717d9adbe53d37536b2565111e1617115b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-19 13:16:28 +00:00
Christian Kandeler
d00d056b32 qbs build: Remove compatibility code for outdated qbs versions
Change-Id: I2667e0e76dbcf692a25a5d4d5f020ac90f0be478
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-19 09:56:39 +00:00
Christian Kandeler
621902d485 qbs build: Remove left-over "dev package" functionality
This is no longer relevant.

Change-Id: Ib9d851d69c5fc33d4808d883f6bec24fb3d1c4a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-19 09:56:26 +00:00
Christian Kandeler
24f0732d3a qbs build: Do not set minimum OS versions
These requirements come from Qt these days; anything we specify here is
redundant at best.

Change-Id: Ib52d4e80d77cc05ea6d9baa4aa0c88cac2c1a132
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-19 09:56:07 +00:00
Christian Kandeler
bdded29b33 qbs build: Improve some base items
Clean-up, simplification and modernization.
Also fix the bugs uncovered by this.

Change-Id: Ia3a77557f10faf9a901540a55fd6c07a2e986bf5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-18 11:50:09 +00:00
Christian Kandeler
93273af6dc qbs build: Move pluginjson replacements property to the module
... where it clearly belongs.

Change-Id: I22d098b701e4921cde53ab34d11ab0078326ab94
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-14 12:21:46 +00:00
Jarek Kobus
26853ee7a9 Creator: Block the usage of foreach in qbs build
Change-Id: If1fc3a69505cf8c2b7e931861a07991643d5e8d5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-10 12:51:10 +00:00
Eike Ziller
a419670ff5 Build: Change plugin json.in files to CMake style
They were still using variables in qmake style.
Directly use CMake variables in the json.in files and remove the no
longer needed escaping of quotes.

Adds a fatal message if it detects the old style in a .json.in file for
easier porting.

Change-Id: I8de88d8db2da55781f0e9d72eda03f943723188e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-25 13:21:16 +00:00
Christian Stenger
c6a8a76be0 Fix Qbs build
Change-Id: Ic02f12a08990bfa9eb3f0131141407373248bae1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-05 09:21:08 +00:00
Tim Jenssen
d9910058a3 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I91d9877ef6637d21e1106d6d363275295e6b55a3
2023-07-04 20:36:03 +02:00
Christian Kandeler
b12ba08de0 Build systems: Do not put qbs plugins under the qtcreator plugins dir
Otherwise, the extension system will unnecessarily try to load them at
start-up.

Change-Id: I7a932904835cb387e3cf10924ca79a58e5f92b33
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-28 11:22:59 +00:00
Eike Ziller
6836caa14c Do not compile PROJECT_USER_FILE_EXTENSION into plugins
Set it in the app info in the main application and read it from there.
Moves more branding information out of the plugins.

Change-Id: I2f2e9fc96900793be15ac1907df70dda31c1b9c1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-26 06:58:36 +00:00
Tim Jenssen
846f8dba92 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
  tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp

Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e
2023-06-22 14:50:56 +00:00
Eike Ziller
3ff21fe3e1 Bump version to 11.0.0-rc1
Change-Id: I7b6fa9105858996a82584a417520d8e241c9c1e8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-22 12:04:56 +00:00
Eike Ziller
0f9b118776 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ib798dc9922c01b7667388ca03d3a248610f73028
2023-06-20 10:36:06 +02:00
Christian Kandeler
021f0108cb qbs build: Do not declare a Qt dependency for the Ctrl-C stub tool
Change-Id: I75f4a1775b7718ee8d38937557be3bf71efade1f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-19 08:43:47 +00:00
Eike Ziller
db680ebbb6 Bump version to 11.0.0-beta2
Change-Id: I336891b48940457ad878a9c35799e1e8eabae6a0
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-12 06:51:26 +00:00
Burak Hancerli
8af0c065ac QmlProject: Reorganize unittests
Task-number: QDS-9946
Change-Id: Ib165340d13e40c6e8fba08a828ceecb312dd5dde
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-07 13:14:27 +00:00
Eike Ziller
40e7a9826d Bump version to 12.0.0-beta1
Change-Id: I887dc5a098dcb76d5a6ea7e3ba55c46bc974c882
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-25 12:13:44 +00:00
Eike Ziller
c9696fbabb Merge remote-tracking branch 'origin/10.0'
Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079
2023-04-24 08:52:35 +02:00
Christian Kandeler
8ac826a1a0 qbs build: Fix pluginjson module
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>
2023-04-21 08:16:35 +00:00
Eike Ziller
2bc37de42b Merge remote-tracking branch 'origin/10.0'
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
2023-04-13 15:59:08 +02:00
Christian Kandeler
f019dd14e0 qbs build: Fix qtc module
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>
2023-04-04 12:25:19 +00:00
Eike Ziller
dc9fc28ac5 Bump version to 10.0.1
Change-Id: I6828aa83a6ce828a12b30e1a0d942ec64f582cbe
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-03-29 12:34:01 +00:00
Eike Ziller
1df085b9b4 Bump version to 11.0.0-beta1
Change-Id: I6f87635449be080dcc532168c0180945f4ddc02c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-03-24 14:26:44 +00:00
Alessandro Portale
50a214de9e Qbs build system: Add a component for test files groups
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>
2023-03-21 14:54:08 +00:00
Eike Ziller
a50f2620ec Bump version to 10.0.0
Change-Id: I396d3d42deb825e3cd34728e38989a6ad4f09006
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-03-17 12:23:19 +00:00
Christian Kandeler
bffd6b3382 qbs build: Fix gtest_gmock module
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>
2023-03-10 11:47:51 +00:00
Eike Ziller
b7a42f5802 Bump version to 10.0.0-rc1
Change-Id: I3aee0fbdd05a3ebc438c4ff62a43dafb6856e7a7
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-03-06 13:14:30 +00:00