Commit Graph

74059 Commits

Author SHA1 Message Date
Thomas Hartmann
3b5c56bcfa QmlDesigner: Add invalid ids to QmlJSCheck
Also improving document message for exceptions.

Change-Id: I7878987ce73f5d4891ced3c702c7804b25b07eb3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-24 11:41:53 +00:00
Miikka Heikkinen
d3dae6b7dd QmlDesigner: Don't generate new id for node if already set
Source template may already set the id for the generated node,
in which case we don't want to override it.

Fixes: QDS-6530
Change-Id: I22b86e6bb744372ad07924f440a6ecd0dad54095
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-24 10:58:11 +00:00
Orgad Shaneh
38462c8f13 Debugger: Fix MSVC warning
signed/unsigned comparison.

Change-Id: I5fab0ccadbeb8c034410169bb6a3b4439e3f7516
Reviewed-by: hjk <hjk@qt.io>
2022-03-24 10:45:55 +00:00
Samuel Ghinet
3935c671dd QDS New Project Dialog fix: recents should include all project properties
Previously, only the wizard category, name, and size were saved for
recent presets. Solved the problem by using the same kind of store (and
struct type) for Recent presets as for User/Custom presets - this way
we can save all properties.

Other changes introduced:
* After user creates custom preset C, then creates a project from it
(resulting in the creation of a Recent preset R), if the user then
deletes custom preset C, then the recent preset R will remain -
previously, all recents of the custom preset were deleted
* Now we can have multiple recent presets with the same name and size -
so, no distinguishing feature inside the Presets view. User will have
to look at Details and Styles panes to view differences.
* Replaced .ini format with *.json file format.

Change-Id: I500e9ac9378d4b9a393c3b0833ef6a34f785585c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-24 10:31:16 +00:00
Jarek Kobus
bd7949f852 AndroidDeployQtStep: Make m_process local
There is no need to keep m_process as a class member,
since it's only used in just one function.

Change-Id: I156b978a18ab25a41b0e52d00fcb90c0f7f12ddd
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-24 09:43:57 +00:00
Jarek Kobus
127ca236a7 Ensure we never encounter the message about destroying QProcess
Until we remove the process launcher / process reaper.

Change-Id: I9c68c40c3c856c0a515277b69fc3084ba2addbee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-24 09:42:07 +00:00
Miikka Heikkinen
4b96545a23 QmlDesigner: Fix add new state plus button centering on all sizes
Take the font size into account when centering the plus sign so it
centers well at all button heights.

Fixes: QDS-6529
Change-Id: Ie221fd2adb0fa19ad6fee1120ea33e702240960c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-24 09:27:15 +00:00
Eike Ziller
cd9a5b1c8d Bump version to 7.0.1
Change-Id: I73f23e53629e7c8ed39ba06a72b5baff1714e784
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-24 09:19:53 +00:00
Jarek Kobus
1b5c4504af Get rid of no-op calls to QtcProcess::kill()
Leave the work for implicit ProcessReaper.

Change-Id: Ie01c4e996fda18b7cee77851394174556c6f3857
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-24 08:53:59 +00:00
Jarek Kobus
4ced33f4fe CallgrindController: Get rid of no-op code
Amends 5830641d0f

Change-Id: I7474cf27de4c779ebe36bf01856b7ce0634dd999
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-24 08:14:38 +00:00
Jarek Kobus
d7ff76be69 QtcProcess: Drop return value from stopProcess()
It wasn't used at all.

Change-Id: Ife0989c73c67b6106e61c40931f318ee7a5b062d
Reviewed-by: hjk <hjk@qt.io>
2022-03-24 08:12:03 +00:00
hjk
e3aad67ce5 sdktool: Clean up AddAbiFlavor test
Suppress expected output.
Split complex 'if' for easier debugging.

Task-number: QTCREATORBUG-27227
Change-Id: I9bc305d3aacd79f6097e92f54951aec2a45d28a3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-24 08:09:18 +00:00
Miikka Heikkinen
9a9cd6d62f QmlDesigner: Prevent showing preview tooltip when button is pressed
On some platforms, drag will stop deliving mouse events to MouseArea.
Disallowed showing the tooltip when a mouse button is pressed.

Fixes: QDS-6481
Change-Id: I8777d57be1bfef8470571027d9257d3a10eb5a7a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-24 05:59:34 +00:00
Miikka Heikkinen
e40041978e QmlDesigner: Fix font preview tooltip image
The preview tooltip was recently reduced in size, but font previews
were still being rendered the old size and scaled down, degrading
image quality. The new default size is bit too small to render the
sample text of fonts nicely, so added an option to set unscaled image
to the tooltip, allowing us to use twice as wide preview images for
fonts.

Fixes: QDS-6486
Change-Id: Ieaabfbea11e47509de7cd6aed93464d8595ea541
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-24 05:59:08 +00:00
Miikka Heikkinen
bd607909a5 QmlDesigner: Reset puppet when ParticleShape3D is reparented
This is a workaround to QtQuick3D bug that only updates the parent
node of the shape at componentComplete.

Fixes: QDS-6473
Change-Id: Ice8afdc81b35eb40c07889bb1eebcdb70e68c17d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-03-24 05:58:46 +00:00
Christian Stenger
c1b585933b Squish: Fix remove kits test
cmake is automatically running when re-opening a project
and creates a temporary kit which was different when using qmake.
Switch back to qmake and enhance later to support cmake as well.

Change-Id: Id3e1dc23c828a6e2af5454863e1349d9866dfa38
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-24 05:55:16 +00:00
Christian Stenger
fcddfe5a8c Squish: Fix project wizard test
Change-Id: Iabf4463ac535cab025db3ee808e61f5fe7054095
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-24 05:55:08 +00:00
Thomas Hartmann
a889dea4d7 QmlProjectRunConfiguration: Do not enable DebugTranslation by default
Do not enable this service by default since it breaks the profiler and
debugger and it is not required.
This does not break language switching.

Task-number: QDS-6523
Change-Id: Ib55179674c59034cdf1ece135a3f9a2e8cf08e86
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-23 17:10:20 +00:00
Jarek Kobus
6d853023c6 QtcProcess: Fix a comment
Amends 8e0ae8ba96

Change-Id: Ie5b99525ec7de0565cd79ed52c7fc094d5509ddc
Reviewed-by: hjk <hjk@qt.io>
2022-03-23 16:00:46 +00:00
David Schulz
62eb36e7ec Python: Use relative file path as run config name
Change-Id: Ifac28b9e4b066ea62b43a7da04b71e2c4317a898
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-23 13:56:56 +00:00
Christian Stenger
e7f314e02a Squish: Fix local git test
The test was written for a qmake based project. Explicitly use
one as default build system has changed.

Change-Id: Iccf5761915708dd66ba73aeda25ca6b61a8c0b99
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-23 13:44:28 +00:00
David Schulz
d70150818f Utils: postpone combo box handling of the info bar
We might want to remove the info bar in the callback. This makes sure
that all direct connections are handled before removing the info bar
and the combo box gets deleted.

Change-Id: Icfce358d69923fa0558d48c2513e1cfff4926ed9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-23 13:28:52 +00:00
David Schulz
be0b962ce8 Utils: add current index parameter to InfoBarEntry::setComboInfo
Change-Id: I8933d0583846672a6bebdefec402203375e5e09b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-23 13:24:27 +00:00
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