Commit Graph

68765 Commits

Author SHA1 Message Date
hjk
184403ddf2 Python: Implement PythonSettings::keywords()
Avoids instantiation of the widget when searchings using the search box
only to find nothing.

Change-Id: Id335de7f6cc2168d38905afe42b07e509c70f791
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-29 08:37:39 +00:00
hjk
900ea82fd1 Core: Don't save settings on startup anymore
Amends a68352f013.

This is getting in the way, it does not look needed, and it is lost
in history why it ever was.

Change-Id: I68ebdafc78e3259c73c64364607aef6eb74d2869
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-29 06:46:05 +00:00
hjk
5867d986a8 Core: Drop Q_OBJECT from OptionsPopup
Not needed.

Also slim down header a bit.

Change-Id: I6ac828fdfc42173e0b5aeca5d92e920745b424c9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-29 06:08:25 +00:00
Marco Bubke
f81ef9b2d6 Sqlite: Don't link to the internal Sqlite library
If you link to the internal Sqlite library you link actually twice. That
leads to strange bugs because you have an uninitialized object file. The
static linking workaround is now moved to cmake.

Change-Id: I51d966a623a18486ce5870d898999f3ce139f092
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-28 16:40:49 +00:00
Marco Bubke
b65ba2f702 QmlDesigner: Remove ProjectStorageSqliteFunctionRegistry
It is not used.

Change-Id: I7c2968a0a9876c04afffceedb87d46f19f0a7ace
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-28 16:40:44 +00:00
Christian Kandeler
0406f543eb ProjectExplorer: Allow users to remove all run configurations
Change-Id: Ib70bb1a658edcd6996e98e391b9b938618747ed3
Reviewed-by: hjk <hjk@qt.io>
2023-06-28 14:43:38 +00:00
Christian Stenger
d1f20a0506 AutoTest: Fix auto expansion of Qt test results
..especially when using data driven tests. In this case
we add an intermediate before the first data tag result
which apparently never got automatically expanded.

Change-Id: I282a57444b8014877c7a0e9f67c11c05ba1d06a5
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-28 13:16:59 +00:00
David Schulz
a207943f59 Editor: fix visual glitch after disabling overwrite mode
Change-Id: Ied85cf298a12a29cf448e6dec6c81f6a0a2dc4b7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-28 12:35:35 +00:00
David Schulz
520264999a ClangCodeModel: fix crash on followSymbol
Big files are loaded in chunks inside a QEventLoop. If follow symbol is
triggered via mouse and opens such a big file and the mouse is moved
while loading that file ClangdFollowSymbol got deleted while opening the
file in ClangdClient::followSymbol. Instead of the hard deletion just
cancel that follow symbol operation and make sure done is emitted
afterwards. The handling of that done signal takes care of the deletion
of that follow symbol operation.

Change-Id: Iba4ad6abb541186c2f26506f82fe1bc582818fca
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-28 12:33:51 +00:00
Jarek Kobus
176ada90a8 BaseFileFind: Get rid of getAdditionalParameters()
Remove recheckEnabled() and introduce setupSearch()
virtual method. The latter is called just once per
SearchResult instance (on first search), so we may
store the additional parameter (current project
file path) in lambda capture.

Change-Id: I7683e818bec8f1d787bdb33c573248b252b47c78
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-28 12:17:03 +00:00
Eike Ziller
04bb8c7b02 Remove some unused variables & includes
They are set and modified, but never read.

Change-Id: I6f21ae325e21513678f1534cd05e1a2470b9627b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-28 12:11:15 +00: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
Marcus Tillmanns
933a5c04fa Debugger: Fix Labels
Change-Id: I5bb17187f1371f37eedb63d2dc359ebad28ced50
Reviewed-by: hjk <hjk@qt.io>
2023-06-28 10:24:09 +00:00
hjk
a8745122f3 Core: Implement MimeTypeSettings::keywords()
Saves another 0.4s (~10%).

Change-Id: Id8bf05391ba5934a1bf1c9056d15eb1282bf02a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-28 09:58:11 +00:00
hjk
1e0733396c Core: Make IOptionPage::keyWords() virtual
... and use it to hard-code the result for the QtOptionPage. This
avoids instantiation QtOptionPage's widget, triggering the check
of all Qt versions.

For me that saves currently saves ~1.1 second after typing in the
option search box.

Change-Id: I6a3b335dcfdf3dceb9859684744231227a491f22
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-28 09:35:30 +00:00
Christian Kandeler
9f6878ddab CppEditor: Format code inserted by quickfixes
Task-number: QTCREATORBUG-10807
Task-number: QTCREATORBUG-19158
Change-Id: Ieac52e1a1a10afad91fea56290e7dcfd1d302e7f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-28 09:18:15 +00:00
Eike Ziller
2e90cb643c ManhattanStyle: Fix crash with stylesheets
Most prominently QmlDesigner crashed.

Some widgets have stylesheets set, and QStyleSheetStyle sometimes asks
for pixelMetric with nullptr as styleoption.

Amends c6dc54b343

Change-Id: If1264b29af83f2a489785e3c4f3e8342716ea125
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-28 09:17:53 +00:00
Christian Stenger
49dc14995a Utils: Silence soft assert
Change-Id: I8c21588e203b2446320009b77161b3951ba790f9
Reviewed-by: hjk <hjk@qt.io>
2023-06-28 07:17:53 +00:00
hjk
e607463f68 Qmake: Fix a warning
qmakeevaluator.cpp:297:13: warning: this statement may fall through [-Wimplicit-fallthrough=]

Change-Id: I157ba28e438b623d41dc7444c1381ecd649d3425
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-28 06:48:37 +00:00
Jarek Kobus
4a51f57aa2 SearchResult: Get rid of requestEnabledCheck()
Change-Id: Ide2cbda86caf28b41b6a2c7413f9a36ae4a8282d
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-06-28 06:12:21 +00:00
Aleksei German
cfadc5a984 QmlDesigner: Add context object to a connection
Change-Id: I3662737acf3d80c17c8004594540220296971ef3
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-06-27 15:56:43 +00:00
Aleksei German
cbe6d53fa7 QmlDesigner: Fix multi-arg warning
Change-Id: Ic88706b92001a60d56f901684d7a08dab9f26c3d
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2023-06-27 15:56:28 +00:00
Aleksei German
d7a60e4118 QmlDesigner: Improve main qmlFile fallback logic
Change-Id: Ie08373478518e17c9c0525b945ff5397eeb824a0
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-06-27 15:56:20 +00:00
Christian Kandeler
ee143e0923 ProjectExplorer: Do not forbid removal of the last run configuration
The presence of a run configuration is not technically required: E.g. if
you disable auto-creation of run configurations in the settings, you
won't have any in the first place. It therefore makes little sense to
force users to keep at least one of them once they are there.

Change-Id: I2ce0379ebc43f44326db53d324d4db9e9b92ef03
Reviewed-by: hjk <hjk@qt.io>
2023-06-27 15:45:06 +00:00
Eike Ziller
3e65778d66 Merge remote-tracking branch 'origin/11.0'
Change-Id: I8be5a00000a6699346ed1c44c0711d1f017462a7
2023-06-27 15:20:18 +02:00
Christian Stenger
372e2ba615 AutoTest: Fix layout of settings
..and re-add the ui for some lost GTest setting.

Change-Id: I0ec2c655fa9579a69b32a776736abfa7e23f53c9
Reviewed-by: hjk <hjk@qt.io>
2023-06-27 13:19:34 +00:00
Marco Bubke
90cfc2f7e8 QmlDesigner: Fix warnings
Change-Id: I2b9c2d024b1c09c157e448f590e2748337cbeb89
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-27 13:00:46 +00:00
Eike Ziller
d1649b060b QmlDesigner: Disable warnings-as-errors by default
for everyone that doesn't explicitly set the BUILD_DESIGNSTUDIO CMake
variable or the corresponding environment variable or CMake option.

Fixes: QTCREATORBUG-29238
Change-Id: Ie1959a468fc7bee0fed790b025ecdb3f49ab8f08
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-27 12:33:15 +00:00
Marco Bubke
94a704bb87 QmlDesigner: Only enable error on warnings as you compile with tests or in debug
There is no advantage for an enduser to get errors on warnings because
he cannot do much about it. It is still nudging the developers to fix
the warnings.

Task-number: QTCREATORBUG-29238
Change-Id: If9f73f2766d686b119cd264ee7b3c3c9afa2c70d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
(cherry picked from commit ff2a14917f)
Reviewed-by: hjk <hjk@qt.io>
2023-06-27 12:32:56 +00:00
Marco Bubke
d7ee848efd QmlDesigner: Improve NodeMetaInfo
Change-Id: I1b31a1b08332f6bdba74c46af3d0a190901e9607
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-27 11:54:02 +00:00
Alessandro Portale
a8cab6f5a1 QmlEditorWidgets: Use LayoutBuilder in PreviewDialog
Change-Id: Ic00c724e0787b51b3757b92d0d87dff8a6074c52
Reviewed-by: hjk <hjk@qt.io>
2023-06-27 11:51:13 +00:00
Miikka Heikkinen
85c4c90c63 QmlDesigner: Delete materials and textures inside a transaction
Removal of the node and references to the removed node are separate
operations done during node deletion, so the deletion must be
done inside a transaction to avoid getting multiple undo stack entries.

Fixes: QDS-10169
Change-Id: I2ef142b98cfaa60b1130ac729dd89347bb8cac13
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-27 11:49:30 +00:00
Artem Sokolovskii
646eb5118b ClangFormat: Fix missing label in project settings
Fixes: QTCREATORBUG-29323
Change-Id: Ia8c89ec6b8c745cac2bcb13a149667d9c3e08496
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-27 10:51:02 +00:00
Artem Sokolovskii
0720042e1c ClangFormat: Make the behavior of the braces tab clearer
Fixes: QTCREATORBUG-29069
Change-Id: I078b7fbb6f98088f615d74a189cce00f8e5fa5fe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-27 10:50:50 +00:00
hjk
41fcca5cdd Python: Hide some internals from PythonRunConfiguration API
Change-Id: Ibed21265bf7099b06ea61751fb487b78e8071f34
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-27 09:09:32 +00:00
Christian Stenger
65b1088a17 AutoTest: Delay expansion request
Do not directly expand an item directly after it had
been added to the model as its internal mappings need
to get updated.

Fixes: QTCREATORBUG-29302
Change-Id: If70d209074d97e0598bcbce061e176148751705a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-27 08:16:35 +00:00
David Schulz
150ca56067 ClangTools: replace some QStrings with FilePaths in tests
Change-Id: Ica351e8ebb67689cab43cb54ee7d82a307f9ed97
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-27 07:37:39 +00:00
Semih Yavuz
012f984c27 Restrict M16 warnings
Do not warn out invalid property name if the property starts with an id
in the same component scope.

Small refactoring: Move early-return-likely elements up before any
calculations done.

Fixes: QTCREATORBUG-28468
Change-Id: I2cbdbc24af42f126db0bbd6027ebe4f96d9c199f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-06-27 07:21:58 +00:00
Christian Stenger
3664a62f98 QtSupport: Fix compile with Qt6.2
Amends d2b61bf3f0.

Change-Id: Ieeac8f24b4472ae802aadbcf9667419d2af52453
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-27 06:34:25 +00:00
Christian Kandeler
5bb49d4308 qbs build: Consider IDE_SETTINGSVARIANT in app_version_header
Amends ac32f790f3.

Change-Id: Ifeb571daeb3006d6bea7c46a52e3f9526f33c3d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-26 15:35:27 +00:00
Eike Ziller
d2b61bf3f0 Examples: Order categories
According to hard-coded list. This should come from the manifest file in
the future.

Follow-up of qtdoc/4e38729111989dbb738042d4a8beb35d01b77fe1

Change-Id: If46383e1cf8e44c2a52ca5a458c497495e132639
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-26 15:03:04 +00:00
Jarek Kobus
152d543cdf TaskTree: Document GroupItem and subclasses
Adapt some type and argument names accordingly.

Change-Id: I1b127eacfd0a71574ee9e9a7628ec572620798cb
Reviewed-by: hjk <hjk@qt.io>
2023-06-26 14:59:24 +00:00
Miikka Heikkinen
2810106c2c QmlDesigner: Fix shader asset source property setting on navigator drop
The property type of the shader source property is url, so use that
instead of bytearray type.

Fixes: QDS-9721
Change-Id: I244ed455f83e3f70d130a6085b9af083ee60c131
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-26 14:17:46 +00:00
Eike Ziller
ac32f790f3 Qbs build: Fix app_version generation
Amends 6836caa14c

which added a variable to app_version.h.cmake, but not to
app_version.h.in. Fix by porting qbs to use app_version.h.cmake, which
is the truth nowadays, instead of the app_version.h.in which originated
from the qmake build.

Change-Id: Ia9be53377a0bfded91ccd6ea1637eeda7fe9d5c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-26 11:32:22 +00:00
Eike Ziller
68bc213644 Move app logo to main executable
Moves more branding information out of the plugins.

Change-Id: I71575f268dd8f2860f4da56101b0e3d9442df367
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-26 11:29:41 +00:00
The Qt Project
e07e8b5c78 Merge "Merge remote-tracking branch 'origin/11.0' into work" 2023-06-26 11:25:55 +00:00
Christian Kandeler
29ade7d682 Wizards: Speed up JsonSummaryPage::initialize()
The summarySettingsHaveChanged() slot takes a (too?) long time, so at
least make sure we don't call it repeatedly while setting up the page.

Task-number: QTCREATORBUG-29290
Change-Id: Id010c41739a1381212731bb7638d6db87081c3b6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-26 10:53:55 +00:00
hjk
691c8148a3 ProjectExplorer/RemoteLinux: Consolidate X11ForwardingAspect handling
Change-Id: I7e74f58ab50c84c74ba65f9f64aaa4d0ea73bbb6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-26 10:48:08 +00:00
Eike Ziller
606be1f69f Merge remote-tracking branch 'origin/11.0' into work
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: Ib4653a1ce75c7cce658f4bb843481de014d0fcf7
2023-06-26 12:12:58 +02:00
Aleksei German
fcab6a10d2 QmlDesigner: Improve project open functions
This patch:
unifies lookup for the first qml file to open;
increases number of possible fallback options;
adds missing implementations to some methods in QmlBuildSystem.

Task-number: QDS-9984
Change-Id: Ib282b1fca8b0564fe80f00e3d9ffe82c1a15c540
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-26 09:47:57 +00:00