Commit Graph

77129 Commits

Author SHA1 Message Date
Marcus Tillmanns
d7869967ce ProjectExplorer: Remove duplicate devices
In rare cases it can happen that the installer creates a device that happens
to have the same rootPath as a user created device. We need to filter
these out since otherwise it can be random which of the two devices
is selected.

Change-Id: I8269795a2e4f439fb2f02d819272723a504c6703
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 14:10:11 +00:00
Thomas Hartmann
04864bd0d1 QmlDesigner: Show message when generating package
Task-number: QDS-6825
Change-Id: I4bc826789de51778f7e9ad1314f9b0e029c7949f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-17 13:51:08 +00:00
Marcus Tillmanns
1ba366c5c0 Debugger: Fix environment when initializing
Previously when detecting / checking debuggers the process would be
started with the Host environment set. This was incorrect for remote
debuggers.

Change-Id: Icd210dbfc9437e9abd2e0c4248e5503129bf6d8b
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 13:08:14 +00:00
Alessandro Portale
43ba40530c CMakeProjectManager: Set ANDROID_USE_LEGACY_TOOLCHAIN_FILE to OFF
Task-number: QTCREATORBUG-28442
Change-Id: I190ba68df5a71ae352c49c96a64e9a3777880368
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-17 12:56:52 +00:00
Mahmoud Badri
56fa49d8e6 QmlDesigner: Allow drag-n-drop a texture to the 3D Editor
Task-number: QDS-8207
Change-Id: I58bf2857e2ae1830b1dc48f352088c424d4e7c0d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-17 12:44:42 +00:00
Marcus Tillmanns
c699249bc4 QMake: Fix path cleaning
The .pro file path is QString compared when trying to import
an existing buildfolder. This broke since resolvePath() does not
necessarily clean the path anymore.

Fixes: QTCREATORBUG-28409
Change-Id: I10286f086762b8f8dd9020aa4003317ff6180e12
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-11-17 12:13:11 +00:00
Pranta Dastider
f6d878f037 QmlDesigner: Update the wrong Timeline option text
A text was not similar in the document related to
Timeline option. This patch solves the issue.

Fixes: QDS-8263
Change-Id: I34cdb99b6e60d8a0f91baa02d0660ac9e6981523
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-11-17 12:07:59 +00:00
Alessandro Portale
9fc27b3bb4 Utils: Fix "unused parameter" warning for non-macOS
Change-Id: I4dc8a02a0476a34535352b110e140d98077b59d5
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-11-17 11:47:51 +00:00
Miikka Heikkinen
69461e4c68 QmlDesigner: Generate material browser texture icons using provider
Provider allows using special generation methods for hdr images, which
QImage doesn't support.

Task-number: QDS-8296
Change-Id: I829199264ff4a5eb677d65c908eacd1e20ad94e5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-17 11:31:42 +00:00
David Schulz
895f88f63a ProjectExplorer: create a root path without scheme for host device
Change-Id: I966db6378dca533c73635803fb177d31b2c625ac
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-11-17 09:39:35 +00:00
Marcus Tillmanns
74d915d6aa Docker: Add default search path for docker binary
Change-Id: I86e02f726e9dac7302c3435f53fdb47c70fffafd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-17 09:11:58 +00:00
Jarek Kobus
1ecde217a0 QtcAssert: Print the time of log
Sometimes, after I close Creator, I notice a bunch of logs
being written to console. However, I really don't know when
these logs happened - on close of Creator of much earlier
(e.g. 1 hour ago). Having times in log may help to link
the log content with the recently executed actions inside
Creator.

Change-Id: Id53c1eecd315917211b04adbd82669eb8865be81
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 09:09:15 +00:00
Miikka Heikkinen
96b0cda1c9 QmlDesigner: Don't write zero position properties at node creation
Some types do not have x/y properties, so don't write them at node
creation. Also, if the value would be the default zero, it is
unnecessary to write them even for types that support them.

Fixes: QDS-8304
Change-Id: I75218d599288cc79e3a390f68255cc6769df4083
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-17 08:34:18 +00:00
Thomas Hartmann
2a44f8caaf QmlDesigner: Fix shaking items when scrubbing the timeline
The reason for this is that when scrubbing the timeline,
the bounding rectangle can change a lot (See bugreport).
If this is the case the pixmap and the bounding rectangle get temporarily
out of sync, which leads to the shaking.
In this patch we add the bounding rectangle to the pixmap command.
The bounding rectangle coming with the pixmap has higher precedence.
This means if there is a pixmap, then the pixmap is always in sync with
the pixmap. If there is no pixmap we use the "original" bounding rectangle.

Task-number: QDS-7828
Change-Id: I40c0b7ed97863b9dca726547927ae1a37f9c415d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:51:28 +00:00
Tim Jenssen
f6cfe31c7f qmldesigner: increase restart timer
It was looping in debug on Windows so heaviliy
that it brought the system to hold then.

Change-Id: I10eccb6c48a22ba7a9de912a912f957066bf9c09
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:35:17 +00:00
Thomas Hartmann
6296b9a1a4 QmlDesigner: Add option for Always auto-format ui.qml files in Design mode
Task-number: QDS-8170
Change-Id: I6e345c69e60a19fd8eb7a505d7f64cb5fd664c88
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:31:59 +00:00
Thomas Hartmann
cbd96ef312 QmlDesigner: Fix crash
The timer can timeout after a detach.

Change-Id: I7eafe0a3d666942841cc0ee64d850acfab418c7c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:31:14 +00:00
Thomas Hartmann
626e1175a6 QmlDesigner: Do not specify version if it is -1 -1
Otherwise isBasedOn works differently than isSubclassOf for file components.
File components do not have a version.

Change-Id: If7009538ef97d119a348da99ed07919136c8b6e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:30:42 +00:00
Vikas Pachdha
7a65a16718 Designer: Assert url scheme of the component
Type is not parsed if the url scheme is incorrect

Change-Id: Ia5cdf2887c73769a3c1bb6d8965426b0ff7e688c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-16 16:35:04 +00:00
Vikas Pachdha
913d0e079a Designer: Fix missing semicolon in case of dynamic properties
Fixes: QDS-5457
Change-Id: Ib6be3ec864ffb972010e25c2fa956695201dba2c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-16 16:34:59 +00:00
Eike Ziller
478ce3f4a4 QmlDesigner: Fix condition for adding QMLDESIGNER_STATIC_LIBRARY define
"$<BOOL:" interprets the following string, and does not expand variables
itself.

Amends 78cf5051f5

Change-Id: I50e09e699764a00091167e8c72045a0f9055160e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 15:37:26 +00:00
Tim Jenssen
0d2cb70fd6 qml2puppet: fix broken deployqtHelper_mac.sh
The extra subdirectory "qmldesigner" was removed
in cmake build scripts by last refactoring.

For other ui helper tools in libexec is already a
working qt.conf which can be reused.

Task-number: QDS-8308
Change-Id: I7e98d0187cf2748298da263e55a64918cbb6b2c0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-16 15:35:01 +00:00
Christian Stenger
de286be2dc Valgrind: Fix plugin unit test
Amends a7956df3ca.

Change-Id: I281df7e8c8a971de6398d78c0afc09bfc3625b71
Reviewed-by: hjk <hjk@qt.io>
2022-11-16 14:42:33 +00:00
Kwangsub Kim
c39d89199e McuSupport: Avoid empty string for cmake toolchain vars
At the first run of Qt Creator after its installation, MSVC toolchain
command is set lazily after it's detected, so an empty string can be
set to cmake toolchain variable when a Qt for MCUs kit is created
automatically. It needs be avoided to keep the cmake variables valid.
Even when the command is not updated, it will work correctly with the
default variale (%{Compiler:Executable:(C,CXX)}).

Task-number: QTCREATORBUG-28457
Change-Id: I5de277831e7f1e696f67724193938d6eef7a12dd
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-11-16 14:27:35 +00:00
Kwangsub Kim
86c8d2166e McuSupport: Remove empty packages correctly
The effect of rehashing on removing an item from a set was not
considered, so the empty packages were not removed completely in
the packages set of McuTarget and it randomly caused an invalid
status of the McuTarget.

Task-number: QTCREATORBUG-28457
Change-Id: I964862330cf4f8d2de88647125f65c2959db417c
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-11-16 14:26:40 +00:00
David Schulz
c1edc1e9df ProjectExplorer: Fix starting a docker project on windows
... by mapping the executable and working directory to the target
device.

Change-Id: I0a220fe9bae980cb279fae776962f23335eac248
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-11-16 14:01:55 +00:00
Thomas Hartmann
301e7398d9 QmlDesigner: Fix ProgressParSpecifics
Task-number: QDS-8170
Change-Id: I5c9c4b1cb2751b89e7c1bb58c8f184dbbcf0623e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-16 13:48:04 +00:00
Leena Miettinen
be1aa6abed Doc: Fix typos
Change-Id: I22b610a6dcab73867f915f877d7b7b844da5dc22
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
2022-11-16 10:39:24 +00:00
hjk
2d8dc4c779 Debugger: Disable re-running
It's currently broken in a lot of configurations.

Change-Id: Ic948bb619c4860ba0c0d81a383412e6d0b007367
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-16 10:10:33 +00:00
hjk
779dc52a97 Utils: Fix interrupting local processes on *nix
Change-Id: I6e722379ad62c98d1e8e6d445c1eeea171ff141b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-11-16 08:04:01 +00:00
hjk
ef658663aa Utils: Remove internal /./ relative path marker
Some creeped into settings earlier, making the paths that were
meant to be empty look non-empty.

Also add a test for FilePath::isEmpty().

Change-Id: I99e3dd673294206558f9fee9b7c7874d2441327e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-11-16 07:23:46 +00:00
Cristian Adam
169f2c4af6 GitHub Actions / COIN: Update Qt to 6.4.1
Change-Id: Icf1600c761989914e5de5ed024d7f4c4f2f01e18
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-15 17:27:06 +00:00
Henning Gruendl
57d3af6d89 QmlDesigner: Fix state group selection
The issue was caused by a mistake during branch merging.

Task-number: QDS-8244
Task-number: QDS-8245
Change-Id: Ib88f0c5201229295c0cec45d806917156bd86d9f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-15 16:12:17 +00:00
Jarek Kobus
f8a3a4d04e SshProcessInterface: Don't use DeviceShell for control signals
It looks like starting device shell is fragile in some
circumstances.

Fixes: QTCREATORBUG-28072
Change-Id: I1a51d1fb939bd42884a55e1492de808bee89219f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-15 15:49:18 +00:00
Tim Jenssen
a7cf52cc89 qmldesigner: cleanup connect
Change-Id: Id19c49d7ca7d9f19acf971ae005c868e50aec44d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-15 15:22:22 +00:00
Tim Jenssen
974c28ee77 qmldesigner: fix possible crash
Task-number: QDS-8246
Change-Id: I91cdf2887c73769adc1bb6d8965426b0ff7e6884
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-15 15:22:16 +00:00
Christian Stenger
8bbeef1f98 Core: Tweak handling of scratch buffer
If a temporary file is stored by using "Save As..."
the temporary state should get lost to properly handle
other actions, like closing a modified file, putting it
into the recent files list, or similar.

Change-Id: I94b3141bad1bd476056a774756071df5f60137aa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-15 13:14:41 +00:00
hjk
e3b84dca1a Revert "Debugger: Avoid some temporary containers when parsing escaped chars"
This reverts commit 19ef8e5c7a which
introduced the following regression:

FAIL!  : tst_protocol::parseCString(octal) Compared values are not the same
   Actual   (parsed)  : "abc\u00C3\u00A4\u00C3\u00A9def\u00C3\u00B1"
   Expected (expected): "abc\u00E4\u00E9def\u00F1"
   Loc: [/data/dev/creator-out/tests/auto/debugger/tst_protocol.cpp(32)]
FAIL!  : tst_protocol::parseCString(hex) Compared values are not the same
   Actual   (parsed)  : "abc\u00C3\u00A4\u00C3\u00A9def\u00C3\u00B1"
   Expected (expected): "abc\u00E4\u00E9def\u00F1"
   Loc: [/data/dev/creator-out/tests/auto/debugger/tst_protocol.cpp(32)]

Change-Id: I59509fd61a54c335ab0a34f8ca0dffb3d75da696
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-15 11:40:29 +00:00
Jarek Kobus
adac83367c LinuxDevice: Fix stopping remote app when run in terminal
Before, the SshProcessInterface was trying to run kill
command (on remote host) for the running processId. However,
in case of terminal process the returned processId is an id
of ssh running through creator process stub, not the id of
remote process. The fix is to redirect a call to sendControlSignal
into the internal terminal process.

Change-Id: I57509fd61a54c335ab0a34f8ca0dffb3d75da696
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-11-15 11:11:39 +00:00
Miikka Heikkinen
eae9be4218 QmlDesigner: Unify state handling on puppet reset
Form editor and 3D edit view changed state to base before issuing reset,
and form editor also changed it back to current state after issuing
reset, while all other resetPuppet calls do not change state.
Since puppet reset is asynchronous with small delay, the state changes
done by form editor did essentially nothing, and just changing to base
state in 3D edit view is wrong as we don't want reset to change the
state.

Removed state changes from puppet resets to unify the reset
functionality.

Fixes: QDS-8253
Change-Id: I33be3ec864ffb972010e25c2fb956695201db9ec
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-15 10:12:02 +00:00
Henning Gruendl
4c468e79f7 Update 3rdparty json
Change-Id: Ia6ecadac49eec73b1a3ccf8086aec42ccfea8f5e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-15 09:35:43 +00:00
Eike Ziller
35a37c3450 Merge remote-tracking branch 'origin/8.0' into 9.0
Change-Id: I6a5cd79d60195579538ed8684010d295b4eea047
2022-11-15 09:50:05 +01:00
Robert Loehning
b85183d966 SquishTests: Improve tst_memberoperator
- Update expected behavior
- Update to ClangCodeModel replacing "." with "->"
  only after selecting a completion
- Update to ClangCodeModel no longer announcing
  needed substitution in proposal widget
- Added test for unchanged lines
- Stabilize by using proper wait conditions
- Fix surplus warning

Change-Id: Ia90e0102d44fbd8abb41acaa83509657ad11bf4d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-15 08:48:16 +00:00
Eike Ziller
facb2bdb4d COIN: Adapt to changes in install_qt.py
Change-Id: Ie6acef0baafc5950fd025cc0fe9c3da9bb82a8d6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-11-15 08:42:52 +00:00
Cristian Adam
b36cc91acb Qt Creator Plugin Wizard: Update GitHub Actions yml file config
- move to only Qt6 builds since Qt Creator 9 only supports Qt6
- update the CMake Version
- update actions package versions not to get deprecated warnings
  from GitHub

Change-Id: Ief6c526ade69b4b120f614081bebfff5809101eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-15 08:38:08 +00:00
David Schulz
4b126550c1 Editor: completely repaint annotations on changed bounding rects
If the rectangle of an annotation changes we need to completely redraw
the annotation since the content might have shifted and the eliding
character is now at a different position.

Fixes: QTCREATORBUG-28411
Change-Id: I41b0f38a73b287e6a5d5318ba797aac6e2ff71b0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-15 06:50:59 +00:00
Robert Löhning
80885d12e0 SquishTests: Update tst_installed_languages
Change-Id: Ic06b6241df913ebcfe685936f3c509875a2897bc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-15 06:45:00 +00:00
Cristian Adam
73ba7e8f98 GitHub Actions: Remove deprecation warnings
This removes the warnings that the jobs display due to upgrades
that will be done for the internal GitHub Actions services.

Change-Id: I4865c7e61f3da04a00f14657a87ecdd63c24325c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-14 14:56:37 +00:00
Samuel Ghinet
873ca6d391 QmlDesigner: Fix scene environment color for 3D view
There were two problems:
* When the user checked "Use Scene Environment Color", the initial
  color set as background color was not the one configured in the
  "Scene Environment" clear color. The user had to change this color
  manually.
* If the "Use Scene Environment Color" is checked, then, upon the user
  clicking "Reset View", the background color was changed to a wrong
  value.

Also, fixed an error message in QML.

Task-number: QDS-7436
Change-Id: If42ef1a4532244f3326f5a27a082371aa77d78d8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-14 14:00:50 +00:00
Miikka Heikkinen
889e999f32 QmlDesigner: Clear material preview cache on detach
The previews are cached based on modelnode internal id, which can
overlap between documents, resulting in briefly showing incorrect
preview when new document is opened. Also, never clearing the cache
leads to leaking memory.

Fixed the issue by clearing the preview cache whenever all materials
are removed from browser (model detach and material library deletion).

Change-Id: Idad39fef62871c4e94f35604e643c7195ae9ec81
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-14 13:22:11 +00:00