Commit Graph

80529 Commits

Author SHA1 Message Date
hjk
4b9aaf6ca1 ExtensionSystem: Remove the IPlugin back pointer to pluginspec
The price of having to loop in two places seems small compared
to cleaner relations between the classes.

There's a new hack in the helpmanager to make sure we aren't
looping to often. The hack wouldn't be needed if the (odd(?))
check there weren't there.

Change-Id: Ifed50213b2de8feedfb45c185808d163c00c19ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-10 10:23:33 +00:00
Eike Ziller
2f5aed6c78 Merge remote-tracking branch 'origin/10.0'
Conflicts:
	src/plugins/clangcodemodel/clangdlocatorfilters.cpp

Change-Id: If91f26625ea9620fb9fdbf45705b32f37cb7f158
2023-02-10 10:43:06 +01:00
The Qt Project
2a2f6afb04 Merge "Merge remote-tracking branch 'origin/9.0' into 10.0" into 10.0 2023-02-10 09:29:38 +00:00
Eike Ziller
b29cb4efe1 Merge remote-tracking branch 'origin/9.0' into 10.0
Conflicts:
	src/plugins/texteditor/codestyleselectorwidget.cpp
	src/plugins/updateinfo/updateinfoplugin.cpp

Change-Id: Iac33b852ccef6018bd81188716526aa70c3f5a2d
2023-02-10 10:29:14 +01:00
Alessandro Portale
3023b6ab03 Translations: Remove stray Q_DECLARE_TR_FUNCTIONS(...)
And handle the consequences in qmakebuildconfiguration.cpp.

Change-Id: Ic24d99927254e8d16decea49b880a2446bf322e6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-02-10 09:09:48 +00:00
Brook Cronin
b35d02f0d9 QmlDesigner: Minor style adjustments
Change-Id: Ieafb8c16aed985847ed1dd66a8ace05c955601d6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-10 08:47:14 +00:00
Brook Cronin
c2af166e2a QmlDesigner: fix state controls highlight and selection
Change-Id: I4101c6cd2d9028579bdae3710f36e6a3e254b53d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-10 08:46:38 +00:00
Thomas Hartmann
5e70a0e374 QmlJS: Do not set import as invalid if sub import fails
QtQuick.Controls has sub imports like QtQuick.Controls.macOS/windows
that wil lbe invalid on other platforms. In this case we do not want
to mark the original import as invalid, since it turns
off checks in QmlJSCheck.

Therefore moving the setting to invalid into the block that is only
executed for non optional sub imports.

Task-number: QDS-9094
Change-Id: If0ad4e32c14d608f88b8239f390208e51a93fbd8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-02-10 08:27:40 +00:00
Christian Stenger
3d57b1868b Fossil: Force open a repository by default
Fixes: QTCREATORBUG-28762
Change-Id: Iac45e940eb32cdb68eb2e745c5e63d3cc48ac943
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-10 08:24:20 +00:00
Ali Kianian
1a30062c8a QmlDesigner: Fix escape action for creating new asset items dialog
* Pressing Esc on "New Folder" dialog closes the dialog.
* Pressing Esc on "New Effect" dialog closes the dialog.

Task-number: QDS-8782
Change-Id: Ie9ddc68681716789c678f581a6770931971a3278
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-09 19:06:06 +00:00
Brook Cronin
7c18c7b23b QmlDesigner: Update styles for searchable toolbars
Change-Id: I42eefd91424be8485da1207ea0211cd079ea8593
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-09 16:53:25 +00:00
Henning Gruendl
de73d121ba QmlDesigner: Make top tool bar responsive
Change-Id: I986f65f7584a96512293e918b2b53de95998d0ee
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-09 16:50:08 +00:00
Henning Gruendl
b1c3627b49 QmlDesigner: Use ListView in TopLevelComboBox
Change-Id: Id6075213455248bbb0317ac7664faa1f24b85476
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-09 16:41:02 +00:00
Ali Kianian
cf91a91785 QmlDesigner: Fix the bug for initializer_list
asInitializerList function bug is fixed.

Change-Id: I83a2d77fde6c3fb1c2e786cc2168ea7b9db1eca0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-09 16:02:54 +00:00
Thomas Hartmann
4d67db6cfe QmlDesigner: Fix for toolbar
Task-number: QDS-9042, QDS-9040, QDS-9034, QDS-8956
Change-Id: I0639bbfdaa7475a277cbb247c7d85bf5b078a5aa
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-09 15:27:25 +00:00
Mats Honkamaa
2fc079b7ec Doc: Add Material Bundle example docs
Task-number: QDS-8966
Change-Id: I95c3985458bb457e462e84d7324d07bc65a536db
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-02-09 14:47:19 +00:00
Artem Sokolovskii
8491441257 TextEditor: Speed up updateCurrentLineHighlight
Only update the changed blocks and use sets instead of lists to
store the info and create the diff.

Change-Id: I08d81b326ceebdc6bf2ba322886b7bf5671b2769
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-09 14:05:28 +00:00
Artem Sokolovskii
db720d271d MultiTextCursor: Optimize multitextcursor
- Use map for merging intervals instead 2 times list iteration.
- Time complexity O(nlogn) instead O(n^2)

Change-Id: If65391999e1ff191752447935602fcc9847243fe
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-09 14:05:12 +00:00
Tim Jenssen
a18ab6b11f QtSupport: allow relative paths for the qmake command
This change makes it possible to bake in settings for bundled/shipped
Qt versions like we have in the QtDesignStudio.app package.
The result is that the installer does not need to write absolute
paths to the settings anymore, so it stays like it was signed.

A signed package on macOS is more and more necessary
and recommended for a while. Especially If the application will
touch files in special folders like Download, Documents, or Desktop.

Change-Id: I3153ffd4229b34a59bdfe740937c21ee93de3e9b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-02-09 13:55:56 +00:00
Christian Stenger
ff65caf62f SquishTests: Explicitly convert QString to str
Change-Id: Idcd70a18ed5535d8ad76c09007558cb96f20d178
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-02-09 13:51:26 +00:00
Christian Kandeler
0edcbd8853 CPlusPlus: Always build the tools
There is no advantage to excluding the tools by default that outweighs
the risk for them to get out of sync with the rest of the codebase.

Change-Id: I3ad292aa5648a4448babdf5d06c84b3f5ec94482
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-09 13:46:50 +00:00
Marcus Tillmanns
f06bc4ab5a Docker: Fix searching for clangd
Environment::searchInPath() does not know from which device it came.
Therefore it will take the PATH variable as it is ( without the
device://... prefix ) and search for files on the local device.

Change-Id: Iecddb5ee1beb4ac821a9ac592f6edb1fc0f68b54
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-09 13:42:24 +00:00
hjk
5782c7e6f3 PerfProfiler: Use new plugin test object setup
And clean up a bit

Change-Id: Idcc95ec94a437428caf97b7866b2c1e40f9a35c4
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-02-09 13:23:23 +00:00
Christian Kandeler
207f2b216c CPlusPlus: Add lexer support for new C++20 keywords
Change-Id: I2b83deb0502ebf2cdca2af774fbb2ce26e947c11
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-09 13:19:53 +00:00
Christian Kandeler
bb9e492745 CppEditor: Prevent duplicate symbols in document-scope locator
If declaration and definition of a symbol are present, offer only the
definition, as in the function and class locators.

Fixes: QTCREATORBUG-13894
Change-Id: I6794607c4c45831df53b022bbdad9db7205a890b
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-09 12:44:31 +00:00
Eike Ziller
1d5c587758 README: Add some more information wrt running and installing
Mention explicitly that running Qt Creator from the build directory
requires corresponding PATH setup on Windows, and add descriptions for
installing development files and debug information.

Fixes: QTCREATORBUG-26858
Change-Id: I63381c9ae1af3cd4d5db02a77164061b79ac814f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-02-09 12:40:57 +00:00
Christian Stenger
bad6b2c290 SquishTests: Avoid crash in test
Workaround crash inside a test that may happen if the
test tries to wait for an object when the AUT is gone already.
Check for a clean exit and only if this is not the case
try to continue with the error handling.

Change-Id: I65f3e72cd343ec527ad822de915bc0c49c263153
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-02-09 12:04:18 +00:00
Marcus Tillmanns
4e34f1781e Clangd: Convert paths in diagnostic messages
Change-Id: I28844c803b9d71be3a7bb760ef89542265fb352b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-09 12:01:07 +00:00
Marcus Tillmanns
1523f49e5c Utils: Add PathFilter to FilePath::searchInPath
Change-Id: Iccbecc7401f17208487113f89e49ed7103acf9d6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-02-09 11:56:28 +00:00
Knut Petter Svendsen
f6d1a4aaf4 ClearCase: Fix bug in ClearCaseSync runProcess
Assignment and compare in a while() loop is trouble. Fixed
bug where index always was 1.

Change-Id: I037d8c2290cf44c6200354b7c44950009e26c583
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-02-09 11:46:20 +00:00
Cristian Adam
61eb25af6d auto-setup: cleanup script
Remove the Qt SDK detection of conan. This is no longer valid with the
scripts being copied to ${buildDir}/.qtc/. Qt SDK also doesn't ship
conan anymore.

Do validation for conan via "conan --version" and vcpkg via "vcpkg
version".

For vcpkg the program path is resolved for symlinks and for Windows the
target architecture is being detected from the compiler path.

Change-Id: If0da79c952392d5ac9f8352e262b0802d6eb9ed3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-02-09 10:47:16 +00:00
Ali Kianian
dce852c7a4 QmlDesigner: Apply old icons to the actions
- Old icons applied to the actions of the DesignerActionManager
in order to prevent showing texts on the old top toolbar.
- Reset icon is now available only for on state.

Task-number: QDS-8910
Change-Id: Ibd2d703b5e760709e5da81e6a3d3d93d5ba0e104
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-09 10:41:15 +00:00
hjk
da7383387d Clangtools: More FilePath
Change-Id: I82057f1a9788043ee45a268ae57847caf6c994f3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-09 10:00:45 +00:00
hjk
9ad60cd891 ClangTools: Use FilePath in AnalyzeUnit
Change-Id: Ic8e19053a60e7c4d801f32f9048b7c48d00b2a3d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-02-09 09:57:24 +00:00
Robert Loehning
15841807d5 SquishTests: Update createNewQtQuickApplication()
Change-Id: I4b5171b73e69d3b9d4b3acb1108df363220b6068
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-09 09:48:56 +00:00
Knut Petter Svendsen
4b9a60614c Utils: explicit constructor for QtcProcess
The constructor for CommandResult takes a reference to QtcProcess.
If by mistake a pointer was used this results in constructing a new
QtcProcess and using the copy as input for CommandResult.

With explicit constructor we will get a compiler error.

Change-Id: Ib3a61b9164bd7d5dfb0f567c2d03f16b7d12f2c2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-09 09:25:19 +00:00
Alessandro Portale
98b1fcb7b3 Translations: Use QCoreApplication::translate() instead of tr()
QCoreApplication::translate() takes a context parameter, tr() does not.
We want the first one.

Amends: 48affa1889

Change-Id: Ibca327a39097dfcdb81a30e561161d3275c61d1d
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-02-09 09:05:43 +00:00
Christian Kandeler
a811afaeab CppEditor: Render forward decls less prominently in outline
Fixes: QTCREATORBUG-312
Change-Id: I9bb77add24737881eeee008620941b55118ee0e5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-09 08:59:25 +00:00
Jarek Kobus
86a14c8b27 ClangGlobalSymbolFilter: Avoid downcasting to WorkspaceLocatorFilter
Store a pointer to WorkspaceLocatorFilter instead of base
ILocatorFilter and avoid later downcast to WorkspaceLocatorFilter.

Change-Id: I729f60356b287f3b4bddf016e21761a372993928
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-02-09 08:53:44 +00:00
Henning Gruendl
1b2328f4a7 QmlDesigner: Apply new theme on navigatior toolbar
Change-Id: I1e2448a2d8eea1bd3badf27ee02913d8470851c6
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-09 08:40:47 +00:00
Marcus Tillmanns
86750c5772 Utils: Don't check fileAccess before adding Devices
While a device is being added it may not yet have a fileAccess.

Change-Id: Ifa37911e4ba95c15b7462e6d63ae1929a99901a3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-02-09 08:05:15 +00:00
Jarek Kobus
78ae704d77 Utils: Enable internal documentation
Change-Id: I8531f7a85c8bee32a207f477e7ee9d3d9f14107c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-02-09 07:37:45 +00:00
hjk
b59e632ac3 ExtensionSystem: Another way to have plugin tests
This makes it possible to have plugin tests defined in the
plugin pimpl, like a lot of the other stuff we currently
have there. This is meant to replace IPlugin::createTestObjects.

The basic idea is to reduce the number of ways things can
or have to be done when creating plugins.

Change-Id: I137c66b91cdf461a502cf22063b6f63e6163e876
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-02-09 07:16:46 +00:00
Jarek Kobus
a01261d798 ClearCasePlugin: Fix runCleartoolProc
Don't pass pointer to QtcProcess into CommandResult c'tor.
Pass reference instead.

Amends 0b7ee32202

Change-Id: Icc779e6901faa2212609d52fad4bccbf7126a5c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-02-08 21:16:31 +00:00
hjk
40b295cbab Utils: Move some translated strings from .h to .cpp
Default values shouldn't have complex initializations anyway,
these end up in each instance on user side.

Change-Id: I81394c3df353b34b19454130f58bd646318feccd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-08 19:36:07 +00:00
Thomas Hartmann
84d3fdc753 QmlDesigner: Set object names on QQuickViews
Change-Id: Icf2af2967a89b62e3328f7d523b8fc46f580314e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-02-08 17:48:05 +00:00
Cristian Adam
a6ccfb09e5 CMakePM: Copy auto package-manager to ${buildDir}/.qtc/ directory
By copying the ${IDE:ResourcePath}/package-manager to
${buildDir}/.qtc/ the problem with hardcoding paths
to old an Qt Creator version can no longer occur.

This also fixes the issue with remote projects by reffering
to the code residing on the host.

With the above issues fixed, enable "Package manager auto setup"
by default.

Change-Id: Ia49654a3b9059f83886e64d065019b2d55e9299c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-02-08 16:17:49 +00:00
Tim Jenssen
f766c2f5dc qmlprojectmanager: fix Cannot run Qt5 projects
qml2puppet only enables the qmlruntime feature if it
was built against a Qt 6.

Task-number: QDS-9088
Change-Id: If573cae305ef18c11101a591e6c1e38f133b7914
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-02-08 15:52:12 +00:00
Burak Hancerli
5ac46d46ba QmlProjectManager: Disable Cmake Generation for Qt4MCU
Task-number: QDS-7442
Change-Id: Ifc2239d5be7489e0fd7c5a778e5653d4266c0393
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-02-08 15:46:37 +00:00
Christian Stenger
f5bd330277 Qbs: Update some qbs files
List respective tr files and while at it shuffle some
of the listed files to match common sort order.

Change-Id: I73845ad1dae5e8c86d3741067f40b7b2b37e2a6e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-02-08 14:37:03 +00:00