Commit Graph

488 Commits

Author SHA1 Message Date
Tim Jenssen
b4061e223e Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I907e067abba640d27313ce03bc41326d3ed750f0
2024-08-06 19:04:41 +02:00
Tim Jenssen
0d571b5e95 QmlDesigner: add IS_SUPPORTED_PROJECTSTORAGE_QT
It also can be overwritten by option:
IS_SUPPORTED_PROJECTSTORAGE_QT
or environment variable:
QTC_IS_SUPPORTED_PROJECTSTORAGE_QT

Change-Id: Iabc7d59ff100017811167a6ec4e7447ccc3e55ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-08-06 15:20:24 +00:00
Tim Jenßen
d386756cbf QmlDesigner: AppleClang != Clang
Change-Id: I17cb393f384f916aa10678eac840c9632f245298
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2024-07-30 08:39:34 +00:00
Tim Jenssen
e5d8d1cef0 Merge remote-tracking branch 'origin/14.0' into qds/dev
Change-Id: I1c354102209ba0c3505e3e2745e64ce77cc22bb3
2024-07-23 15:28:59 +02:00
hjk
851c69bea8 CMake: Adapt deprecation macros
Qt 6.8 has apparently changed from a *BEFORE to an *UP_TO naming scheme
in 816071d44012. As we need also pre-6.8 builds we better have both.

After talking the change's author it seems to be ok to use the same
numbers.

Change-Id: I451dc9ac9c842405f5f36a04079b4284a42a2378
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-18 11:32:13 +00:00
Eike Ziller
7dab192007 Bump version to 14.0.0
Change-Id: I4c85e3faa9d22bbf05db94fc76adec2aa215dcaa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-12 08:32:08 +00:00
Tim Jenßen
93588dbee2 Merge remote-tracking branch 'origin/14.0' into qds/dev
Conflicts:
	doc/qtdesignstudio/src/how-to/qtdesignstudio-live-preview-desktop.qdoc
	qt_attributions.json
	src/libs/sqlite/CMakeLists.txt
	src/plugins/qmldesigner/CMakeLists.txt
	src/plugins/qmldesignerbase/QmlDesignerBase.json.in
	src/plugins/qmlprojectmanager/CMakeLists.txt
	src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.cpp
	src/tools/qml2puppet/qml2puppet/instances/qt5import3dnodeinstanceserver.h

Change-Id: If33e41d8951a49acaba0a74c3e5848eef52bb945
2024-07-10 18:11:28 +02:00
Tim Jenssen
d4047417bd QmlDesigner: GCC is still 10 on build machines
Task-number: QDS-13124
Change-Id: Ie0eeda920a87fbebc7ad4f897b62e0596cb40702
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-07-01 10:56:20 +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
Tim Jenssen
3a13e0a561 QmlDesigner: WITH_QMLDESIGNER_DEFAULT OFF if compiler is too old
Change-Id: I6b54434273da92bdff9b81076e0cbf47e07cd3d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-06-25 09:44:08 +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
Marco Bubke
b2c85538b1 Add Design Studio for Linux
Add AppStream data and desktop file for Design Studio.

Change-Id: Icc5cca03a3c0945a2f90b39fdd4c7dcecd0e8d6b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-06-20 08:57:36 +00:00
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
Eike Ziller
afde8fd1a7 Merge remote-tracking branch 'origin/14.0'
Change-Id: I5e5ffe1b986fd8b4e5d60c9a5864541747ef890c
2024-06-19 11:30:02 +02: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
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
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
Marco Bubke
700c77cdd6 Remove INTERFACE_COMPILE_OPTIONS
Change-Id: Iea2692d2d6569da3154a6fa64c3b00286a1724c0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-29 08:01:14 +00:00
Marco Bubke
95fc49c4ac Add compile options to cmake declarative interface
It offers an clean interface to disable warnings

Change-Id: Ia19360994d7ca439d067d2370d001d5aeae3999d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-05-28 18:22:11 +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
cbd36f93fa Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: Ief07ead0b4cf513c70bd74d4f5e28e4642edc78e
2024-05-17 17:57:18 +00:00
Eike Ziller
717a6ce8a0 Bump version to 13.0.2
Change-Id: I69a59c32fbfe699c788c15e64557a9a02b4c186c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-05-14 06:55:08 +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