Commit Graph

86167 Commits

Author SHA1 Message Date
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
Henning Gruendl
e6cc2eeba6 QmlDesigner: Fix unfocused TextField selection
Change-Id: Idd5438fa77d4aa783f71a6826b3e2234da326c34
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-12-19 10:44:25 +00:00
David Schulz
ec0d539b39 Pydap: fix unused parameter
Change-Id: I8b389129d861b9f138c3faa3eaf5c4317afffd09
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2023-12-19 10:07:42 +00:00
Eike Ziller
b37cd984db Merge remote-tracking branch 'origin/12.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I937d301156dac0d20b43e7a14b41a319eff57698
2023-12-19 10:55:55 +01:00
Alessandro Portale
fc3291afed Utils: Proliferate use of <utils/mimeconstants.h>
This deduplicates several mime type strings.

Change-Id: Ib1746387e233ca5b7134e65859b5ec1c7832b8e4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-19 09:38:10 +00:00
Alessandro Portale
1c0ce68410 Utils: Turn the names of Constants::GLSL_* conformant
The names in mimeconstants.h usually end with "_MIMETYPE"

Change-Id: I593383f17519ff1ad77caf419210d33761748f38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-19 09:37:53 +00:00
Miikka Heikkinen
6bf7ae11a0 Effect Maker: Change blur helper to match helper on qtquickdesigner
When running effect in project, source property for effect doesn't
seem to have actual dimensions, so use the root item dimensions.

Task-number: QDS-11542
Change-Id: Ibc4053224de8882dead338f1833bf65397f5eac3
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-12-19 09:16:00 +00:00
Miikka Heikkinen
2d166d0839 Effect Maker: Notice property changes in helper nodes
Property changes in helper nodes are now properly noticed as unsaved
changes.

Change-Id: I757f519075d2f96be2b84b57b25b916665e26ba7
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-12-19 09:15:49 +00:00
Miikka Heikkinen
c6b6a64e24 Effect Maker: Fix for case sensitive file systems
Helper node .qen are all lowercase, so use lowercased node ids as
filenames are generated from those.

Change-Id: I86ae7b07dbc30b7a68e0ee9214213d83d4e5dbd3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-19 09:15:38 +00:00
Alessandro Portale
9b285cdcd2 Wizards: Fix paths in QtQuickApplication/QDS wizard
Amends: e2c1cfb69f

Change-Id: Ib0a0bd0238dfdc1d40c90dd73f5d622c7baf4536
Reviewed-by: hjk <hjk@qt.io>
2023-12-19 09:11:23 +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
Eike Ziller
38176623eb Doc: Move acknowledgments for binary components to table
Remove reference to OpenSSL, we do not ship it anymore.
Move Qbs to the other acknowledgments of components included in the
binary packages.

Change-Id: I964badc80568c0b5fd09be65231d9b77d34fa4b9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2023-12-18 16:28:19 +00:00
Pranta Dastider
1c4a2ade1d QmlDesigner: Document Jump to the Code feature
This patch documents the jump to code features. It allows
users to instantly jump to code specific for a component,
state or connection.

Fixes: QDS-11132
Change-Id: I4483dda8dd6a899ddee017196e697008f4be0fcd
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2023-12-18 15:39:25 +00:00
hjk
6c5cd8216a Core: More ActionBuilder use in icore.cpp
After introducing ActionBuilder::setSeparator().

Change-Id: I54e89aae66c4e4a6f2073df6287140c41da887d8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-18 15:36:05 +00:00
David Schulz
9ccf019896 Debugger: install debugpy package into user resource dir
This avoids the need to install the package into every python and
virtual environment.

Change-Id: I0b7735c7ccef8bcd7c969c40c71f0a3d5a301a10
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-18 15:24:46 +00:00
hjk
91050d376f Make a few things C++-20 compatible
Change-Id: Ie9756a996efe435d1b6f493a0687d063b3287423
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-12-18 13:46:55 +00:00
hjk
2632f99123 Tracing: Fix compile error
ff7d69daf in Qt base added a static assert.

In file included from /data/dev/creator/src/libs/tracing/timelinetracemanager.cpp:6:
In file included from /data/dev/creator/src/libs/tracing/timelinetracemanager.h:8:
/data/dev/creator/src/libs/tracing/traceeventtype.h:45:1: error: static assertion failed due to requirement '!isRelocatable || std::is_copy_constructible_v<Timeline::TraceEventType> || std::is_move_constructible_v<Timeline::TraceEventType>': Timeline::TraceEventType is neither copy- nor move-constructible, so cannot be Q_RELOCATABLE_TYPE
Q_DECLARE_TYPEINFO(Timeline::TraceEventType, Q_MOVABLE_TYPE);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/data/dev/qt-6/qtbase/include/QtCore/../../src/corelib/global/qtypeinfo.h:173:12: note: expanded from macro 'Q_DECLARE_TYPEINFO'
template<> \
           ^
/data/dev/qt-6/qtbase/include/QtCore/../../src/corelib/global/qtypeinfo.h:166:5: note: expanded from macro '\
Q_DECLARE_TYPEINFO_BODY'
    static_assert(!isRelocatable || \
    ^             ~~~~~~~~~~~~~~~~~~~
/data/dev/creator/src/libs/tracing/traceeventtype.h:45:1: note: expression evaluates to 'false || false'
Q_DECLARE_TYPEINFO(Timeline::TraceEventType, Q_MOVABLE_TYPE);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/data/dev/qt-6/qtbase/include/QtCore/../../src/corelib/global/qtypeinfo.h:173:12: note: expanded from macro 'Q_DECLARE_TYPEINFO'
template<> \
           ^
/data/dev/qt-6/qtbase/include/QtCore/../../src/corelib/global/qtypeinfo.h:167:55: note: expanded from macro '\
Q_DECLARE_TYPEINFO_BODY'
                  std::is_copy_constructible_v<TYPE > || \
                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
1 error generated.

Change-Id: I68c963f6b2856e9aca3e8be65ac177456a02a875
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-12-18 13:34:00 +00:00
hjk
38d185e363 tests/unit/tests/mocks/sqlitereadstatementmock.h: Fix warning
sqlitereadstatementmock.h:267:25: note: default constructor of 'SqliteReadStatementMockBase' is implicitly deleted because field 'databaseMock' of reference type 'SqliteDatabaseMock &' would not be initialized
    SqliteDatabaseMock &databaseMock;
                        ^
sqlitereadstatementmock.h:31:37: note: replace 'default' with 'delete'
    SqliteReadStatementMockBase() = default;
                                    ^~~~~~~
                                    delete
1 warning generated.

Change-Id: Ia0f9a3f2e692585f509048d35fb01b380e2af035
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-18 13:27:56 +00:00
Ali Kianian
a3b58d9107 QmlDesigner: Fix the bug for QRegularExpression in dataStoreNode
Change-Id: Ibe6dff5d5304ec4e48a4f7239a3811feee455f8c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-18 13:04:03 +00:00
Artem Sokolovskii
3ee8be9a54 DAP: Fix Python debug breakpoints
Note:
IgnoreCount works differently in Python engine, this
needs futher investigation.

Change-Id: I6bfbd444267810df7c807c2193dd445f6dbc3865
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-12-18 11:53:02 +00:00
Eike Ziller
d63ac7a004 Doc: Add syntax highlighting files to qt_attributions.json
Group by naming.

Change-Id: I467a6b0ca3f1c2b5168207e925fde45855cf96ce
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2023-12-18 11:10:24 +00:00
Eike Ziller
d27e905585 GitHub: Fix macOS deployment target
Qt 6.6 only supports 11.0 or later

Change-Id: I8d429bef61c75179a2b1ecefdb8b7de3c21e11a9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-18 11:09:56 +00:00
hjk
570344b066 LSP: Avoid running strlen() on json keys
This feels better when stepping through the code but doesn't
really make a difference in the profile.

Change-Id: I2c30578bf1e990b039caadb8b8ce532f009b775d
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-12-18 10:30:30 +00:00
Artem Sokolovskii
d8561ccb2d SyntaxHighlighter: Fix tst_highlighter
Change-Id: I96c6c7b9843384d14bfa37b6bfdd494c881949af
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-12-18 09:00:57 +00:00
Eike Ziller
859dd3a414 Doc: Fix supported macOS platform
Qt 6.6 only supports macOS 11.0 or later

Fixes: QTCREATORBUG-30084
Change-Id: Ic7e83633b8b3e47602d75c65657db88e9381c874
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-12-18 08:57:40 +00:00
Eike Ziller
75819c4903 Doc: Move attributions to kate highlighting files to table with links
Change-Id: I676129d9880869de75e3f73a8675271e690a0d50
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2023-12-18 08:57:12 +00:00
Orgad Shaneh
4f5b24d589 QtAppManager: Fix typo in json description
Change-Id: I606039de38ba28a7a35711bc13d24eb65325453e
Reviewed-by: hjk <hjk@qt.io>
2023-12-18 07:39:46 +00:00
Dominik Holland
d129956b0b Import of the QtApplicationManager plugin source code
The plugin will be developed as part of QtCreator in the future and
also be released under the GPLv3 license.

Change-Id: I673519161e105982d68f0c4ebbc06e6d7a6f91ac
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-15 14:58:55 +00:00
Ali Kianian
f41b69159b QmlDesigner: Extract unique property name by collection name
- The property names of the data store are defined after converting
collection names to a proper unique property name.
- Now, Spaces are supported in the collection names.
- Collection property names will remain the same by collection
renames, and only the modelName will change

Task-number: QDS-11462
Change-Id: I2031c2e0a9afc5388386dc6e54c66e75f0d13ded
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
2023-12-15 14:08:21 +00:00
Eike Ziller
b2199ec59d Debugger: Fix saving (legacy) state
Since dd9f9c799b we not only save the dock
widget state as the state of Perspectives, but the whole FancyMainwindow
state, so other properties from FancyMainWindow like the side bar state
is saved too.

The conversion from "legacy" to "new" state information was only done
when saving the state of perspectives when switching them (and for the
active Perspective at shutdown). The code that serialized that into
settings was expecting "new" state information, which was not true and
lead to soft asserts.

Do the conversion directly when reading settings instead.

Change-Id: I588fcf49bb7195100030266e5752358b7e734113
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-12-15 13:13:40 +00:00
hjk
3771eb196b CppEditor: Use ActionBuilder
Change-Id: I2590d77b73ebbcd3856f259201b874a112e12900
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-12-15 12:38:22 +00:00
Artem Sokolovskii
508a961c1c SyntaxHighlighter: Add QTC_USE_THREADED_HIGHLIGHTER env variable
QTC_USE_THREADED_HIGHLIGHTER allows to opt-in or out threaded
highlighter. It is on by default.

Change-Id: I3e84f6f80101db5869a45c84cf1e8a8196c02be8
Reviewed-by: hjk <hjk@qt.io>
2023-12-15 11:12:36 +00:00
Jarek Kobus
1a07fa87fd CollectionSourceModel: Avoid using sender()
Amends 6eb522f0ca
Amends 01a4f087c6

Change-Id: Ifa1be7cd2a39e6910160a4383fd9a1c1ce743731
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-12-15 11:07:39 +00:00
hjk
4de2ec6bb7 Core: Some ActionBuilder API polish
Change-Id: I8a59b5dd9277833361a7c8ed848e2da80972afcb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-15 10:51:18 +00:00
Orgad Shaneh
b1413e35f0 CMake: Fix implicit size_t -> int warnings
Change-Id: I6261faad372050fba118f5f5d8db91207d94f941
Reviewed-by: hjk <hjk@qt.io>
2023-12-15 10:44:30 +00:00
Orgad Shaneh
c4c9af1bd8 Tasking: Fix implicit size_t -> int warning
Change-Id: I19b359a941175034444fc9b3febed22a8fbc2cd0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-12-15 10:44:25 +00:00
Jarek Kobus
efc63c8ffb NodeListDelegate: Get rid of unused functions
Amends 1a402984da

Change-Id: I518c2bcc638f295b1540361c633af045c0caf524
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
2023-12-15 10:43:18 +00:00
Jarek Kobus
53c4fb0243 EventListDelegate: Avoid using sender()
Amends 1a402984da

Change-Id: I635febfb3c9b3f51a8155491a2e3d8edeb3647c9
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
2023-12-15 10:42:50 +00:00
Robert Löhning
1f69ea54a0 SquishTests: Let tst_openqt_creator test for fixed bug again
This partially reverts commit f52c92bfe5.

Task-number: QTCREATORBUG-29923
Change-Id: I166aaca27cf8e27cb8555748c76ab163fabe7dcb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-12-15 10:08:57 +00:00
hjk
9f342fb396 CMakeProjectManager: Use ActionBuilder for build file action
Previously, ActionBuilder could not handle ParameterActions.
Now it can.

Change-Id: Icfe203c63d5f84198ff88864699acba55516cb25
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-15 10:00:26 +00:00
hjk
aff66f9060 ClangFormat: Simplify menu action handling
Change-Id: Ic4a5a6023c2f8f43b30010c14e245d0879da9ab1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-15 09:58:58 +00:00
The Qt Project
96f5e56125 Merge "Merge remote-tracking branch 'origin/qds/dev'" 2023-12-15 09:53:53 +00:00
Jarek Kobus
2dc30f161d TaskTree: Drop unneeded typename
Change-Id: Iab7895028e182715c98178eeb856fae76dc3eda9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-15 09:30:12 +00:00
Jarek Kobus
2df2ca2acf Algorithm: Simplify template code
Amends 650ab0841b

Change-Id: Ic6f1e38f6c498cacc1e21f07e9d383351c2cdb5c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-12-15 09:25:35 +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
Mats Honkamaa
0b32abdb31 Doc: Update Fire Particles tutorial
Fixes and updates:
- Added more screenshots
- Improved descriptions of properties
- Fixed errors
- Improved text in general

Task-number: QDS-11184
Change-Id: I8c6d26758e8e86512e736ecffd9e0a15c479e632
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-15 08:36:43 +00:00
Ali Kianian
08d7dcc46b QmlDesigner: Fix the bug for adding rows to a Collection
After adding a row to the model, TableView reads the whole model except
one cell. It also ignores all the further notifications for that cell
even if we notify it explicitly. By notifying a model reset, this will
be solved.

Fixes: QDS-11248
Change-Id: I92cc7be5f82bc9acd2f9695f6f6a306ef003b78c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-15 08:06:36 +00:00
Christian Stenger
309d238f7b FakeVim: Persist fakevim settings when enabling globally
Explicitly persist settings if enable FakeVim mode gets triggered
using the global shortcuts, otherwise we would enable the FakeVim
mode only temporarily and a restart of Qt Creator would use the
former mode again.

Fixes: QTCREATORBUG-29949
Change-Id: I457b32f8e5fe035e334ed51f358f374c85ab010b
Reviewed-by: hjk <hjk@qt.io>
2023-12-15 08:04:03 +00:00
Jarek Kobus
bc1f1c3719 QmlDesignerPlugin: Restore emitUsageStatisticsUsageDuration
It is still used in assetimporter.cpp.

Amends 80b3c9c35f

Change-Id: I53aad38072d6b0ae1e120a539a1f2fc713f5730d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-12-15 07:27:18 +00:00
Jarek Kobus
ea0d814905 QmlDesignerPlugin: Use QWidget::isAncestorOf()
Change-Id: I7896fe5907e3af932ad29e6577207ac803164330
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-12-14 19:52:45 +00:00