Commit Graph

88653 Commits

Author SHA1 Message Date
Christian Stenger
7a6d99a9f6 CMakePM: Improve handling of adding translations
In case of having no translations setup with the wizard or
manually later on we just do nothing and fail with adding
the translation file.
This patch minimally changes the CMakeLists.txt so that the
files are not "lost".

Task-number: QTCREATORBUG-29775
Change-Id: I560c8b736ec2a0a8de6e1177317a9172921f4340
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-12-11 09:31:01 +00:00
Christian Stenger
1cdb702fa6 CMakePM: Improve support for adding translation files
There are more ways to add translation files to a cmake project,
so support the common ways.

Task-number: QTCREATORBUG-29775
Change-Id: I15f0d7a13303a1845760dbfc830c6f773f634ce0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-12-11 09:30:53 +00:00
Christian Stenger
960768302a QtSupport: Support adding translation file
..for the major build systems. CMake build system will get further
improvements. For now this only works for adding ts files to the
target after the project had been created with QC's wizard with
some translation already added.
Qbs and qmake just work.
The C++ sources obviously will not change automatically to
integrate translation support for the application.

Task-number: QTCREATORBUG-29775
Change-Id: I80e4c21156f4bb8d5ef0bd6edf805021a55770ee
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-12-11 09:30:45 +00:00
Eike Ziller
dd9f9c799b Support view/hide right side bar in Debug mode
Like it is now supported in Widget Designer, the view/hide action
toggles the corresponding dock widget area. We cannot do that for the
left dock widget area yet, because that action still needs to toggle the
navigation side bar.

To support this, we need to save not only the QMainWindow state for the
debugger perspectives, but the whole FancyMainWindow state including the
information about hidden dock widget areas. Unfortunately the
PerspectiveState was serialized to QVariant without versioning, so
keeping it that way is difficult. Switch saving&restoring of
PerspectiveState to Utils::Store (and keep some compatibility code).

Change-Id: I0035841930c6a574aeb31650a28be9989e2b5741
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-11 08:41:53 +00:00
The Qt Project
c6f4fa6b18 Merge "Merge remote-tracking branch 'origin/12.0'" 2023-12-11 08:30:05 +00:00
Eike Ziller
57d4ea4dcc Merge remote-tracking branch 'origin/12.0'
Conflicts:
	src/plugins/designer/formeditor.cpp
	src/plugins/git/gitplugin.cpp

Change-Id: I554a844fab4c55249a00f394f9ba174c7548dbbe
2023-12-11 09:28:21 +01:00
Jarek Kobus
88b9268315 TaskTree: Update Storage docs
After recent changes, the Storage object isn't derived from
GroupItem class anymore. Instead, there is a Group constructor
taking the Storage object. Make docs precise, that Storage
isn't a GroupItem, but we may have a GroupItem containing a
Storage.

Make it clear, that the running task tree doesn't instantiate
the storage itself, but it's data type.

Add more links.

Change-Id: I1569602cabae39215c48824b6897387e631b90a8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-12-11 08:19:49 +00:00
Eike Ziller
7ec55f89f1 FancyMainWindow: Use "Store" type for settings instead of custom QHash
Change-Id: Id0735af2ee9b138c9a53525a236fde2a0310c695
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-12-11 08:04:15 +00:00
Christian Stenger
32096547a7 Git: Fix qbs build
Amends ff9170b820.

Change-Id: I8170889beb7ea268f2f1654d020d121140a45fb3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-12-11 06:28:02 +00:00
Andre Hartmann
ff9170b820 Git: Move Instant Blame into own class
Change-Id: Ic7bdfb47d0de2a5499e40c9eeaead8bbf30a12e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-12-10 20:21:39 +00:00
Alessandro Portale
5745145f5a recolordocsicons.py: Remove misleading comment
The comment was a copy-paste remainder from export.py

Change-Id: I5209060e5edf8072940f1542c547baf54766f425
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-10 16:18:20 +00:00
Artem Sokolovskii
ee75c7276b ClangFormat: Fix utf8 symbol indentation
Fixes: QTCREATORBUG-29927
Change-Id: I5a5a326e13cbe3a874a66e275ded0c6dea9964d7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
v12.0.1
2023-12-08 17:48:39 +00:00
Mahmoud Badri
cc07031cd6 EffectMaker: Improve adding and saving compositions
Add and implement 2 icons for adding and saving compositions.

Fixes: QDS-11511
Change-Id: I113eeb81ea05fc6db9019d95d476bc0fe20b409f
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-12-08 15:41:50 +00:00
Miikka Heikkinen
4ab995da59 EffectMaker: Update changed effect to 2D/property views
The effect directory will be rescanned to update the types,
and the puppet is reset if updated types are in use in the
current document. If updated effect was also selected,
selection is refreshed to update property view.

Fixes: QDS-11367
Change-Id: I79cf476d8a70295f79525b6e1a5eeda27bb0b637
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-08 14:59:25 +00:00
Eike Ziller
f88048845f Debugger: Remove unused function declaration
Change-Id: If4d828a4b1388a4c5a1eefe681cc80924efe4bfa
Reviewed-by: hjk <hjk@qt.io>
2023-12-08 14:43:19 +00:00
Eike Ziller
f97cb710ad Debugger: Remove perspective settings compatibility with 4.10
That was 4 years ago

Change-Id: I6b2193051d5bd71f402f75484c1defef907f6693
Reviewed-by: hjk <hjk@qt.io>
2023-12-08 14:42:55 +00:00
Jarek Kobus
867570d8dd Qnx: Get rid of chmod step, it's a part of sftp transfer now
Change-Id: I692a8e03a7f628a4a1bfca1858b89291f854bb1b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-12-08 14:20:44 +00:00
Jarek Kobus
465259eb3b RemoteLinux: Make chmod a part of sftp transfer
Task-number: QTCREATORBUG-29971
Change-Id: Icee46c0442f58a054cf15021f64595765909a586
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-12-08 14:20:36 +00:00
Christian Kandeler
2f49c0830e Update qbs submodule to HEAD of 2.2 branch
Change-Id: I52b79281d4df14fd90719d2e7d61f293cb7d43d9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-12-08 13:47:08 +00:00
Jarek Kobus
f170d74880 TaskTree docs: Add more cross-links to the workflow policy
Change-Id: Iff78e11776a301e8b8080dc95373504614c3461a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-12-08 13:30:31 +00:00
Christian Kandeler
fa6a50e349 QbsProjectManager: Fix project parsing crash
We called deleteLater() on the parser while immediately deleting an
object that was supposed to outlive the parser.
Amends 1231c9e546.

Change-Id: I7ada041c4047d86249c5bdefc0c53e70dcdd5140
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-12-08 13:26:06 +00:00
Eike Ziller
d39a10bdd2 Designer: Fix the mapping between buttons and edit mode
The tool buttons for switching the edit mode e.g. between "edit",
"signals/slots", and "buddy" hardcoded the index of the corresponding
tool in designer. The index in designer depends on the load order of
(static) plugins, that has changed in qtbase
2f226336a2aeb477b7ba339b6c3a63abb69746c3 (Qt 6.5.1 and later).

Instead of relying on the index/plugin load order, try to find the right
tool by class name (still falling back to the index otherwise).

It would be nicer if the tools had actual IDs though, but that change
would need to go into Designer first.

Fixes: QTCREATORBUG-30017
Change-Id: I17caea6289574db2b1c8934e80d865a142b74725
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-12-08 11:10:52 +00:00
Tim Jenßen
19a81c13df ADS: compile fix against Qt 6.2.x
Change-Id: Iad2b44dd056dbd37ba47133dd972e8bfbf11f7cc
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-08 11:08:47 +00:00
Mats Honkamaa
f03b1cd53b Doc: Clarify previewing on device instructions
Task-number: QDS-10228
Change-Id: Ic5fd9abd26e996e3201ca5fac062e6d593e8609f
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-08 10:56:26 +00:00
Shrief Gabr
5f26d1e4eb QmlDesigner: Remove datatype names from column
Task-number: QDS-11460
Change-Id: I9501db735a5b0b4eb54740b8a4d3e20287aa4207
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-12-08 10:51:10 +00:00
Alessandro Portale
608bb8cf3d Utils: Add StyleHelper::fontToCssProperties
This function takes a QFont and returns the relevant CSS properties as a
string. Using that CSS string in Qt's HTML supporting widgets ensures
the true to detail HTML rendering of text elements with those CSS
properties.

This change also adds an HTML sample to tst_manual_widgets_uifonts.

Change-Id: I7caf3214854f6ee62ae1211015572c640fc08dc8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-12-08 09:10:50 +00:00
Mahmoud Badri
034f48070c QmlDesigner: Allow qDebug() << an Import
Handy for debugging

Change-Id: I524dab8895dc7c9ae2ae9fa820c4a57a6072e1ab
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-12-08 09:06:00 +00:00
Mahmoud Badri
268fa9fe65 EffectMaker: Show current composition name
Fixes: QDS-11442
Change-Id: I047040e42fd60c00abe2be7e2210fc8bb53678cb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-08 09:04:43 +00:00
Mahmoud Badri
dfcb3d0462 QmlDesigner: Improve collection editor edit column dialog
- move name and type fields to same line as their labels to reduce
dialog's height
- remove "force" option, force by default after showing a warning
- focus and select name field upon dialog open
- when opening the dialog for last column, align right to avoid overflow
- bunch of cleanups and naming improvements

Fixes: QDS-11245
Fixes: QDS-11250
Change-Id: I613a9cf693320b0bc0768ea709eb47e00d218222
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
2023-12-08 08:57:07 +00:00
hjk
3e62f5d522 Random warning cleanup
Clang16 in C++20 mode.

Change-Id: I87801e362a3ba6e38cfebd319a7aee2ed4e45568
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-12-08 07:21:14 +00:00
Andre Hartmann
960ac1adf4 Git: Branch View: Add upstream status for untracked branches
Display the local commits (not contained in an upstream
branch) in this case.

Change-Id: If1b7e4c8c98c9867b1003b6ea0530494a14bc994
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-12-07 19:40:55 +00:00
Cristian Adam
e59e80f74f TextEditor: Replace 'Monaco' with 'Menlo' on macOS
According to https://en.wikipedia.org/wiki/Menlo_(typeface) 'Menlo' is
the newer font family.

Is also in sync with the font used by the Terminal plugin.

Task-number: QTCREATORBUG-29964
Change-Id: I50b439be32f08176b910017b68384ea61cab7337
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-12-07 18:15:24 +00:00
Ali Kianian
bb690b4ccc QmlDesigner: Fix the bug for showing focused widget-based scrollbars
Fixes: QDS-11474
Change-Id: Ibfc156893812ab7a541fe01e995fe528a1d80d2f
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-07 15:58:05 +00:00
Jarek Kobus
6f155f44f9 Solutions: Get rid of [=] lambda captures
Change-Id: I806353e2e0f0163a03ff17edf8c25fdf6c1f8c65
Reviewed-by: hjk <hjk@qt.io>
2023-12-07 15:55:30 +00:00
Alessandro Portale
723ba0fc48 Utils: Add a manual test for StyleHelper::uiFont
Visualizes the predefined ui fonts.

Change-Id: Ic0af15ab149b213a59bf8e22cf7e17ab9042c54e
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-07 15:22:54 +00:00
Thomas Hartmann
c3d22dfcd9 QmlDesigner: Avoid deletion and recreation of keyframes if possible
Without this all keyframes are first deleted and then recreated.
This becomes notable slow with a larger number of keyframes, since the
timeline does react to each deletion/creation and rebuilds the scene
for the group.

Instead we can keep all keyframes and simply adjust their frame.

Change-Id: Ic34ffbdea74f57cf8f5bcddfbce8a8c18ffef7b0
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-07 14:40:55 +00:00
Serg Kryvonos
ed75627a22 dto.cpp C++20 compatibility
Change-Id: I556afac8718aa45d70dfb999e6e49620d638c5eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Andreas Loth <andreas.loth@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-12-07 14:21:42 +00:00
Leena Miettinen
52eff2c6a4 Doc: Turn "Using Custom Output Parsers" into two how-to topics
Task-number: QTCREATORBUG-29361
Change-Id: I426f0fe545a485a1932d1e59fed99c07c71f4aff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-12-07 14:16:22 +00:00
Eike Ziller
a20e2d29fc CMake: Fix file path kind for the staging directory
Fixes: QTCREATORBUG-29997
Change-Id: I7a86b90a366bc59b206a44b5e93b54582c2aed14
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-12-07 12:26:33 +00:00
Cristian Adam
7ea90a11e4 ProjectExplorer: Make CustomParser creation available outside PE plugin
This would allow usage from other places, like the CMakeProjectManager
plugin.

Change-Id: Idf12b6688c9ac3c71b5614dce37babbeab7f6748
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-12-07 12:05:00 +00:00
Marcus Tillmanns
b2086c22a8 QmlDesigner: Fix virtual destructor
Fixes warning about non virtual destructor:

Qt/6.6.1/macOS/lib/QtCore.framework/Headers/qcontainertools_impl.h:220:9: warning: destructor called on non-final 'QmlDesigner::QmlObjectNode' that has virtual functions but non-virtual destructor [-Wdelete-non-abstract-non-virtual-dtor]
        (--first)->~T();
        ^

Change-Id: I72306f68f7ae745c3e2dc51ef7d989525a8532e0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-07 11:58:40 +00:00
Cristian Adam
6caf0f0d59 Testsleep: Fix CMake configuration error when test is disabled
If the user has a minimal configuration and the test is not enabled the
call to set_target_properties will fail because the target does not
exist.

Change-Id: I084c53e8d78d92547c1592edc0a19f48d4e76327
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-12-07 11:22:05 +00:00
Cristian Adam
144194b79a CMakePM: Fix crash when editing CMake files without a project
Fixes: QTCREATORBUG-30023
Change-Id: Id849635dd0e7437d7ae93251130d2f26ded24def
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2023-12-07 11:21:19 +00:00
Christian Kandeler
68e44b3372 CppEditor: Do not insert empty project part lists
... in CppModelManager::projectPart().
Amends 96c21b0e36.

Change-Id: I7e0dac258a4b4576a6ab772cb7074068a1bea726
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-07 11:16:09 +00:00
Alessandro Portale
a4a27b8931 Utils: Fix function name case StyleHelper::Uifont -> uifont
Oopsie.

Change-Id: I66c4b56f43c50e3dfc5c17ffd95d778d496b77f2
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-12-07 11:05:12 +00:00
Jarek Kobus
a737ddd931 Process: Use GeneralProcessBlockingImpl for QProcess implementation
This should fix the Process::waitForReadyRead() when the data
appeared on stdErr channel and not on stdOut channel.

Amends ec722b9132

Change-Id: Ib9f361f4d1602487bdbbb735e55d0ad24fb5e4c3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-12-07 10:47:59 +00:00
Jarek Kobus
db4486e915 Process: Add a test for waitForReadyRead on error channel
Currently it works only in case of ProcessLaucher implementation.
The issue with QProcess implementation is that we need to
select the active channel in advance with QProcess::setReadChannel(),
what really doesn't make sense, since we can't predict on which
channel we will receive the data.

Currently we don't have setReadChannel() method inside Process API.

Change-Id: I23592e37f2ed5e3326bead445a9c6c6500d0e615
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-12-07 10:47:50 +00:00
Jarek Kobus
2304dbb395 Process: Make multiRead test platform independent
Change-Id: Ife58e7b2a41ac35f8137acfc66ff827672f75de9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-12-07 10:47:45 +00:00
Jarek Kobus
1ea1ea7747 Process: Add a test for reading the errorChannel
Change-Id: I3b1d35c8ef2be91ddd1591a0fa2dafedc268f916
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-12-07 10:47:39 +00:00
Miikka Heikkinen
b5370c435e EffectMaker: Block adding same effect node twice
The actual blocking is done at uniform level, as the problem of having
same effect node twice is duplicate uniforms.

Fixes: QDS-11470
Change-Id: I77b15b4a207efaebff39b4f6b1700d70262abcdb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-12-07 08:37:29 +00:00