Commit Graph

69993 Commits

Author SHA1 Message Date
Christian Kandeler
c5d080570b CppEditor: Fix moving function definition out of specialized class
Fixes: QTCREATORBUG-25808
Change-Id: I5950c7f66b736c6ee30411e8fdc0356d78faa518
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-29 09:27:21 +00:00
Henning Gruendl
20b5182665 QmlDesigner: Fix ComboBox item delegate
* Fix undefined warning about enabled property assignment
* Rename the model variable

Task-number: QDS-4730
Change-Id: Iba6fdc8b4a0393a405060e4cbc7a8c58849ed76b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-29 09:14:12 +00:00
Henning Gruendl
8df1da1c64 QmlDesigner: Fix blocked by template state
* Fix a missing negation operator on the blocked by template state in
  font section
* Fix incorrect indentation

Change-Id: Idc774d8329a14df1722a5a5db65ab39dadf0063e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-29 09:14:04 +00:00
hjk
b3af1ccd4c Docker: Move container start into function of its own
Change-Id: Id83345895fd2e1e6668def91d8bb3fe39eca4f8c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-29 08:29:48 +00:00
Orgad Shaneh
cf1377b6fe ProjectExplorer: Remove pointless conversions in cloneConfiguration
Change-Id: I80d48ba726111d18f2ee623efa0f44a1fd6e2654
Reviewed-by: hjk <hjk@qt.io>
2021-07-29 07:27:30 +00:00
hjk
185ceda8f1 Debugger: Make user defined gdb-style dumper work with arrays
Change-Id: I1667061eacf78a6fa4df567ea033e7bb5269da2c
Done-by: Bruno Vasselle
Fixes: QTCREATORBUG-26027
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-29 07:25:59 +00:00
Thomas Hartmann
db5cc9f2ca QmlDesigner: If kit has a qml2puppet in bin then use it
If the Qt has a qml2puppet in the bin folder we use it instead of
the fallback puppet.

Task-number: QDS-4548
Change-Id: Ic9a3626f0cb18538ed94b72ff9fce0fa43806597
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-07-29 07:17:28 +00:00
Ivan Komissarov
95e3d382cb Update Qbs submodule to the top of 1.20 branch
Change-Id: I229666d4dcf29525e8c2519c17b62054dc0db1d9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-07-29 07:07:46 +00:00
Janne Koskinen
12fb534f90 Fix puppet from asserting on unversioned qml imports on Qt 6
Set mockup version to 1.0 if there is no version set.

Change-Id: Icfee0e84012a93978283d8309ec01d48dd8d4730
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-28 06:49:45 +00:00
Henning Gruendl
ba99d2b682 QmlDesigner: Fix SpinBox hover state
Task-number: QDS-4726
Change-Id: I3ca83d20458f271df942339cca93d4a4a991f779
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-27 17:40:13 +00:00
Thomas Hartmann
58602ec21c QmlDesigner: Add setting for Qt 6 projects
Adding
'qt6Project: true'
to the qmlproject file marks the project as Qt 6 'only'.

Task-number: QDS-4734
Change-Id: Ib9d969fd11d409e280734f9bedf759b40470fc61
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-07-27 15:32:29 +00:00
Ivan Komissarov
3df3046e17 Update Qbs submodule to the top of 1.20 branch
Change-Id: I5e5c2bbf711eaa83e447ec40698d333a0000a4b6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-07-27 15:00:32 +00:00
Henning Gruendl
78213e2513 QmlDesigner: Update missing specifics
* Update a couple of missing specifics
* Update copyright header

Change-Id: Id0efb65b0614e471f33c048af7d3f49f268f20b8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-27 09:30:16 +00:00
Henning Gruendl
45fa409e25 QmlDesigner: Fix warnings parameter injection
Fix a couple of warnings regarding parameter injection

Change-Id: Ie4a7c57a735eacb9b864b967f26d48787652de20
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-27 09:30:08 +00:00
Alessandro Portale
932d78c3e0 Tracing: Fix some more warnings regarding parameter injection
Parameter "XYZ" is not declared. Injection of parameters into signal
handlers is deprecated. Use JavaScript functions with formal parameters
instead.

Change-Id: I2d2b4f72b6c6bf532c090956a5286e3d38f867a3
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-07-27 04:57:34 +00:00
Fabio Falsini
efb273750b Fix bug of default background color in Android spashscreen
If the manifest file was opened even if the parameters of the Android
splashscreen were not changed, the plugin always set the default
background color inside splashscreen.xml (0xffffff)

Change-Id: Id6e16dfffb2c62f3ea16faf5e85d13a1b56d80c7
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-07-26 18:05:51 +00:00
Christian Kandeler
b6dd53d4ed ProjectExplorer: Prevent build directory on non-existing drive
A drive that is not actually there is apparently different enough from a
"normal" non-writable location to seriously throw off some build tools,
so spend some effort in preventing this.

Fixes: QTCREATORBUG-25633
Change-Id: I5a15b0b2a3a882a08f50866c23e4d45c93fd78c9
Reviewed-by: hjk <hjk@qt.io>
2021-07-26 08:42:00 +00:00
Christian Stenger
67b082b51b QtSupport: Fix host specific handling
When handling qmake on a device we need to take the
device's host os into account instead of ours.

Change-Id: Ice5d11dc5c623be702d1e54d6b3d0c635ff57c7a
Reviewed-by: hjk <hjk@qt.io>
2021-07-23 11:55:46 +00:00
Christian Stenger
5d5969b46c ProParser: Avoid the most common hard crash
Whenever we try to access a non-local file we no more
hard crash Qt Creator, instead we silently handle it as
not found.

Change-Id: I3cbc617093c2a6fcb30626e276996430bb3795e5
Reviewed-by: hjk <hjk@qt.io>
2021-07-23 11:55:34 +00:00
Christian Stenger
b8bcdd9568 Docker: Correct environment for docker exec calls
Provide way to clean QtcProcess environment which is needed as
e.g. toolchains, build tools, and debugger otherwise run
inside a wrong environment when using docker exec for the
respective process calls.

Change-Id: Ia6de1c90f2134fce260d293a2f6937ab3cfca2ce
Reviewed-by: hjk <hjk@qt.io>
2021-07-23 11:55:27 +00:00
Christian Stenger
98ae0d44e6 Utils: Reduce need for resolving of symlinks
Be more strict when checking whether two files might be the
same executable.

As side-effect this reduces the calls to symLinkTarget() a lot
and speeds up auto detection of kits.

Change-Id: I23dc697a34bf93f8bd09cbe7e9d17f829cf0d010
Reviewed-by: hjk <hjk@qt.io>
2021-07-23 11:55:20 +00:00
Christian Stenger
8593920f4c Tests: Fix build on Linux and macOS
Amends fd677101a9.

Change-Id: Ie994588f91b3b239080530df417128418a4e36ef
Reviewed-by: hjk <hjk@qt.io>
2021-07-23 05:55:58 +00:00
Thomas Hartmann
493f8b8adc QmlDesigner: Show error message when using imports without version with Qt 5
If the document contains a 6.0 import or an import without version, but the
kit is a Qt 5 kit we show an error message.
Also show an error message if there is no Qt kit at all.

Task-number: QTCREATORBUG-25983
Change-Id: Id87ef47f0d8fbc31d1a8dbe8a471986d7288a4d3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-22 15:51:20 +00:00
Christian Stenger
a0da3ce69f Utils: Move filterEntriesHelper() out of FilePath
Currently only used inside DockerDevice and it fails to build
when building sdktool with old Qt which is still necessary.

Change-Id: Ic48414f0cb8f0955e7561f7484e3ea1c726c816a
Reviewed-by: hjk <hjk@qt.io>
2021-07-22 12:49:45 +00:00
hjk
fd677101a9 Utils: Split FilePath off fileutils.h
This now rather central class deserves a suitably named file(pair).

The rarer used declarations including otherwise not needed includes are
still in fileutils.h.

Change-Id: Ib18d72f16322c03f76023fdefcd5f6da35311b8b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-22 11:52:58 +00:00
Christian Stenger
805d19d1ed Unittest: Remove deleted file
Amends baa83725f6.

Change-Id: I9a5d3ad9a17dd37cdc39d05d0065022621219ab1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-07-22 09:41:34 +00:00
Assam Boudjelthia
45611e841b Android: avoid blocking call to show avd selection for default device
If a user already chose a default device to run, we don't need to create
the whole AVD selection dialog, but rather straightforward to get the
device info if it's already connected, otherwise the dialog opens for
selection as usual.

Change-Id: I5fee9411d755e89da23a8d365f284e8b52808a07
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-07-22 08:51:46 +00:00
Christian Stenger
dfb0edf4ce Docker: Fix logic and Qt6 build
Change-Id: I3f0ec2cc86f48578e9dcd2ebfaa685cc577141c3
Reviewed-by: hjk <hjk@qt.io>
2021-07-22 08:46:52 +00:00
Thomas Hartmann
c59bddd4df QmlDesigner: Fix crash for QQuickStyleItem
QQuickStyleItem crashes if componentComplete() is called.

Change-Id: I1df1b50f6ba95c0eda1ff8e18de85276a6de04f5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-22 08:06:31 +00:00
Christian Stenger
bbf2dab8cb CMakePM: Fix build on Windows
Amends 3aa324ef1f.

Change-Id: Ieef98239ec4fa029da1541b15229a17beeb513f6
Reviewed-by: hjk <hjk@qt.io>
2021-07-22 07:49:39 +00:00
Thomas Hartmann
c8a6d94a39 QmlDesigner: Fix missmatch of category titles
"My Quick3D Components" was renamed to "My 3D Components".
ItemLibraryImport::quick3DAssetsTitle defines the title in a single place.

Task-number: QDS-4717
Change-Id: Ib96dcb029ce0b74de64ebdc904d890d66c240d2e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-21 14:08:46 +00:00
hjk
1c3b9e2bfe Utils: Remove unused function FilePath::resolveSymlinkTarget()
Change-Id: I7687f094a1e8054ac8298be754e95252db64c022
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-21 14:05:51 +00:00
hjk
3aa324ef1f CMake: Make CMakeConfig a proper class
Looks a bit more "object oriented" in my book.

Change-Id: I6a3b1b4691ec1c7465f652608678e8f31e7e52a7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-07-21 13:25:30 +00:00
hjk
7aef03134d Utils: Move writeData handling to QtcProcess::start()
So that this doesn't only apply to runBlocking()

Change-Id: I6ef7c72e13a5e214c7476ede942662a9893c843c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-21 13:05:31 +00:00
hjk
41355d7cd7 Docker: Implement DockerDevice::writeFileContents()
Change-Id: I686eb6da5ec0a59da3b8c5e32e1ff2f9fa9621b2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-21 12:54:28 +00:00
hjk
9d08e5f173 Utils: Keep write channel open by default if we know we'll use it
Change-Id: I4591f3e7e3b33ef6ea43d6aa9a5c9246c8bfd2ab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-21 12:54:21 +00:00
hjk
2dafeadd0c Docker: Enable DockerDevice::removeRecursively()
With some half-baked sanity checks.

Change-Id: Ic3b9977f2bb8218105c5b7dba26df5cb933840c6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-21 11:11:00 +00:00
hjk
8c1edf2be8 Docker: Juggle messages on the Daemon state button around
Change-Id: I64cef2458e475a8edd796d6a7ca5f3feb8bd0ac0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-21 10:26:33 +00:00
Henning Gruendl
6fef74a8cb QmlDesigner: Add RGB und HSV picker
* Add modes to color picker
* Add color picker for RGBA mode
* Add color picker for HSVA mode
* Add luminance slider for RGBA mode

Change-Id: I0bb1dbb67b7c18d156eee0d4e07cfa942162f832
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-21 10:25:51 +00:00
Christian Stenger
4895eb346a Docker: Implement symLinkTarget() for non-local access
Change-Id: I895d7e190a556ee582e7c767e7045362e9a7adce
Reviewed-by: hjk <hjk@qt.io>
2021-07-21 10:16:27 +00:00
Christian Stenger
9e015dbaf7 Docker: Let some commands run inside shell
If there is no local access for the docker container we
create lots of explicit docker calls which take time
to be created and executed as this always fires up
another connection to the container.
Currently we expect the container to have a shell and
we already have it in place, so re-use the shell to
execute at least a couple of commands.
This heavily increases the performance of these commands.

Change-Id: Ic778a250a2b3b8c5ce2a8dd6b7fa8c532bc6d4bf
Reviewed-by: hjk <hjk@qt.io>
2021-07-21 10:16:13 +00:00
Cristian Adam
366b4c0199 CMakePM: Consider all the missing expandable CMake variables
CMAKE_PREFIX_PATH and CMAKE_FIND_ROOT_PATH can have multiple
values, and now all the values are taken into account.

Ammends e1a68f2598 which had only
one value with all the items separated by semicolon.

Change-Id: I88d98fbbf165e7e61d70ab4a4e84eb4de4cc9f82
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2021-07-21 09:53:50 +00:00
Christian Stenger
7ef50ec70c Docker: Use shell to exit container
..and only fallback to calling docker command if this
fails.

Change-Id: I854499f7df8605ffe444c43bc6d1dc0155183627
Reviewed-by: hjk <hjk@qt.io>
2021-07-21 07:39:19 +00:00
hjk
f9893f5883 FakeVim: Update visual marks when mark settings have changed
To test: ":set sm",  "ma", "<Down>",  ":set nosm"

Change-Id: I75d2c3ded04ddf3bc656574a3cff136db144df2b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-21 06:44:28 +00:00
hjk
cb23530798 Docker: Add a button to list auto-detected kit items
Helps to understand what's going on.

Change-Id: I5b8c591cbd60227cf250932c8654063236eec05f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-21 06:44:21 +00:00
hjk
2ff446bd25 CMake: Simplify CMakeConfigItem::toBool() use
Change-Id: I60120a152174b7c3751b99ac92d31bdb9c3ab1d9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-07-21 06:25:17 +00:00
hjk
3b779fb8dd CMakeProjectManager: Use "cooked types" in DirectoryData
Less conversions cycles at the price of a few more temporary bytes.

Change-Id: Ibda82e02d7b83944f5db38ac7cf75c4bae4f55ec
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-07-21 06:25:06 +00:00
hjk
8a28f43a81 Docker: Implement fallback for DockerDevice::lastModified()
Change-Id: I66923cd06b53ecc6883c3b324fd46d89994572ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-21 06:24:39 +00:00
hjk
a05414adf6 CMake: Fix remote search of non-standard ninja installations
Change-Id: I9ec636b126b621bb7a676e55a31845328c9e5ba1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-21 06:17:39 +00:00
Christian Kandeler
a7756a72fd CppTools: Fix look-up of top-level virtual function declaration
Fixes: QTCREATORBUG-25749
Change-Id: I7a9e8e406739931df253f14772361f575adbaa3f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-20 14:03:19 +00:00