Commit Graph

68765 Commits

Author SHA1 Message Date
hjk
2c56fa8084 Autotest: Hide TestNavigationWidget implementation
Also, de-Q_OBJECT-ify.

Change-Id: I6e527bb36e9f38a702604f9c6c3923e62bf921c9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-08-07 08:24:07 +00:00
hjk
bf5296292a Utils: Rename LabelPlacement::AtCheckBoxWithoutDummyLabel to Compact
In BoolAspect. Felt a bit too descriptive by now.

Change-Id: I0cf2eb88576da3d3741d146a8274cf8a85bc7c83
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-07 08:22:00 +00:00
Andre Hartmann
7946abce35 Texteditor: Fix clazy-strict-iterators warning
In line 860: `list.insert(it, elem);`

  textdocumentlayout.cpp:860:17: Mixing iterators with
  const_iterators [clazy-strict-iterators]

Change-Id: I2a9413552a6060157efcea79f274fee11086d34e
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-07 06:11:39 +00:00
Orgad Shaneh
467d94b7f4 TextEditor: Fix compilation without tests
Amends 66d49e6a53.

Change-Id: I09acb6d7e2aaf94cbf09242b7199ef5922f3e510
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-07 04:51:11 +00:00
Jarek Kobus
f0e7ab6228 UnixPtyProcess: Get rid of foreach
Change-Id: I9ca9092c874960e63d6a29bcd11181bb571c3615
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-04 18:03:17 +00:00
Cristian Adam
c4e15769ec CMakePM: Fix AUTOUIC ui_header.h file code completion
The wrong header was reported to the extraCompiler when AUTOUIC was set.

Fixes: QTCREATORBUG-28787
Change-Id: I92d37e56ee5e45229545184e4f4911764834ed67
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-04 15:29:25 +00:00
Jarek Kobus
351c2cc463 FossilPlugin: Drop namespace specifiers
Remove some unused headers.

Change-Id: Ied6c6994604d567503b00bfb9e822e8e3784cca6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-08-04 13:36:08 +00:00
Eike Ziller
0d15b4cded Merge remote-tracking branch 'origin/11.0'
Change-Id: Ibe5040142ca38fed77ffed163212baf22592e392
2023-08-04 14:57:29 +02:00
Tasuku Suzuki
4d5752edc4 RunControl: Revert reject button's text to keep apps running
Previously, when a user attempted to switch sessions or quit Qt Creator,
a dialog would appear asking whether to continue running the current app.
The options were:
- Force Quit
- Keep Running

However, in Qt Creator 10, the 'Keep Running' button was mislabelled as 'Cancel',
which does not accurately represent its function.
This commit corrects this issue by reverting the button's text back to 'Keep Running'.

Change-Id: Ic48648baf6b166907d986d58e827cb52adfd551c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-04 12:31:38 +00:00
Miikka Heikkinen
60ea887d5f QmlDesigner: Improve keyboard navigation on assets view
keyboard navigation now works when you focus the tab without
requiring to also click on the treeview itself.

Fixes: QDS-10397
Change-Id: I2cda08365c1a68c72121166d4fd50f1786f913bc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-08-04 11:53:30 +00:00
David Schulz
66d49e6a53 TextEditor: Fix crash on reloading the document
as part of the reload operation we set the document to nullptr inside
TextBlockUserData::documentClosing, but we do not remove the mark from
the marks cache. So when a text mark gets deleted while a document is
reloaded the mark does not get readded to the document, but it wont get
removed from the marks cache inside the document either, so we have to
manually make sure the mark is removed from the cache in this situation.

Fixes: QTCREATORBUG-29432
Change-Id: I3ae4182c4d2bbd3426c1d7a60275d21ac20ea99a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-08-04 11:20:18 +00:00
Jarek Kobus
8d554aba1a FossilPlugin: Fix revertCurrentFile()
We didn't mean to execute empty dialog, but RevertDialog.
Add RevertDialog::revision() helper.

Amends 521a23df6e

Change-Id: I4c27baa0d5b2a9360048fd90e4feb1759c6363df
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-08-04 10:33:47 +00:00
Jarek Kobus
f313c5538f Android: Simplify return statements
Change-Id: I100b16a1fd74c4528f61f681bbeb5cdb4adddee5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-04 09:52:39 +00:00
Marcus Tillmanns
fa753a69de Terminal: Support focus reports
Change-Id: If1e81b87b9c05c657453c9dbb51f82217d29a61d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-04 09:27:11 +00:00
Marcus Tillmanns
f2f0e420b0 libvterm: Update to 0.3.3
See also: https://bazaar.launchpad.net/~libvterm/libvterm/trunk/revision/839?compare_revid=829

Change-Id: Ifbee08cfb5cbc1ebfa61e3a70daf751a7a798a5b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-04 09:25:59 +00:00
Jarek Kobus
a9eabeacef TerminalSurface: Fix sendKey()
Pass mod into vterm_keyboard_unichar(), instead of
unconditional VTERM_MOD_NONE.

Change-Id: I850c5cb6d00302e46cfce6e695e159a5ce99dafb
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-04 08:27:29 +00:00
Jarek Kobus
94aff7cf50 GlyphCache: Avoid potential use of deleted object
The QCache::insert() may delete the inserted object.
In this case it returns false. Make use of the returned
value and don't use the object anymore in false case.

Change-Id: I1519766f77fa5965268a327d3159a357135e142b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-04 08:27:12 +00:00
Miikka Heikkinen
a80dc7789e ADS: Focus content widget when tab is clicked or dockwidget gets focus
Fixes: QDS-10396
Change-Id: Ic7d4a73ff535c0c0cb73e1e5bd636bec00a1336c
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-08-04 08:23:12 +00:00
Marcus Tillmanns
d685c7d950 Utils: Fix FancyMainWindow
The FancyMainWindow::dockWidgets() function did find all children,
even if there was another FancyMainWindow in the hierarchy with its own
dock widget children.

Change-Id: I44c2fe669d08a938e86e889caa570d2b19a0cac7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-04 08:21:54 +00:00
Eike Ziller
35422ad25b Editors: Persist history of open files
in the session. The state of the editor views and editors was already
saved, but the history of editors was missing. Affects the open document
window (Ctrl+Tab).

Change-Id: I2ee8d96c27d8ab72022c6335d42455395380f124
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-04 06:48:14 +00:00
Cristian Adam
5646f76ea8 CMakePM: Fix reading ninjaPath from QtCreator.ini
For the special case when the Qt SDK Installer appends the same path to
the key.

Task-number: QTBUG-115754
Change-Id: I87d8f3d8074044f440ed3042bc5fe8356a6c429c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-08-03 15:08:39 +00:00
Miikka Heikkinen
9f7f82aeff ADS: Fix workspace corruption
Don't insert widget into area twice as that corrupts the workspace.

Fixes: QDS-10351
Fixes: QDS-10388
Change-Id: Icacddf2a95243beee5d6314fbdc38e284639ecec
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-08-03 13:35:01 +00:00
Artem Sokolovskii
0d3e66a5b8 ClangFormat: Regenerate clangformatchecks
- Regenerated clangformatchecks for clang-format-16
- Updated clangformatconfigwidget for using new clangformatchecks

Fixes: QTCREATORBUG-29434
Change-Id: If308942b6fbe4cc2568acda6d421139175ac081a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-03 13:14:22 +00:00
David Schulz
2e72860179 Editor: avoid FontSettings copies
Change-Id: I1ffd9aa21a38404bdf5e2f402b61ce57a023e83d
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-03 12:19:05 +00:00
Eike Ziller
960ebb3a85 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ic24d9800eceafa17c51f2ac9c989f55a9b6e920a
2023-08-03 13:18:37 +02:00
Björn Schäpers
9ad9e49ccf clang-format: Fix build with LLVM 17
Change-Id: Ie6377be3be4a8c785d53f1eceabcc4811db4229d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-03 09:55:35 +00:00
The Qt Project
d59d017388 Merge "Merge remote-tracking branch 'origin/11.0'" 2023-08-03 09:35:45 +00:00
Eike Ziller
c9ba87b58b Merge remote-tracking branch 'origin/11.0'
Conflicts:
	src/plugins/beautifier/clangformat/clangformatsettings.cpp
	src/shared/qbs

Change-Id: Ie614f036ef9529a3cae6366a9313eded988d725c
2023-08-03 11:35:17 +02:00
Marcus Tillmanns
ea14ada43b Terminal: Fix handling big chunks of OSC data
ShellIntegration previously ignored the initial and final flags of onOsc.

Change-Id: Ifa9594fba654cf543c117835fc182d4642dc70e4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-03 09:19:27 +00:00
Marcus Tillmanns
8ac9404725 Terminal: Add support for copy (OSC52)
Allows terminal apps like vim to set the clipboard, even from inside
an ssh/remote shell.

Change-Id: I1d068737ef65bb4541c3fc9c43870986865f1b45
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-03 09:19:22 +00:00
Marcus Tillmanns
0a69cdd277 libvterm: Fix clear selection
see: https://bugs.launchpad.net/libvterm/+bug/2029450

Change-Id: I3a075e58787bdd85a154dc7d0626a398d072f5b8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-03 09:19:17 +00:00
Marcus Tillmanns
979cb4aba4 libvterm: Fix osc_selection
See: https://bugs.launchpad.net/libvterm/+bug/2029444

Change-Id: Ie358ee9554cca7a5c9a5bf477e45f21f1241dd89
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-03 09:19:12 +00:00
Marcus Tillmanns
cb0597aeed libvterm: Fix DECSTR (soft reset) command
See: https://bugs.launchpad.net/libvterm/+bug/2029441

Change-Id: Ia2411819818cb7f0f6dff7dcc2d7d7730cfc6e7f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-03 09:19:05 +00:00
Marco Bubke
6f5e9417d8 QmlDesigner: Add contains functions
After extensive
benchmarking(https://quick-bench.com/q/ajHEd5ZE-zmI2FoLQLGX9NREgmw)
there was a clear result that a forced inline variatic function provides
the fastest result.

static bool search(QByteArrayView input)
{
    return CoreUtils::contains(input,
                               "children",
                               "data",
                               "childrenRect",
                               "icon",
                               "left",
                               "transform",
                               "visibleChildren");
}

Change-Id: Id492bb4351bf3e87fc8e85c2b99e8d2a9b3efd0d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-08-03 09:15:37 +00:00
Miikka Heikkinen
787f17ce91 QmlDesigner: Fix enumeration generation from scope and name
Fixes: QDS-10363
Fixes: QDS-10387
Change-Id: I32b7b4a01aeeb6b8d6cd3a4e1fd819c0fa4753e4
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-08-03 07:55:41 +00:00
Jarek Kobus
a1fbc1a4b7 LanguageClient: Add context object into connections
Change-Id: I03bc2c1a9fa36d7c629d63a7fb866b919bb2cc20
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-03 06:53:33 +00:00
Jarek Kobus
1ceea7a91f CppEditor: Add context object into connections
Change-Id: I1a74f62b0a42ea4971b14fb82213f662b5fe4736
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-03 06:53:22 +00:00
Jarek Kobus
a6df8ebb53 VcsBaseDiffEditorController: Get rid of unused field
Amends 6845434f3d

Change-Id: I73a01ddf8e3068dbe54f886c0194ccbc647967b0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-03 05:18:34 +00:00
Jarek Kobus
6845434f3d VcsBaseDiffEditorController: Get rid of inputStorage() method
Pass explicitly the storage to the postProcessTask() instead.

Change-Id: I75ac10969530dfea1eac266b44481be3b1d8249b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-02 19:36:13 +00:00
Alessandro Portale
d060d1b224 QtSupport: Use QImage::fromData instead of QImageReader
QImage offers this convenience shortcut since Qt 6.2.

Change-Id: Ia1b286597ed13bcadeb663cf80b3dd3da964c5b7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-08-02 14:35:51 +00:00
Christian Kandeler
1f7960efe6 CppEditor: Allow filtering of unsupported -mcpu flags
Also hardcode one that we use with Boot2Qt.

Fixes: QTCREATORBUG-29304
Change-Id: I3dd425cae5eb87ad5e14a607431d9f7225efc566
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-02 13:39:53 +00:00
Eike Ziller
197d80f99b Markdown: Use different background color for code
Sets the background color for code blocks and for inline code (actually
for any fixed font text).

Change-Id: I1365111b38314a8e0a129aca35d754ad3f2f13bb
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-08-02 13:32:45 +00:00
Christian Kandeler
c88ebd85fe Update qbs submodule to HEAD of 2.1 branch
Change-Id: I610b0a1936e724aff6fda6e76efc78615e0b86d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-02 12:33:20 +00:00
Jarek Kobus
d45ece1732 Bazaar, Cvs, Fossil, Mercurial, Perforce, Svn: Simplify returns
Change-Id: Ic0d6a7510a26a4a9db180594f140156b036c5090
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-02 11:30:15 +00:00
Jarek Kobus
88926ed1a8 VcsPlugin: Simplify return statements
Change-Id: Icdf580fb1ca6860a82f3594e4676fb450b55d174
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-02 11:30:09 +00:00
Jarek Kobus
224e4eeb59 GitPlugin: Simplify return statements
Change-Id: If09c93acade749326b95bb1c6068b2d43a4d8551
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-08-02 11:30:02 +00:00
Jarek Kobus
8d8e60436d ProjectExplorer: Simplify return statements
Change-Id: Ifef006cd2dcc567097ce16376eab9ccedb092f04
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-02 11:08:25 +00:00
Jarek Kobus
9098bcd706 TaskTree: Make Group final
It's not meant to be derived from.

Change-Id: I356b3af743bc672f7a62e9a5d8516beadb85a68d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-08-02 10:27:57 +00:00
Jarek Kobus
f85aa6b531 TaskTree: Derive Sync from GroupItem instead of from Group
Change-Id: I6fd9ce48d3105f95f566ccb3328875872fd4af2b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-08-02 10:27:52 +00:00
Jarek Kobus
78b035f266 TaskTree: Make GroupItem subclasses final
They are not meant to be derived from.

Change-Id: I946565cffe27b4cb42915ba560c6dffcfda4ab43
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-08-02 10:27:47 +00:00