Commit Graph

469 Commits

Author SHA1 Message Date
Eike Ziller
f5dde31558 Move the shipped Lua plugins to the resources directory
On macOS, files in Contents/PlugIns/ need to be codesigned individually.
Since Lua plugins are not really binaries, per Apple's documentation
that is to be avoided (and we currently only sign executables there).

Just move Lua plugins generally to the resources directory, like we do
for other scripts like the debugger Python scripts, and load them from
there.

Change-Id: Idabd6b7c0c7c6e842b1752488cb7073f00e7be49
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-06-20 07:40:46 +00:00
Marco Bubke
dd962c2989 Docs: Add option to build docs by default
Change-Id: I6cb8c2b163f5d01040952aecced287334d616976
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-19 09:01:02 +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
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
hjk
01568f5d75 Warn about deprecated Qt functionality (only) for Qt <= 6.4
These are the once that we could actually handle.

Change-Id: I3c49779e9aabee76d357285a9210062d580f01ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-24 07:29:53 +00:00
Tim Jenssen
ef0ee52bf9 Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
	doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
	src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I3683c1799df05209d05413383456b285a2daf96e
2024-04-23 16:05:55 +02:00
Marco Bubke
b07d2f0c1d Include Qt and GoogleTest as system include
That is silencing warnings in Qt and GoogleTest headers .

Change-Id: Ia6fda019c271788fbb341a8de0cf6d7b757f38bf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-23 11:38:09 +00:00
Eike Ziller
62896a1dd6 Fix Lua plugin installation
- remove stray ;
- add check for wrong arguments
- use qtc_copy_to_builddir which fixes the location and incremental builds

Change-Id: I57fcac03bc9572caf506472ad92046332367e70a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-04-17 11:21:48 +00:00
Eike Ziller
8502b82efd Lua: Avoid CMake 3.20+ API
Amends 08d9cb86a9

Change-Id: Ia44daca4fafaee3aeb0037c3ce0576d5c01746c4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-04-17 10:31:30 +00:00
Marcus Tillmanns
08d9cb86a9 Lua: Add first plugin
Change-Id: I207b986e7ce17aad544f1bdaba29fd4930ad679c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-04-16 13:53:05 +00:00
Eike Ziller
f88ca7be28 Bump version to 13.0.1
Change-Id: I1269daf9f87b95af0814d1b06c93e947a0555675
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-04-05 10:43:27 +00:00
Eike Ziller
7fbb7e0bee Bump version to 13.0.0
and fix copyright year for the Qbs build

Change-Id: If9f9d152c9a8e66274cfbee3198087848e0fe74c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-03-14 15:32:15 +00:00
Eike Ziller
c19f97bd23 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	src/plugins/cmakeprojectmanager/cmaketool.cpp
	src/plugins/python/pythonutils.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Ia3e35c763ff9475d17ad922718b54152209893b8
2024-03-14 11:35:07 +01:00
Eike Ziller
cdad61d08a QmlDesigner: Add optional dependency on LicenseChecker
It is important that the LicenseChecker's initialization (if that is
available) happens before QmlDesigner's, so add an optional dependency
to reflect that.

Add a PLUGIN_MANUAL_DEPENDS option to add_qtc_plugin, which explicitly
specifies the name, version and type. The existing PLUGIN_RECOMMENDS
requires the plugin target to exist to extract the plugin's version.

Change-Id: Ie2cf84e75964ce91ed8bbcdbeee9fa9770bed641
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-13 17:19:07 +00:00
Eike Ziller
ff04dc53ef Require Qt 6.4.3 for building Qt Creator
And remove unneeded conditions from CMake files

Change-Id: Ibb4646f83599c5a91fbd18ce3489103e4150c49f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-04 11:15:36 +00:00
Eike Ziller
3ff56b8079 Bump version to 13.0.0-rc1
Change-Id: I5b4efa41aabce4b007308a53ea9ac291a3a3ad58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-03-01 11:24:18 +00:00
Eike Ziller
a8414effd8 Merge remote-tracking branch 'origin/13.0'
Change-Id: If752e3383b35873b696e8beca27d8838a4096c8a
2024-02-27 09:04:51 +01:00
David Schulz
1a7e1b5dbd Cmake: include textwrap in the generated python zip file
textwrap is required for traceback that is used when the last command
gets debugged

Amends 0a2b6a910a

Change-Id: I7d62dbe2bc0f4e1839f07b9bff687ee1f4e4c885
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-21 11:20:11 +00:00
Eike Ziller
198251db9b Bump version to 13.0.0-beta2
Change-Id: Ia03b43a4e3906350d79a2ba4dbfd800c5f80f77d
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-16 08:17:44 +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
Eike Ziller
65fcb9b746 Help: Update litehtml to v0.9
And adapt the attributions to use the attribution.json from the
qlitehtml repository, so it is automatically in sync.

Fixes: QTCREATORBUG-29169
Change-Id: I96343162880b6aa0e38ee356b3b5f98db4a85cc3
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-15 07:02:23 +00:00
Eike Ziller
2ea3f5382b Merge remote-tracking branch 'origin/12.0' into 13.0
Conflicts:
	cmake/QtCreatorIDEBranding.cmake

Change-Id: Id7ac4d8b397cc20356cfbe30abcf43f53c4d2ff4
2024-02-07 12:22:50 +01:00
Eike Ziller
a8ed2c505a Update copyright year, it's 2024 now
Change-Id: I183b87bf80332c789d000c37fd08f75297031b02
Reviewed-by: hjk <hjk@qt.io>
2024-02-07 09:27:02 +00:00
Mathias Hasselmann
5be8110137 CMake: Fix MinGW builds with BUILD_WITH_PCH=OFF
Set the minimum required Windows version not only for PCH builds, but
also for builds without precompiled headers. While there also increase
the minimum required Windows version: Qt 6 already requires Windows 10.
Therefore its safe to require the same API level for Qt Creator.

Fixes: QTCREATORBUG-30189
Change-Id: Icbbc63657e3c64be1151dda06004234d56e33990
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-01-11 11:32:55 +00:00
Cristian Adam
edb8b0aeb7 CMake: Add QTC_USE_LLVM_LINKER option
llvm-link is faster on macOS than ld64. llvm-link can also be used with
MinGW GCC's ld which is very slow in debug mode.

Change-Id: Ie519f3111e05cfc7dffab2676108a0d53ebe08b2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-01-09 14:28:12 +00:00
Eike Ziller
9954a285f2 Doc: Fix insource build
When implementing acknowledgments via the generated attributions file,
the complete `<qtc_build>/doc/` directory was added as a source
directory for qdoc. For insource builds the build directory is the same
as the source directory, so qdoc would suddenly include all
documentation from `<qtc_source>/doc/`, which mixes Design Studio and Qt
Creator documentation.

Move the generated attributions file into a subdirectory, and only add
that subdirectory. Also fix that attributions were not generated at all
anymore after trying to fix issues when qdoc is missing.

Amends 2ce9f9d97d and
13b48144a6

Change-Id: I689827dabca37c81d4351dec04f23f46503429f6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2024-01-08 11:18:53 +00:00
Eike Ziller
13b48144a6 Doc: Fix configuration if qdoc is missing
As is currently the case for our Debian/ARM binaries.
It was failing when trying to make the html_docs_qtcreator target depend
on the doc_attributions target, because the html_docs target is not
created if qdoc is missing.

Amends 2ce9f9d97d

Change-Id: Ia5b118d6d373f7cc131d6fb9a03555180509b9d4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-12-19 11:16:00 +00:00
Eike Ziller
92d1938ab4 Bump version to 12.0.2
Change-Id: Ia7514eccbb61380a502049cfa9f536981c0cac1f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-18 16:39:52 +00:00
The Qt Project
96f5e56125 Merge "Merge remote-tracking branch 'origin/qds/dev'" 2023-12-15 09:53:53 +00:00
Eike Ziller
2ce9f9d97d Move most acknowledgments to qt_attributions.json
Create a qt_attributions.json and generate a documentation file from it
automatically when building documentation. The result is included as a
table in the acknowledgments page in the documentation.

Some attributions cannot (yet) move to qt_attributions.json, because
that requires the sources to be available in the project's source tree,
which is not the case for LLVM, Clazy, etc.

Remove the attributions from the README and instead point to the
documentation from there, so we get rid of that duplication.

Change-Id: I22623fe7495593ffce2e2c6c26255c27c5a8cb71
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-12-15 09:02:23 +00:00
Tim Jenssen
06bfa66ed7 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I6c657f5b8c0602ca76e9b17b10f1ff7a38b1b8be
2023-12-14 19:50:03 +01:00
Tim Jenssen
d186d9df6a Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I0a598ba1b4d57be361a7a203d0c39e99b5cd5fba
2023-12-13 14:53:17 +00:00
Tim Jenssen
60d23bff03 CMake: make sure that deploy.py errors get caught
Change-Id: I05f818145ed29f4521bddc36051ae504c13278d7
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-27 13:45:16 +00:00
Eike Ziller
c3907bf781 Bump version to 12.0.1
Change-Id: Iac214602e3bfef975c8e4083ba251a652ed1ebc7
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-27 09:05:16 +00:00
Eike Ziller
702f4393f9 Bump version to 12.0.0
Change-Id: I47191ac3dcbfbde7f39bf2d322f8db488648aa35
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-13 08:40:38 +00:00
Eike Ziller
e6a39128f5 Merge remote-tracking branch 'origin/12.0'
Change-Id: Ib9f8b81d60162a8b01e7c627ba54901af68afa98
2023-11-10 11:23:21 +01:00
Cristian Adam
f90f60bb32 CMake: Fix QTC_STATIC_BUILD
Change-Id: Idfcd36f2d5fdaf09c958ff101aa5e83e0a29cb58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-10 10:11:18 +00:00
Eike Ziller
5bdd3f8e1d Bump version to 12.0.0-rc1
Change-Id: I3b687e44c90dc18bb0d48bb47f230d8de6c8ca66
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-10-26 13:52:39 +00:00
Eike Ziller
0aded7311a Bump version to 12.0.0-beta2
Change-Id: I739670e5cf1d8c99c18d6fb30d1dd7a825e295cf
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-10-13 11:24:31 +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
Tim Jenssen
1a3a8ecc96 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: Id242ab4ca485527defdcc1555d204e12e50ddb7a
2023-09-14 17:37:24 +02:00
Tim Jenssen
a603b65f18 Merge remote-tracking branch 'origin/11.0' into qds/dev
Change-Id: I2bf1a2a72d9765d9b4088840414b4933644db47a
2023-09-14 12:23:01 +00:00
Marco Bubke
9e60df9f7f CMake: Silence warning in third party code
Adding SYSTEM_INCLUDE for which you get no warnings. Fix
PUBLIC_SYSTEM_INCLUDE to work for all cases where PUBLIC_INLCUDES works.

Change-Id: I7059c2879004743c13c368220596081dd054407a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-07 08:53:43 +00:00
Christian Kandeler
fb4177a540 cmake build: Set the WITH_TESTS macro also in the tests themselves
Otherwise plugin and test code might parse header files differently.

Change-Id: I0243a7780b7095a4c518da26cc3cf23fd9f76cf5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-31 13:05:04 +00:00
Eike Ziller
fe18525326 Build/deploy: Move copying qtdiag to deploy.py
Moving things away from deployqtHelper_mac.sh

Change-Id: Ic71ad9a8ed522dc8c4eaa745ec519d9d705d1073
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-28 10:12:59 +00:00
Eike Ziller
6c9d4a60e0 Update yaml-cpp to 0.8.0
With removal of unneeded files similar to the original import,
the patch in patches/0001-... generated with

    git format-patch -D HEAD~1

to show just the removed files.

Change-Id: Ibfe64439bae5d1b1baa6b6bc47caf1ae030b3f9d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-28 06:29:55 +00:00
Eike Ziller
c9fd5465eb Merge remote-tracking branch 'origin/11.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I0b0394dd68cf89b2579d623af897f55dc01aeea5
2023-08-25 11:50:14 +02:00
Eike Ziller
170f9acfb4 ClangTools: Add support for yaml-cpp 0.8
They renamed their target from `yaml-cpp`
to `yaml-cpp::yaml-cpp`

Still support < 0.8 though.

Fixes: QTCREATORBUG-29537
Change-Id: Iafa6e75998f0120610542b4c744b205aee3392a3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-25 09:21:42 +00:00
Eike Ziller
5f8fdc4e9e Bump version to 11.0.3
Change-Id: I9ab3fb0158eee32c8019635bcd9aae2455df98f7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-24 08:29:28 +00:00
Marco Bubke
22166404f3 QmlDesigner: Use system includes for google test
System includes are silencing warnings.

Change-Id: I7d7954e01a28f94aa5983cfc44eba976d97b0311
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-23 10:50:09 +00:00