feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
80,858 Commits 108 Branches 368 Tags
0d95c68b2146f704a77b9ba4a8c0b07df584d03d
Commit Graph

80858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leena Miettinen 0d95c68b21 Doc: Add missing \a commands to get rid of qdoc warnings 
Change-Id: Ida0f0cabae0cc151967098312b358803a48dd92c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2023-05-25 09:13:59 +00:00
hjk 2d32fe4b57 Utils: Remove Environment::searchInDirectories 
Was functionally replaced by FilePath::searchInDirectories.

Change-Id: I8808cbdb114fb9b6b4e1f94e13aa9e67b9c56d6a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
 2023-05-25 09:00:37 +00:00
hjk 2ca7aff073 Docker: Remove DockerPlugin::dockerApi() 
Access is nowadays via DockerApi::instance()

Change-Id: Idc1530358771c3a008182661c263c30b68fe84be
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2023-05-25 08:48:18 +00:00
hjk d6d7654c3f Autotest: Use new aspect constructor 
Change-Id: Ibac3957b51c0128e829fcf7cd750dbaea8e8694d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2023-05-25 08:39:38 +00:00
hjk 6c66b900db ProjectExplorer: Merge LocalEnvironmentAspect into EnvironmentAspect 
This still has some not quite orthogonal features in one blob function,
but at least it's not a separate class anymore.

A step forward to remote support in places where it could make sense.

Change-Id: Ia02003e4340eb2b5ee92bd48c00006a487527828
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2023-05-25 08:30:33 +00:00
David Schulz 85f1633562 LSP: Fix Range(QTextCursor &) constructor 
amends 9bb126c0d6

Change-Id: I5afe9ecfff2339593368eb24e2b034460ce197e8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2023-05-25 08:26:34 +00:00
Christian Stenger 414e171226 Axivion: Start aspectification of settings 
Change-Id: I866d41fd152509893a90ca0552b9d0c3ab21333b
Reviewed-by: hjk <hjk@qt.io>
 2023-05-25 08:09:39 +00:00
Eike Ziller 6be33ccb1d Merge remote-tracking branch 'origin/master' into 11.0 
Change-Id: I37adb8c1656cd5c979cd177eedef812ef093ad97
 2023-05-25 09:34:25 +02:00
David Schulz f235a72554 TextEditor: add tests for semantic highlighter 
Change-Id: Id64c933f01c0dbc0e077656b6f4260b93e124311
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-05-25 07:01:35 +00:00
Jarek Kobus 31090ded15 FileSearch: Remove unused function 
Change-Id: I8af9a3db055f530792e68095c22c696392f79872
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2023-05-25 07:01:14 +00:00
Eike Ziller 77c7a759b7 Merge remote-tracking branch 'origin/11.0' 
Conflicts:
	tests/unit/unittest/qmlprojectmanager/CMakeLists.txt

Change-Id: Ib6fd9bf09d654a7a2fe995dad3bcd93eacade2fb
 2023-05-25 08:56:09 +02:00
Eike Ziller 55dadd4f95 Merge remote-tracking branch 'origin/10.0' into 11.0 
Change-Id: I27e2c1c764f955d14bfece6cd580b4c2d2988396
 2023-05-25 08:29:27 +02:00
Cristian Adam 0d3d4892c6 CMakePM: Fix Qt detection for Presets with toolchain file 
When CMAKE_TOOLCHAIN_FILE and CMAKE_PREFIX_PATH were both set, the later
was ignored.

This resulted in Kits being created without Qt and without Qml
Debugging.

Task-number: QTCREATORBUG-28982
Change-Id: Ib45b4ac8335391f85a0b9c321196597d1c0a7a3f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2023-05-24 13:59:14 +00:00
David Schulz 9bb126c0d6 Utils: make column of convertPosition 0-based to merge it into Position 
Change-Id: I239b3cb33b8ad59ac4097c919155ab5ca7d57b8e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
 2023-05-24 11:53:28 +00:00
Eike Ziller f7d46f48f8 Build axivion support plugin 
Adapts the CMake files, fixes license.

Change-Id: I6bdce2547d187bcabcc864026e36a1c924015c2a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
 2023-05-24 10:45:32 +00:00
The Qt Project 9f506956f7 Merge "Merge axivion plugin into 11.0" into 11.0 2023-05-24 10:45:01 +00:00
hjk 01019dfdb8 ProjectExplorer: Use FilePathAspect for some FilePaths 
Change-Id: I35d55c82217e9ef9bbcf215c8360a111931c822c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2023-05-24 09:57:04 +00:00
hjk 75710fa369 Utils: Remove LabelPlacement::AtCheckBoxWithoutDummyLabel 
This is identical in remaining functionality to AtCheckBox after
the recent layout builder changes (or rather, can be adjusted on
the layouting side by having appropriate empty cells)

Task-number: QTCREATORBUG-29167
Change-Id: Ic357de6fb756acb5926afe1fd361ee4b18b17afd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2023-05-24 09:53:05 +00:00
hjk 0234ab6896 Utils: More aspects with new scheme 
Task-number: QTCREATORBUG-29167
Change-Id: I76977d4d740556d28423ce9f632ee47e81822ee6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2023-05-24 09:49:56 +00:00
Alessandro Portale 86ff142f8e Utils: Treat FilePath with variables as user input when expanding 
When macro-expanding FilePaths with environment variables, it can happen
that non-conformant path separators end up in the intermediate expanded
string. For example with "%{Env:PROGRAMFILES}" on Windows.

Since we generally treat paths from environment variables as user input,
it makes sense to treat macros as user input as-well in this case.

Change-Id: I0daa57b7dbf3d8fd25c98fb82b2beb1bc6ded825
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
 2023-05-24 09:30:26 +00:00
Eike Ziller 14698160ff Merge axivion plugin into 11.0 
Change-Id: I60290479f6b4bd8ff87e86f0cc6ded240803d43c
 2023-05-24 11:22:26 +02:00
Cristian Adam bf4934feb9 CMakePM: Expand ${hostSystemName} for build presets 
Fixes: QTCREATORBUG-28935
Change-Id: Ie645d80a9743108e3760096b6829e881677e249b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2023-05-24 09:14:40 +00:00
hjk 0d37a66b51 Squish: Adapt to recent aspect development 
Change-Id: Ied7406af9c39d8b57b5b9064500e589e33fb86da
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-05-24 08:55:53 +00:00
Christian Stenger 080c5e82d2 Squish: Handle children for picked object 
Change-Id: I39f392f4f619238b79e60d423dcb5ae36a9639a4
Reviewed-by: David Schulz <david.schulz@qt.io>
 2023-05-24 08:55:22 +00:00
Christian Stenger caa85795df AutoTest: Provide wizard for adding a test case 
Task-number: QTCREATORBUG-28846
Change-Id: I6716540b8bf62479bf45d16230ec91f0ed157001
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
 2023-05-24 08:54:59 +00:00
David Schulz bc9e90f8b6 LanguageClient: add projects filter function 
Can be used to filter projects get reported to the language client on
server startup and when a project gets opened.

Change-Id: I8cfbc45ecb5251fcaecf2c331a9f1eff966c8db1
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
 2023-05-24 08:50:44 +00:00
hjk beea9ec157 McuSupport: Move McuBuildStep to .cpp 
Not needed publicly.

Change-Id: I0e8ddd3e260fb87bedc9ea1478e440e99bd2e203
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2023-05-24 08:32:02 +00:00
hjk 06b276f68f McuSupport: Use new FilePathAspect for FilePaths 
Change-Id: I98cb17f39af624f1ec06529932d4e52cda5a3661
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2023-05-24 08:31:51 +00:00
hjk d9f6537c43 Beautifier: De-QObjectify AbstractSettings 
Change-Id: Id5045f48c52c7304dc440bb2c83082cc7e628143
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2023-05-24 08:31:36 +00:00
Marcus Tillmanns aace4c44fa ProjectExplorer: Placeholder for custom executable 
Previously when creating a custom executable run config, the
path chooser would display a red "<unknown>". This improves
the message to tell the user whats needed.

Change-Id: Ib521cde1a4f5b836cb865428f65f956a63bce3b4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
 2023-05-24 08:26:37 +00:00
Leena Miettinen c124e837c5 Doc: Add docs for Utils::Environment::systemEnvironment() 
Because we link to it from the Utils namespace docs.

Change-Id: I4d320b34687e7a6304cbedcbf7e2e5d3a43642b6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2023-05-24 08:26:34 +00:00
Christian Stenger 29d3a1aef2 QmlProjectManager: Fix Qbs build on Windows 
Change-Id: I58057e88293017ece5d0026e2b2708e6d3f48d30
Reviewed-by: David Schulz <david.schulz@qt.io>
 2023-05-24 07:41:13 +00:00
hjk b2c69b947f Python: Adapt PySideBuildStep to recent FilePath{Aspect} changes 
Change-Id: I866b49733f3007e4f029fb25f8519a1c5b690370
Reviewed-by: David Schulz <david.schulz@qt.io>
 2023-05-24 07:28:59 +00:00
hjk 49b0238446 Python: Move PySideBuildConfiguration to .cpp 
Not publicly needed and closer to the generic pattern.

Change-Id: I886f95c24b957b8d3943cd115814bceb6a76b651
Reviewed-by: David Schulz <david.schulz@qt.io>
 2023-05-24 07:27:17 +00:00
Eike Ziller 818aeb235f Build/Core: One line per file, sort 
This is easier to navigate and adapt.

Change-Id: I15b99e99f2700922b8d5816adcea52e2e793ab90
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
 2023-05-24 07:25:04 +00:00
Eike Ziller c713e4aaa2 SessionModel: Simplify data() method 
Change-Id: Id8f1a4e1cecb30a3ade69e7eec8a0420c1425d40
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2023-05-24 07:24:58 +00:00
Eike Ziller 7dfc775ace Move session macro and saveSession trigger to SessionManager 
Change-Id: Ie0e07621fe9f33e69ee99f6d20bb42a8627e7729
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2023-05-24 07:24:47 +00:00
Eike Ziller e26938beeb Move handling of session menu to SessionManager 
Change-Id: Id2d6843eba10f7d89b078b558771989dfe34fb13
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2023-05-24 07:24:38 +00:00
Christian Stenger a9b504311a McuSupport: Fix Qbs build 
Change-Id: If4563f5d71b0c0100c2a7d419d3bbb4af570e1ed
Reviewed-by: hjk <hjk@qt.io>
 2023-05-24 07:14:29 +00:00
Christian Stenger 6448efba0f ADS: Fix Qbs build 
Change-Id: Ie7d7dba3bc8da21e65f2ff4d1c2aad534729429c
Reviewed-by: hjk <hjk@qt.io>
 2023-05-24 07:14:17 +00:00
hjk 42a162c9af Python: Use FilePath::searchInPath instead of Environment::findInPath 
That's the last remaining users.

Change-Id: I14ce380b9c96b2197e478600a46ca725ed1acfbf
Reviewed-by: David Schulz <david.schulz@qt.io>
 2023-05-24 07:00:28 +00:00
Leena Miettinen ec9d9586fc Doc: Add \a commands and document Utils::MathUtils namespace 
Fixes qdoc warnings.

Change-Id: I666e6db9ee3a3a5c83f093f2e48981701f137d5c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2023-05-24 06:53:24 +00:00
Leena Miettinen e1a67c7cfb Doc: Exclude src/libs/utils/mimetypes2 from doc builds 
It is copied from Qt.

Change-Id: Ia9a9f02abcb45d1f2981918259b8cc970c3165ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2023-05-24 06:53:08 +00:00
Leena Miettinen d10eac94ea Doc: Remove obsolete docs for IExternalEditor 
To fix qdoc warnings.

Change-Id: I02694e2a6b7f2ed7f5ed5d3b397159ebf327d148
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2023-05-24 06:52:56 +00:00
Leena Miettinen 74f0424020 Doc: Fix typo in signal name in the \fn command 
Change-Id: Ie7b365371fedb0304d3ac73dcda948832d88fb49
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2023-05-24 06:52:39 +00:00
David Schulz 305fae9a4a Copilot: shutdown plugin asynchronously 
Wait for the client to finish. This fixes a crash when running the
plugin unit tests of the copilot plugin.

Change-Id: Id0805cb628a79316cd904350bb159ff1369a03b9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2023-05-24 06:50:06 +00:00
Mitch Curtis 00d156c8ca Fix exclusion pattern tooltip text 
It says "included" instead of "excluded".

Change-Id: Ib74f2adbc6e6f10a9ff79662e5be609a89fe89d6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2023-05-24 06:03:01 +00:00
Orgad Shaneh 861b98a76a FilePath: Remove const ref for enum argument 
Change-Id: I86c5466cdcd8f74816456e70463157f28a4e37bc
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
 2023-05-24 05:58:48 +00:00
Eike Ziller af5bb5e599 Adapt for easier merge into main repository 
Remove conflicting files and already move to the right place

Change-Id: I2b20f4aa85e61ff121acb68aaab5d5e1fdd87956
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
 2023-05-24 05:54:56 +00:00
Cristian Adam c1cdea2661 CMakePM: Consider quoted file names for file operations 
It is not uncommon for projects to use quoted file names, which would
break the new file operation support for CMakeLists.txt files.

Change-Id: I8dc5d6843f1723c5709cef28cf3bf89a5c87ec2a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2023-05-23 16:27:14 +00:00