Commit Graph

88532 Commits

Author SHA1 Message Date
Christian Kandeler
7475b073fb CPlusPlus: Fix finding end of raw string literal
The employed algorithm lacked proper backtracking, potentially causing us
to miss the delimiter altogether.

Change-Id: I7993c3c27d034925bd884e192779c85c54be9ec4
Reviewed-by: hjk <hjk@qt.io>
2023-11-21 16:00:09 +00:00
The Qt Project
ccc9010d26 Merge "Merge remote-tracking branch 'origin/12.0' into qds/dev" into qds/dev 2023-11-21 15:58:24 +00:00
Tim Jenssen
cdb6a5f291 Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I6adb244f39b7d13377cdf377e95d11415603f8ac
2023-11-21 15:58:17 +00:00
Mahmoud Badri
ef6dfc1c76 QmlDesigner: Center the model editor's empty message
Change-Id: I2d26d2a89bdd822a4c9172bbe4b652be642a0d34
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 15:55:50 +00:00
Jarek Kobus
221d4ad563 BaseAnnotationHighlighter: Get rid of QTextDocument arg from c'tor
It's always nullptr.

Change-Id: Ia392b826f0afe8562b90b916722c374c5244d9aa
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-21 15:49:49 +00:00
hjk
10c37c1439 Vcpkg: Dissolve plugin pimple
... by using the new setup pattern for the manifest editor.

Change-Id: I9eed8481e7f8ca08af34cd3a04c9909cd56d3b6a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-21 15:47:22 +00:00
Artem Sokolovskii
84275809b4 SyntaxHighlighter: Make setChangeNumbers private function
Made setChangeNumbers private function in BaseAnnotationHighlighter
and remove usage in other places.
Moved annotationChanges to BaseAnnotationHighlighterPrivate from
VcsBaseEditorWidget.
This was done to move all instances of TextEditor::SyntaxHighlighter.
In this regards only the public API of TextEditor::SyntaxHighlighter
should be available from children and no other additional functions.

Change-Id: Ibece9476a810e13c8722839820d5c575b0808f03
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-21 15:27:08 +00:00
Sivert Krøvel
b298c981f8 Revert "McuSuport: Use qsTrId() instead of qsTr in QtMCUs templates"
The id based translation feature is not available on Qt for MCUs 2.5

This reverts commit 8f948c28a9.

Task-number: QTCREATORBUG-29940
Change-Id: I0a63e8738e2a0b92319ba53d8b1f1730f8421796
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
2023-11-21 15:18:33 +00:00
Yasser Grimes
d08bb59faf McuSupport: Reset invalid packages to default on update
When updating kits some packages will still have the cached value of the
outdated package resulting in failure on updated. although default paths
would have given the correct path.

This patch restore package values to the default value, in addition to
tracking changes in model-names that correspond to the same kit.

Fixes: QTCREATORBUG-29855
Change-Id: Iad52df93e1e39c7f56bdb30036ac21cda8cdf670
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 15:15:58 +00:00
Eike Ziller
6910408f35 Fix compiler warnings
"braces around scalar initializer" and
"lambda capture 'this' is not used"

Amends b60fd77fc1
Amends 181b362fcf

Change-Id: Ie7c21db13644e98c0eec06a22f977ed4b923fae3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-21 15:03:58 +00:00
Cristian Adam
1a37da15c7 Debugger: Add our lldb to the system search paths
This way the user doesn't have to manually register lldb.exe

Change-Id: Id0a19de0962d8ba47a66a8d1909dfe2eb5ca0a6f
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-21 14:38:33 +00:00
Christian Kandeler
116798e544 CppEditor/QmlJSTools: Simplify RefactoringFile::file() re-implementation
Change-Id: I8f2af8de3786ecf4400bc42019d496bd52bb2545
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-21 14:24:49 +00:00
David Schulz
06595222ff Python: fix commercial pyside installation
Change-Id: I6a89b9a9f32e07db91e67df248d94c78ae731455
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-21 14:03:13 +00:00
Miikka Heikkinen
fc456a74d4 EffectMaker: Fix crash after opening saved effect when nodes exist
Clear and removeAllNodes functions were consolidated into one clear()
function, which now properly resets the entire model. This makes UI
properly synced to actual model state when composition is opened, so
the phantom nodes will no longer appear.

Fixes: QDS-11347
Change-Id: I204760cca6af669daa43a18bfb199dfbf14b73cb
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 13:59:04 +00:00
Christian Stenger
9c07e7ea7c PE: Close generated files silently if they have an editor
Omits the original request whether to save a modified file
if the files are opened inside QC, but it ensures to format
the correct file content instead of using some cached
content.

Fixes: QTCREATORBUG-29904
Change-Id: I3b3f3e53fb811288a208376559243bea01d0d4a4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 13:58:49 +00:00
Christian Stenger
7125862212 Add some include guards
Change-Id: If306f95f206e2b1cba48df806c822b8e2d27cf72
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 13:58:36 +00:00
hjk
7e38745706 Qnx: Re-order code a bit
Change-Id: Id2da2bdc67edd1abcc489767392aa791c7b0f667
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-21 13:57:08 +00:00
The Qt Project
5fc4751736 Merge "Merge remote-tracking branch 'origin/12.0'" 2023-11-21 13:56:30 +00:00
Tim Jenssen
701d4b2146 QmlDesigner: fix crash
Task-number: QDS-11300
Change-Id: I1fe6966445284e3e9ca5596d8f5ec866f37acc39
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-21 13:51:56 +00:00
Eike Ziller
c75a3bcd5d Merge remote-tracking branch 'origin/12.0'
Change-Id: I0ee9c73d7a7e12f98f88b161c35d00ada069cc9d
2023-11-21 14:46:01 +01:00
David Schulz
72a8e2e644 Python: fix pdb debugging
The pdb engine is created in the DebuggerRunTool constructor so we
cannot unconditionally overwrite the engine in DebuggerRunTool::start.

Amends 9af8ecd935

Change-Id: I0c3c88d14235bfb01543da788a7bb5e7e99018d3
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2023-11-21 13:43:24 +00:00
hjk
b9a0481a0d HelloWorld: Use ActionBuilder
Change-Id: I2e0c9de2293640712669c273e3b307ac95340fd6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 13:39:13 +00:00
hjk
08bf118624 Qnx: Move QnxSettingsPage to new scheme
Change-Id: I96287f7dc2b0d12f85164c137d1f1e6701ce468e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-21 13:38:31 +00:00
Serg Kryvonos
8608dc9556 Use "Ninja Multi-Config" generator by default in configurePresets
Multi-Config generators have additional library dependencies checks.
Xcode and MSbuild are multi-config generators too.
We need to make sure it kept configurable.

Change-Id: I571e718bc71ffc3920f07d15a956e9153d74b0a5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-21 12:14:50 +00:00
Miikka Heikkinen
77678c7bce EffectMaker: Add clear all nodes button
Fixes: QDS-11335
Change-Id: I5d0e0e11baabe780c19234410814a9f6eb45130d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-21 11:36:23 +00:00
Henning Gruendl
659772baa4 QmlDesigner: Fix navigator column width
Fix the navigators column width for Qt 6.5.4 and at the same time make
the icon columns tighter.

Task-number: QDS-11314
Change-Id: I87397eca104e4bfb835090229672e2d3d42dee6e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-21 10:28:27 +00:00
hjk
96dcd41d41 GenericProject: Use new setup pattern for ProjectFilesFactory
Change-Id: If5d64a8d6b09fbd3ceaea1736ce74ba2c837a456
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-21 10:19:48 +00:00
Tor Arne Vestbø
4f9cf826d6 Detect iOS 17 device development status via devicectl
iOS 17 devices no longer report the development status via
the com.apple.xcode.developerdomain domain.

Task-number: QTCREATORBUG-29682
Change-Id: I9de3c88425b71906f51d0f0e8b6a4ece0e08eb3a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 09:55:55 +00:00
Ali Kianian
54c9a38baa QmlDesigner: Fix the build error for CollectionImportTools
Change-Id: I946df14af3e4425203ea7ea04807205442c3119d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 09:54:10 +00:00
hjk
181b362fcf Core: Use more ActionBuilder in EditorManager
Change-Id: I5d1330536c0a6f60185a2e62fad35599f6e5698f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 09:41:16 +00:00
Mahmoud Badri
b14037f537 QmlDesigner: Add clearList icon to icon font
Change-Id: Ib60120dccca106e723d7eb2fe21ef574de62605a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-21 09:04:46 +00:00
Miikka Heikkinen
10792b1eb3 EffectMaker: Fix effect node deletion
Now the correct node is deleted.

Fixes: QDS-11330
Change-Id: Id7402ea6b4f258d32e851de2118e53f26a6c632a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 08:50:47 +00:00
Christian Stenger
3fdea38f58 EmacsKeys: Use SPDX License header
Change-Id: Ief2367d0d7cfae8e20b29b511bd87db348051b4d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 08:46:38 +00:00
Christian Stenger
102a3474e0 AutoTest: Fix coverity warning
Coverity-Id: 1360896
Change-Id: Icd284ec2b227eec314ec340c201b3fe4baeb529b
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-21 08:46:24 +00:00
hjk
5a3261f15a GenericProject: Code cosmetics
Compactify genericprojectwizard.cpp a bit.

Also, rename GenericProjectWizard to GenericProjectWizardFactory and
GenericProjectWizardDialog to GenericProjectWizard. That's what they are.

Change-Id: I9a7ac55b047cc9e40cb0c4f7f25bc6239686bf99
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-21 08:46:22 +00:00
Christian Stenger
50b9e601b0 LanguageClient: Fix coverity warnings
Coverity-Id: 1569380
Change-Id: I925ef9f154f1d4c39d7631a7a94f37be4735aa8c
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-21 08:46:16 +00:00
hjk
b18b156c71 GenericProject: Consolidate project wizard related classes
Change-Id: I61dcd07c27b8d691d8623eaec5d1d0a5fdb96608
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-21 08:46:12 +00:00
hjk
72cdbbb8da ProjectExplorer: Check for accidentally deleted workers
... before checking for re-run support.

The workers are own by the RunControl, they should not self-destruct,
but this apparently happens.

Change-Id: I41101dfc20bf2ff4f19c440934e4d4010a88c04e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-21 07:58:37 +00:00
hjk
b86ca0947b QmlPreview: Fix double deletion of RefreshTranslationWorker
The RunControl takes ownership of its RunWorkers.

Change-Id: I720d4404f991651de5d5f7906fbea96f0e4e20ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-21 07:11:41 +00:00
Christian Stenger
fef6986fa8 TextEditor: Fix Qbs build
Amends b26c43f133.

Change-Id: Ib2dcee8280c1a91f7a8ade344fd43c4ecd787775
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-21 05:49:15 +00:00
Alexandre Laurent
6e219addb2 Update French translation for QtCreator 12.0
Change-Id: I41ac396ad9cd2b12dff4258278e1384adeda6377
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Olivier Delaune <olivier+qt@delaune.info>
Reviewed-by: Johnny Jazeix <jazeix@gmail.com>
2023-11-20 20:11:11 +00:00
Eike Ziller
e33c15c75d Qt Quick/DS wizard: Fix the QML import path
The wizard builds custom components to a "qml" subdirectory, which the
QML engine is told about in main.cpp, but we need to tell the code model
too, with a QML_IMPORT_PATH cache variable.

Without this, the QML editor shows errors for the module imports.

Change-Id: Ie48e809e2d51cc796c6c6c186a81c67e23a3609b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-20 17:02:56 +00:00
Alessandro Portale
400dee55ef CMake build system: Push some plugins "dependecy levels" up
The higher the "level", the more dependencies. Some plugins from that
level have less dependencies than their level indicates and can "move
up".

Change-Id: I2735162ab0b64096f21bc025e3d6ecc7427a5bf4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-20 16:14:36 +00:00
Artem Sokolovskii
b26c43f133 SyntaxHighlighter: Move static functions to other namespace
- Created HighlighterHelper namespace and static functions
were moved there from the highlighter class

Change-Id: Ib93785a3819317d7c1d5cc480652d4635cb9339b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 16:04:59 +00:00
hjk
e53308eb7d Haskell: Use ActionBuilder to create action to run ghci
Change-Id: I7bb4064a06e91b580c1d5f72dc4f0ff2ab8ef0cd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 15:56:36 +00:00
hjk
8c3a1c7e5c Haskell: Move haskell project setup closer to new setup pattern
Change-Id: I3c6e6ad1a6f4b0a8d0a5598ad970c7539d1643e3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 15:56:27 +00:00
hjk
e6b052e040 Haskell: Use new setup for run related classes
Change-Id: I9c6324aea586838d83bf81098499627c8c6c6d4a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 15:56:17 +00:00
hjk
cc711d7903 Haskell: Use new setup for HaskellEditorFactory
Change-Id: I537248460291d5d649a1dc60a5f495003d76fa8b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-20 15:56:03 +00:00
hjk
f0574fdb9b Haskell: Use new setup pattern for HaskellBuildConfigurationFactory
Change-Id: I4b8598157a8be20d3447dc7c4e3196700ec3d490
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-20 15:55:53 +00:00
Ali Kianian
96ddb5da8b QmlDesigner: Remove the options from adding model dialog
Task-number: QDS-11234
Change-Id: I064d2fed81a8f2592cfefae2c603b2d790b6bfb3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-20 15:08:59 +00:00