Commit Graph

69993 Commits

Author SHA1 Message Date
Robert Löhning
a1eb505fbd Squish: Use Qt 5.14 in tst_openqtcreator_qbs
Change-Id: If214c32a0a62ebdada455a325ad1b2d02adc67c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-16 07:17:37 +00:00
Leena Miettinen
4b678f50bb Doc: Update first part of entry-level tutorial
Task-number: QDS-5001
Change-Id: I2520d843a292f80473411ee94df8253bb097b22f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-15 16:11:25 +00:00
Henning Gruendl
aa0a682c11 QmlDesigner: Fix floating dock widget behavior
Fix floating dock widget being covered by the main window if not having
focus on macOS.

Task-number: QDS-3144
Change-Id: I25230819a567a5582b97a0a52f0e46594dbab6ea
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-09-15 14:05:44 +00:00
Assam Boudjelthia
a2b6dba0bc Android: fix for retrieving the path to deployment file and build dir
The Android deployment file for CMake project was constructed based
on the main project target and thus was always expecting the file
to be under the build folder root path. This makes sure the correct
path to the output path is retrieved.

This practically different problems with running examples when the
main project is a Qt module, for both qmake and cmake.

Fixes: QTCREATORBUG-25793
Change-Id: I5fdedd94c7c4c84c351c28476ca14b0f95f99f22
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-15 11:02:21 +00:00
Eike Ziller
dc71f32483 Change log: Move item to right category
Change-Id: I913fa52d6d5c9f0d3935f732ccbfd0c26a1a8c54
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-09-15 08:45:47 +00:00
Eike Ziller
9121372f9c macOS: Remove absolute RPATH from clazy-standalone
Remove the absolute RPATH to somewhere on the build machine,
which creates issues when loading Qt Creator on macOS 10.14,
and of course is bogus in any case.

Fixes: QTCREATORBUG-26196
Change-Id: Ic92deb9b2c6fe32f377fc31004779a2a43794054
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-15 08:33:07 +00:00
Eike Ziller
e8c6a0d470 Update change log for 5.0.1
Change-Id: Ie2beddeee91bedcb505641f52433fb170d191789
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-09-15 08:17:49 +00:00
Christian Stenger
0f58258e04 AutoTest: Silence soft assert
We synchronize the test tools now earlier and may
not have finished setting up the configuration of
the current project.
This means the project might have no valid target
yet.
Amends 481070d808.

Change-Id: Ic0c1817318a343e68587930c492397a6094a4ce2
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-15 08:13:54 +00:00
Leena Miettinen
2c5672a3c7 Doc: Remove Cluster Tutorial docs
The videos were removed.

Change-Id: If6812255fada581ca98aecbc4c5079e21bd1677e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-15 07:14:45 +00:00
Mahmoud Badri
7fe61d1f97 QmlDesigner: Provide a descriptive message for invalid IDs
Fixes: QDS-5044
Change-Id: I12f78851f5200e417fe6f323a0773587400cd90f
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-14 18:47:54 +00:00
Eike Ziller
1d466499f6 Fix bug in mime type magic rules with Qt 6.2
There was a bug in the copying and comparison of mime magic rules, that
did not copy/compare the sub-rules.

With Qt 5 this was probably never actually used, because we save the
magic rules in a QList, and that didn't use MimeMagicRule as "values",
but internally used pointers to heap-allocated objects, so e.g.
appending a list of rules to another list of rules would only copy the
pointers to the actual objects (as long as the items were never
modified).

In Qt 6, QList has the same semantics as QVector, so MimeMagicRule is
actually used as values, which uses the copy operations. As a result,
the moment the MimeMagicRule was copied from the parser to the mime
type, it would loose its sub-rules. Which breaks the whole mime magic
logic, and leads to wrong mime type resolution, e.g. for *.ui files.

Change-Id: I90c46264423f18f73a6efc01887a0b8b6199d35d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-14 12:21:34 +00:00
Christian Stenger
7e965629b0 AutoTest: Fix cmake wizard
If ctest is going to be used we need to enable testing. Do it globally
instead of per framework which already led to forgot it.

Change-Id: Ifdb0e94708a26e2496d708361d5b8163aa2912ad
Reviewed-by: David Schulz <david.schulz@qt.io>
v5.0.1
2021-09-13 09:29:05 +00:00
Christian Stenger
f6f2ffde4e AutoTest: Fix generated files for gtest
When using gtest as test framework the wizard generated
a header file containing the test code which had been
included inside the main.
As this works generally it is on the one hand not
recommended and on the other hand it lets us fail when
using cmake as build system.
Create a cpp file instead and use this accordingly.

Fixes: QTCREATORBUG-26253
Change-Id: Ibec8489258de0def27ee116eacbfc1bb22d3206b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-13 08:54:48 +00:00
Eike Ziller
9d1cb4211a build.py: Remove --app-target option
It was no longer used since d04355dfb0

Change-Id: I048d8566babec1e926cbf32916c4d88d474d8ef8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-13 07:18:39 +00:00
Eike Ziller
90ec06c27e sdktool: Fix sanity check for Qt 6
Qt 6 happily converts a QString into a QVariantList, so the check if the
existing value is convertable to a QVariantList is no longer strict
enough.

Utils::PersistentSettingsWriter/Reader luckily only uses QVariantList
explicitly, so instead check if the type matches QVariantList
explicitly.

Change-Id: I52858308db3b0bef518d2b1b370668f0f4845d73
Reviewed-by: Alp Öz <aoz@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-09-13 06:26:33 +00:00
Alessandro Portale
7d3f59c995 WebAssembly: Fix emcc execution for some emsdk versions on Linux
In order to run emcc 1.39.8 on Ubuntu 20.04., the PATH environment
variable must not be empty, because the emsdk wrapper scripts depend on
it.

Therefore, in WebAssemblyEmSdk::version(), we don't start anymore with a
clean environment bu with the related device environment.

Task-number: QTCREATORBUG-26199
Change-Id: I8b7603ef8126ebaef0fa4ed9e254296623c945e9
Reviewed-by: hjk <hjk@qt.io>
2021-09-10 15:34:24 +00:00
Eike Ziller
f6ede253c7 iOS/CMake: Fix building for iOS device
Fix detection if a kit is an iOS kit.
iOS device kits do not have a device set, if no device is currently
connected. So we would end up with the normal desktop macOS CMake
configuration instead of the special iOS one.
Just check for the device type like before, and guard the else branch
with its own check for macOS target device.

Amends a71d725e46

Change-Id: I829e549e5743ec2b358713f2df6d9cd5e32f6b70
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-09-10 11:44:47 +00:00
Laszlo Agocs
0caf69cc52 Migrate to fixed add_shaders prefix handling
One way to get rid of the "qml" in there is to use BASE.
An alternative would be to update the file paths in the source code.
Here we chose the former.

Change-Id: If49cb584aea022d5d74b2348ec99ed831b715111
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-10 11:03:53 +00:00
Alessandro Portale
9eb7d5246a CMake build: Define common output directory for qt_add_qml_module
In order to enable tools like qmllint and in order to avoid the
following warning, define QT_QML_OUTPUT_DIRECTORY

Warning message:
The Tracing target is a QML module with target path QtCreator/FooBar.
It uses an OUTPUT_DIRECTORY of foobar, which should end in the same
target path, but doesn't. Tooling such as qmllint may not work
correctly.

Since this change is relevant for the build against Qt 6.2-Beta4,
common_environment.yaml gets bumped, accordingly.

Change-Id: Ic6766cf29baddd7c22b68270a0f1702aade7c53f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-10 10:57:44 +00:00
Johanna Vanhatapio
8448b7821c Doc: Describe the Repeater3D Component
Task-number: QDS-4888
Change-Id: I7fc2398949caf06fe0cd00334424998e786619e0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-09-10 10:57:14 +00:00
Thomas Hartmann
47cae5555f StudioWelcome: Remove cluster tutorial videos
Those videos are outdated.
Also removing the thumbnails.

Change-Id: I07e3215db8a47d9f2e8b28f187b529b81630a4dd
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-09-10 10:54:53 +00:00
Aleksei German
64c525800b QmlDesigner: Fix for qds-mcu metainfo rules
- Fixes dublicated values
 - Fixes properties that were assigned to the wrong item
 - Adds new qul-1.9 metadata file

Task-number: QDS-4712
Change-Id: I7486d1a202b81fde06673076dda80cc13d8d274e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-09-10 08:51:23 +00:00
Aleksei German
f2642e6f3c QmlDesigner: Limit Style switch in MCU mode
Task-number: QDS-4954
Change-Id: Iba840ec00c938c09f79c390f0d81fa3006b4f7a9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-09 13:47:00 +00:00
David Schulz
04763a307d Clangd: prevent adding refactorings for outdated documents
Change-Id: I658662dca345e1ae209a4d74e145b59c44417b00
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-09-09 11:46:12 +00:00
Christian Stenger
13be5e7eb4 QmlJS: Fix crash
Fixes: QTCREATORBUG-26151
Change-Id: Ibfc2a17f0eb8eb7c4804045dba9a1963249ba860
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2021-09-09 10:16:09 +00:00
Eike Ziller
680daaadb7 Add changes file for 5.0.1
Change-Id: Ic3d4eaee8abf88ddb4435e0a026ae411d92857ba
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-09-09 09:56:10 +00:00
Christian Stenger
4ed03777d3 Docker: Fix condition
Change-Id: I28c845ebd5a04e13cb109af03f6094306da64394
Reviewed-by: hjk <hjk@qt.io>
2021-09-09 09:52:13 +00:00
Miikka Heikkinen
6c224f1341 QmlPuppet: Make sure root instance is in dirty list after size change
Fixes: QDS-4474
Change-Id: If9c861e9c9e39c044e059742bbf7cad0d41c4e5b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2021-09-09 07:40:27 +00:00
Assam Boudjelthia
96364a4b4d Fix handling of aab checkbox in apk build step
Loosen the condition for enabling the aab builds and make it available
for any Qt version from 5.14 and above, since Google now require apps
to be packaged as aab to submit to the store, and Qt 6 always has an aab
target anyways. The multi-abi is coming for Qt 6.3 though, but aab
builds could still be allowed now.

Change-Id: If7c7b40c2d01cfe9c2887dc5aa17af48a37af43a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-09 07:28:54 +00:00
Cristian Adam
1a030fb911 CMakePM: Fix build type for multi-configuration generators
Fixes: QTCREATORBUG-26079
Change-Id: Ia849cfcea6f3fb10d791ad32c32413d95aa31569
Reviewed-by: Alp Öz <aoz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-09-09 07:06:10 +00:00
Orgad Shaneh
7e362326fe GDB: Ignore initial SIGTRAP when debugging mingw32 with gdb64
Task-number: QTCREATORBUG-26208
Change-Id: I97e37b6aaca19f20081750de003b012c9853a80c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-09 06:38:21 +00:00
Orgad Shaneh
9032c7741a Debugger: Fix debugging 32-bit mingw console app with 64-bit gdb
For some reason, the executable is no determined correctly.

Feed it to gdb so it will have correct debugging symbols.

Fixes: QTCREATORBUG-26208
Change-Id: Id7da405e5ec9f9331399eb049fa383099981cb94
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-09 06:38:03 +00:00
Alp Öz
4c35c9e057 Change sorting in Class View to case insensitive
Change-Id: Ia9ee6726d1d423a127c1e3e57c02ebef8a6f28dd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-09-08 16:27:07 +00:00
Assam Boudjelthia
41528390b8 Revert "Move sdkmanager's sdk level parsing to AndroidConfig"
This reverts commit 2d77922856.

Reason for revert: This causes a build error in Android tests, reverting until the a fix is ready for that to not block the repo.

Change-Id: I74961df660ebaf69caf092d53172821815f21268
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-08 12:52:16 +00:00
Henning Gruendl
3639d6faa7 QmlDesigner: Fix color names missing alpha
Fix QColor name() returning colors without alpha by changing the format
from default (QColor::HexRgb) to QColor::HexArgb.

Change-Id: I98fbf2dbfffa4a3593601df3c301f15d9e39604c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-09-08 11:22:44 +00:00
Christian Kandeler
3d64cf0d82 ClangTools: Fix clazy documentation URL
There is no patch version in the URL.
Amends 1b1e18a869.

Change-Id: I8d17b6aea3283e9a78744a28ad9a98e1c7c087e8
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-08 11:18:53 +00:00
Christian Kandeler
bf275331dd ClangTools: Cache information about the clazy executable
Fixes: QTCREATORBUG-26237
Change-Id: I43203d58b8ed278664427e3b4112a7c7848354b9
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-09-08 11:17:37 +00:00
Assam Boudjelthia
2d77922856 Move sdkmanager's sdk level parsing to AndroidConfig
Both the sdkmanger and avdmanager (maybe more) need to parse the sdk
level for packages and devices which may contain letters, make them
use the same logic.

Change-Id: Iff7fef3a66e00fac11b833f73f2f334a4cf1a766
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-08 08:09:20 +00:00
Assam Boudjelthia
62c33f909d CMake: Don't build apk by default with CMake's ALL target
From Qt 6.1, Qt 6.1 builds the apk directly with ALL step if it's
not a Qt build.

Change-Id: Ib8573399a1ed509852a973e84405353191e80f86
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-08 08:09:00 +00:00
Eike Ziller
d734fc5cc8 Spotlight filter/macOS: Interpret space as *
Flows more natural, and is what we do on the other platforms by default
too.

Change-Id: Ia9510235167a014fa7bdafd023e05c8fe40dd338
Reviewed-by: Alp Öz <aoz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-08 07:00:53 +00:00
Eike Ziller
6528bd6a27 Add branding option for application icon and logo
Change-Id: I23ee91ab47d06aab370b2083d4f96f7833bf16ff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-09-08 06:29:51 +00:00
Leena Miettinen
9ecbb3e4ee Doc: Fix the sidebar TOC in the online version
...to match the new structure.

Change-Id: I7b4ffe8f6ae7993906bb79bf470fc1883ca0a122
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-09-07 14:01:23 +00:00
Johanna Vanhatapio
f67974e1d5 Doc: Fix a link
Change-Id: Ie1c3996fb50ba5d357697adb2fe53ad46e20d75f
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-09-07 13:48:34 +00:00
Thomas Hartmann
e543cb0d05 QmlProject: Open connect to ParsingFinished() only once
Task-number: QDS-5018
Change-Id: I2782641c8494c44c71c680e145be7744c98afabc
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-07 13:47:12 +00:00
Thomas Hartmann
97d6b487ff StudioWelcome: Add C++ example
This downloadable example shows how to setup the C++ project
using .qrc files. We open the .qmlproject in QDS.

Change-Id: I759095d9c6a4026f3eab49d7e5e6543f5e57b71d
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-07 12:46:58 +00:00
Thomas Hartmann
95f2198e97 StudioWelcome: Allow opening a specific project file
Change-Id: Ie00a48ff777952e2366d691c1a928c162d1dd187
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-09-07 12:46:52 +00:00
Thomas Hartmann
97a65f9ea2 QmlProject: Do not open .qml.ui file if a file from that project is open
The wizards and example browser already open a .ui.qml file.
In this case we do not want to open the first one.

Change-Id: I8278ca28cd02dfde2b4ab0ffd1b551073d85859f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2021-09-07 12:46:43 +00:00
Alessandro Portale
3a26271660 Android: Fix build
Amends: e92418edca

Change-Id: I40615c2fa6e9b9cd98976c9ebfc56a9bdf1dd612
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2021-09-07 11:44:48 +00:00
Thomas Hartmann
cc12ee1729 StudioWelcome: Fix visual glitch with download icon
Change-Id: I1858112654d3ab01fc2c5e4b05d45797485b669a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-09-07 11:42:46 +00:00
Assam Boudjelthia
e92418edca Fix minSdkVersion in deploy step
Deploy step uses AndroidManager::minimumSDK() which looks for the
version in the AndroidManifest.xml file which used to contain the
minimum and target sdk, but if the manifest doesn't contain that
value, this logic returns 0. So, return the defaultMinimumSDK()
in case the first way fails.

Change-Id: Id10e552d7c8de4d3544b7fa8f26ae5dd9e974df5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-09-07 11:11:45 +00:00