Commit Graph

76686 Commits

Author SHA1 Message Date
Eike Ziller
ae6c974fb2 Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/android/androiddevice.h
	src/plugins/android/androidplugin.cpp
	src/plugins/android/androidplugin.h

Change-Id: I1a68354415283fe4a7450706520a576d2a1775e0
2022-03-23 14:16:07 +01:00
Robert Löhning
5b0b48177b Squish: Port tst_WELP03 to Python3
Change-Id: I997fb8cc44fab986b5f4e0aa6e6f1f92fccfd54a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-23 13:14:18 +00:00
David Schulz
031998c988 ++year in copyright template
Change-Id: I6c390812559826645f6c04b2c52fdad015765223
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-23 13:05:47 +00:00
Jarek Kobus
ae49fb213b Ensure that after a call to waitForFinished() process is not running
Amends 5de5f1cf0a

Change-Id: I64db8c6736c6a7cc6805813f852faf1048ebb629
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-23 12:12:39 +00:00
Thomas Hartmann
39a81a7baa QmlDesigner: Force QtQuick.Studio.x components to use version 1.0
With the latest chages and switching to cmake the version
is actually 6.x, but 1.0 is also supported and this will
keep projects backwards compatible.

Change-Id: Id3d77b323f008ca20bd276859d5a4a573663120c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-23 11:54:56 +00:00
Artem Sokolovskii
09264b6da3 Wizard: Fix misspelling
Change-Id: Iabf0655fd9d8690e7d18d0cc2366bcbf43835916
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-23 11:41:32 +00:00
Jarek Kobus
816746a06d LauncherInterface: Wait for graceful finish of process launcher
Give process launcher a chance to finish its processes
gracefully before we finish process launcher's process in Creator.
Otherwise, when Creator's process reaper kills the process
launcher's process while the process launcher is still
reaping its processes, the process launcher may leave zombies.

Instantiate the ProcessReaper inside ProcessReaper::reap(),
otherwise its destructor won't run at all inside process launcher.

Reverts e45e16d904

Fixes: QTCREATORBUG-27118
Change-Id: I00290cda05538b5a7ecbeb08240d1e3772d43d62
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-23 09:33:20 +00:00
Christian Stenger
71a7928194 Python: Fix typo
Change-Id: Ide2d1d893ffcb0ebb6cb3aa787cf1f07960fcfc0
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-23 09:28:50 +00:00
David Schulz
7c3d6c1fc1 Python: remove unused variable
Change-Id: I1c16e4b3795f83e1107d39f0265465b0926d4c97
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-23 09:28:12 +00:00
Tim Jenssen
faadc86ece qml2puppet: disable multilanguage if Qt version < 6.2.1
Change-Id: I8dc7114ac550e8cc0d5a1f0e5f5524145aa158a3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-23 09:19:39 +00:00
Thomas Hartmann
bf2ece2d15 QmlDesigner: Remove globalBaseUrl
It is not used anymore.

Change-Id: I1d436888b5a93a187065cd8276b55a233a0f374c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-23 08:50:30 +00:00
Thomas Hartmann
6662e138d7 QmlDesigner: Remove finishedNotify
It is not used anymore.

Change-Id: I706a973c55c22211457bac01534a5e7b59a40b25
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-23 08:50:24 +00:00
Thomas Hartmann
4ed637d8da QmlDesigner: Do not allow baseState as id
Using this as id will lead to bugs.

Change-Id: I76997a31e290e0cd67688fecdb1e9521c88481da
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-03-23 08:50:16 +00:00
Christian Stenger
34b94d8cd2 Squish: Update Welcome page test
Change-Id: I447addcba50e932886a8ed5e730a1eab663a2224
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-23 05:37:42 +00:00
Tim Jenssen
0f7a4484d0 qds: disable crashpad with universal builds
Change-Id: Iafb1264bfc6b669fd327b052d39ae97c12e329b4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-03-22 21:09:59 +00:00
Thomas Hartmann
e33150d7b2 QmlDesigner: Fix DirectoryFontLoader
It was not using the new folder structure.

Change-Id: I9ab87ac32dfce203defe7c914f3091121bb6f549
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 17:03:54 +00:00
Henning Gruendl
f14c9d88e1 QmlDesigner: Add placeholder functionality
Add placeholder functionality to StudioControls TextField

Change-Id: I2a6659a40effbc04c42d80a218c0bd70e0b3343f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 16:42:03 +00:00
Henning Gruendl
0c7ec14c62 QmlDesigner: Fix WindowSpecifics for Qt6
* Duplicate WindowSpecifics.qml and move it to QtQuick referencing the
  original from QtQuick/Window as the import changed in Qt6
* Add missing properties to the original specifics: position,
  minimumWidth, minimumHeight, maximumWidth, maximumHeight,
  contentOrientation, flags, modality, visibility

Change-Id: I542f94b153172d4c7b5a2c62ad0abdc53b8bd1fd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 16:40:44 +00:00
Thomas Hartmann
fe711ebce4 QmlDesigner: Parse .metainfo files from the share folder
We have some plugins that essentially only contain a .metainfo file.
the possibility to drop .metainfo files into that folder simplifies things.
In QDS 3.2 this will be used for the particle library.

Change-Id: I0c4bb7f66bb8eaa3f806ec9d34c6991d08ef5a5f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 14:39:27 +00:00
Samuel Ghinet
635d6bab0f QDS New Project dialog: Rename NewProjectView.qml to PresetView.qml
Change-Id: I5f129a53404bfb80e3e11f9d73754674f3693952
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-22 13:41:49 +00:00
Samuel Ghinet
9c5f390aa8 Qds Project Wizard fix: cannot select style
This bug was caused by QDS-5741: Use hover states for interactive items

Task-number: QDS-6470
Change-Id: Ice12374257645e39a6c488c30ab584636ba52e9a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-22 12:06:12 +00:00
Eike Ziller
de63ea9a60 File System: Allow removing empty folders
As the reverse operation of New Folder.

Fixes: QTCREATORBUG-26886
Change-Id: I9c65a152850ec8260e9c260ea49cdad048a92aa2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-22 11:54:28 +00:00
Eike Ziller
22c67db406 Fix double-clicking in Projects view to open file in extra window
When you have an external editor window open (Window > Open in New
Window):

- make sure that the editor has focus in the main window
- switch to the external window
- double-click a file in Projects, Open Documents, or File System view

The file is supposed to open in the external window.
The problem is that clicking into e.g. Projects view activates the main
window, which changes focus, and the current editor.
Something changed in the event order in Qt (also Qt 5), so the existing
workaround that delayed setting the current editor view in that case by
just one event loop cycle doesn't work anymore. Delay be the double-
click interval instead, so the double-click can be processed before the
main window's editor view is made current.

Fixes: QTCREATORBUG-26773
Change-Id: I56efd5a50a8bb986563c8c15d340756dace06494
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-22 11:52:10 +00:00
Thomas Hartmann
70c44acdd8 QmlDesigner: Fix itemlibrary template generation
Since this is likely executed in a transaction and
newQmlObjectNode.setId() uses refactoring on the QML code
this is not working as expected. Setting the id without any refactoring,
that triggers changes of the QML code, is save to be used.

Change-Id: I5d29689eff34827de9e451f433d9a4b42569a64e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-22 11:50:23 +00:00
Assam Boudjelthia
2846bef563 Android: fix logcat retrieval on pre Android Nougat
Logcat on pre Android Nougat (API <= 23) was broken because the the
returned output from the adb command had lots of null characters \u0000
in the string, and thus the comparison against the deployed package
name was failing and the pid was always -1. This makes sure to remove
any null characters before the comparison and simplifies the code a bit.

Task-number: QTBUG-101673
Fixes: QTCREATORBUG-26732
Change-Id: I3f185eceab376dbb0f4f11cf628b71e058ee5583
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-22 11:42:11 +00:00
Jarek Kobus
5de5f1cf0a QtcProcess: Add a test for crashing app
Ensure that when waitForFinished() didn't timeout
but the process has terminated, it returns true,
like QProcess does, in contrary to what QProcess'
documentation says.

Change-Id: I6af5034f4df7fc2e14a83bab74334a8abefe7a0f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-22 11:30:24 +00:00
Christian Kandeler
137d3367cf CppEditor: Do not crash on doxygen comment creation
... for templates that were not parsed entirely successfully.
Amends a437539096.

Fixes: QTCREATORBUG-27207
Change-Id: I4d7935b30cac9ce14f442977d07417a343ecae11
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-22 11:01:18 +00:00
Christian Stenger
59cb70e61f Python: Fix compile on Linux
Change-Id: I193fb8e5c8e6815fbd1b358c1dda1918ff2be6f0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-21 15:47:17 +00:00
Thomas Hartmann
638b93591b QmlDesigner: Remove unrequired event filter
This event filter was introduced because other wise
actions in QML like CTRL+C or CTRL+UP were intercepted
by QWidget::QAction. With Qt 6.2.x this workaround is not
required anymore.

Change-Id: I43a84ae13cca58840afacabe85c36c5f2235cf39
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
v7.0.0
2022-03-21 13:58:58 +00:00
Thomas Hartmann
675875c3b4 QmlDesigner: Block more imports
Change-Id: I839fb320df61bad0a39ff98e1274201f5a99a8ed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-21 13:58:37 +00:00
Samuel Ghinet
fb1c6fbfe2 Qds: New Project dialog in new Welcome screen should close on Esc
Task-number: QDS-5697
Change-Id: I26f2e65bbb98b15b3867e0774a1bf8f78409b430
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-21 13:34:02 +00:00
Artem Sokolovskii
b06db48869 Wizard: Improve QtQuick2 extension plugin
- Added options for Kit version
- Added CMake support for Qt6.2
- Added options for creating example project,
which uses the plugin

Task-number: QTCREATORBUG-26982
Change-Id: I808c01bce6e4015a679f2fd69767c13179a25ee5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-21 12:47:11 +00:00
Cristian Adam
a1929bd9d7 ClangCodeModel: Add some more timing debug information
By setting QT_LOGGING_RULES=qtc.clangcodemodel.clangd.timing=true I can get
values like:

qtc.clangcodemodel.clangd.timing: highlighting: Start to end: 2953 ms
qtc.clangcodemodel.clangd.timing: ClangdCompletionAssistProcessor took: 7343 ms

The first tells you how long Creator took to turn clangd's semantic tokens into
full highlighting info, and the second how long it took for Ctrl+Space.

Change-Id: I99bd04c2889bb7da98c04537eab06d6ed6117167
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-03-21 12:40:33 +00:00
David Schulz
6f520f8783 Python: extract pip installation task
Make it reusable for pyside and other packages.

Change-Id: If97e65a506d36916aaa61f48b9a2f71c458d4fe9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-21 11:38:06 +00:00
Jarek Kobus
c94564d910 LinuxDevice: Get rid of a marker for outputForRunInShell()
Don't rely on a synthetic marker when running a shell
command and expecting any output. The marker might always
be a part of the output data from the running command.
That's unreliable.

A solution is to do a similar thing that we are doing
inside runInShell(). We ignore the error channel there,
so it means that when calling outputForRunInShell() we
have two channels for our purposes. So, the output from
the command we pass through, and its error channel we
redirect to /dev/null. Later, we run "echo $?", which
prints the return code from the last command and we
redirect it to standard error channel. Inside
outputForRunInShell() we read the error channel as long
as we detect something there. We assert if it's being
convertible to int and we also assert that the command
itself succeeded. Afterwards we break the endless loop
and read the output channel for the first time - it
should contain all the output gathered from the running
command.

Change-Id: Ia0ad73623f813ef593c11dff9bdba4df9e524315
Reviewed-by: hjk <hjk@qt.io>
2022-03-21 11:32:31 +00:00
Mats Honkamaa
047253b6a8 Doc: Add information about visualization of emitters and attractors
Task-number: QDS-6370
Change-Id: I7c9e2a03b025d16769ed7cc4f3da85fe91193321
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-21 10:38:47 +00:00
Henning Gruendl
f347623804 QmlDesigner: Add missing StudioControl in qmldir
Change-Id: I5bbe66b306b0a947256533050a98fc0e4671774f
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-21 10:14:43 +00:00
Christian Stenger
162fc2708c McuSupport: Fix qbs build and build with Qt5
Amends 8c04c2ea55.

Change-Id: I27f2c900cddfd79b52d4989fa321e6f86177c89e
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-03-21 10:13:46 +00:00
Thomas Hartmann
648e659356 QmlDesigner: Simplify naming of views
* Curve Editor -> Curves
* 3D Editor -> 3D
* Form Editor -> 2D
* Text Editor -> Text
* Transition Editor -> Transitions

Most view titles are now a single word and all superfluous "Editor"
as part of the title have been removed.
"File System" and "Open Documents" stay as they are.

Task-number: QDS-6325
Change-Id: I8fb6477f9e07c324f76a49796f550a8b8799fedd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-21 10:04:08 +00:00
Christian Stenger
5474495acd Utils: Fix build with Qt5
Amends 2b286c755b.

Change-Id: I7f28cb4ac0d5b515df1e46c1f514a0275472d438
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-21 10:02:55 +00:00
Fawzi Mohamed
6b270b8dc9 qmljs: correctly handle js string templates
In most cases we do want to visit the expressions in a function
template. Changing its accept0 would force those not wanting to visit
it to iterate on the templates (currently a linked list), so we add a
visit method explicitly visiting the expression in all the needed
places.

Fixes: QTCREATORBUG-21869
Change-Id: I47733544bfd32eec357810b97242608b8f7de572
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-03-21 09:32:29 +00:00
David Schulz
9d1fe1df14 Python: ensure opened file is inside a workspace
The Python language server seems to dislike files that are not part of a
workspace resulting in very long lookup times for specific symbols.

Fixes: QTCREATORBUG-26230
Fixes: QTCREATORBUG-24704
Fixes: QTCREATORBUG-24140
Change-Id: Iceb7a2b3d57aea6554225a74587f619e530e10c9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-21 09:08:19 +00:00
David Schulz
d824c276df LanguageClient: constify createClient
Change-Id: I4b9aba1388a31b6d1531cb4a6346a394c5aab150
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-21 08:48:29 +00:00
David Schulz
1a88f26d8b LanguageClient: rename clientForSetting -> clientsForSetting
Change-Id: Idf4055769fba4c2551ac968c0232ddb3916acb6c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-21 08:48:24 +00:00
David Schulz
5924268568 LanguageClient: unify client container
Change-Id: I17b5e7ca4999cd5a9ca8e79577f29854082b6c6b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-21 08:48:17 +00:00
Christian Stenger
f69de8b5bc Tests: Fix compile
Amends 47bcb63854.

Change-Id: I34a867b3b0b868933937e37e8268b98078aa3023
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-21 07:59:19 +00:00
David Schulz
2b286c755b Utils: allow passing data via info bar combo box
Change-Id: I47daa83a533a76eb4ad0ab3f5cf8c04faf389b98
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-21 07:57:10 +00:00
Robert Löhning
a2735ec024 Squish: Don't configure projects on Qt4 anymore
Change-Id: Ib09fc44323e09fa4d6a5d2428c35b5b6afe08f24
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 18:27:32 +00:00
hjk
1960799be2 Utils: Add bits of process output when debugging QtcProcess
Change-Id: I03b7825e29be5dd5a78768c5831756703ce7fdf1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-03-18 15:29:49 +00:00
Jarek Kobus
dabe2e1493 ProcessLauncher: Don't emit error twice on process crash
Behave the same as QProcess in this circumstances.

Change-Id: If8175ccb7102d6a561584ee73c2e5c5844f2770d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-18 15:19:35 +00:00