Commit Graph

69993 Commits

Author SHA1 Message Date
Leena Miettinen
4b551f6e0a Doc: Move remaining Qt Quick Studio Component docs to appropriate places
...and remove the QML module and type docs from the qtcreator repository.
They are now in the qtquickdesigner-components repository.

Also use "Qt Quick Studio Components" as the component category and
module name everywhere.

Change-Id: Icf0e8dfec38c533a822aa6d90750de17a067ef6a
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-26 14:18:58 +00:00
Thomas Hartmann
79f01c101a QmDesigner: Add flag for adding lineSep to handle empty case
If line is empty and the continue path is taken result stays empty.
This means we do net add the lineSep for the next line.

Handling this explicitly with a flag fixes the issue.

Change-Id: I879e6e4a7238069ecc63e8188f0fb5929ac05363
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-26 12:56:30 +00:00
Eike Ziller
b842d4f953 QmlDesignerIconProvider: Make use of FilePath
for constructing icon file paths.

Amends c17c805e43

Change-Id: I779cbf4525fb355878aaf0d9795702d951d60b70
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-26 12:06:50 +00:00
Eike Ziller
6d394ff29e Icons: Add FilePath based API
Don't completely remove the QString based API though, since many icons
are constructed from constants and that would add a lot of noise with
FilePath.

Change-Id: I6a1b53bb1f1a79bb2b5756f94d5a2e7ca4cf0dc4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-26 12:06:38 +00:00
Eike Ziller
6e7779d31b Fix build with Qt 6
Amends 39921ce7bd

Change-Id: I78d60e4c4626269db407db21bfbbcf15f42dce27
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-26 12:06:17 +00:00
Eike Ziller
0b0226b112 CMake build: Gracefully handle turned off target in qtc_add_resources
Otherwise qtc_add_resources fails when turning off corresponding
BUILD_.... flags, or needs to be wrapped with "if(TARGET ...)" everywhere.

Change-Id: I34e230569ab9619b1c107404bf2fdf8e8e86bd7e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-26 11:24:29 +00:00
Pekka Kaikkonen
b709f3115b QmlDesigner: Style properties formatting operations
User can copy properties of an item (for example text, rectangle,
positioner etc.) and paste them to the similar item using format
operations.
Available properties and item categories can be configured using
formatconfiguration.json file.

Task-number: QDS-2231
Change-Id: Idd574418451809c84bca2bd8a7ab6045043bde58
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-26 11:05:07 +00:00
Henning Gruendl
6884086115 QmlDesigner: Update icon font
* Add bevelAll, bevelCorner, copyStyle, cornerA, cornerB, cornersAll,
  eyeDropper, gradient, keyframe, linkTriangle, linked, mirror,
  paddingEdge, paddingFrame, pasteStyle, promote, transparent, unLinked
* Rename aliasProperty to alias

Change-Id: I2050c765fe242a68054b2c8c2ff9c3f778c06423
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-26 10:52:09 +00:00
hjk
1fcd5dbc6d QtSupport: Make BaseQtVersion suitable for use in docker containers
Most interesting files path can be translated using
.onDevice(qmakeCommand).

Change-Id: I6012788b03daeee1c7f2e010d23d4f7c87fd10e2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-26 07:01:05 +00:00
Miklós Márton
48383c16cb Add context menu to the separate debugger variable view window
Added a right click context menu to the tab bar of the separate
variable viewer window to being able to change the
variable display mode right there (without navigating
to the variable tree view in the main window).

Fixes: QTCREATORBUG-25762
Change-Id: Ida35f4f6d23f07e5ed45a9f2d51a5af970a95375
Reviewed-by: hjk <hjk@qt.io>
2021-05-26 06:57:54 +00:00
David Schulz
39921ce7bd Designer: take tab settings into account when generating qml code
Task-number: QTCREATORBUG-24523
Change-Id: I1e02c781fbbde8114dd4570460756ce796275379
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-26 04:39:58 +00:00
Thomas Hartmann
c17c805e43 QmlDesigner: Fix path
Change-Id: I2935a4b345a65bcdb2058a69bd092dd1d47f5df3
Reviewed-by: Miina Puuronen <miina.puuronen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-25 17:45:35 +00:00
David Schulz
919bbe8408 Core: Use Utils::Link for openEditorAt
Change-Id: I246e06b11b4f32f46d7f3ec93df81bcc676aebbe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-25 17:32:59 +00:00
David Schulz
fc53dc27e4 Move filename line split into Utils::Link
Since we already have a container for file path, line and column move
the parse function there.

Change-Id: I5d0d97d271c5aaeb618e1a303b02cc6514e94e81
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 17:32:45 +00:00
David Schulz
356bfcc9fd Utils: filepathify Link
Change-Id: Ie62500bde139158e776f9698ee0ea00c2a113f93
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-25 17:32:18 +00:00
Eike Ziller
dbd4a10d6f Merge remote-tracking branch 'origin/4.15'
Change-Id: I3d3dfa04124eed14952294c2847b9851dcb1a5fd
2021-05-25 16:26:54 +02:00
Christian Stenger
0980ef7e49 Tests: Adapt test after changing diagnostics
Blocks are no more considered bad per se. Only if they
contain a var statement they are considered as bad and
worth a warning.
Amends 2447d1d69c.

Change-Id: I93b5e43c01059b66f3fb287772e54f3ae3e157af
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-05-25 13:47:52 +00:00
Knud Dollereder
af4ce2fbe6 Set QSG_RHI_BACKEND to opengl
in order to prevent a crash ancompanying the console output:
QQuickWidget is only supported on OpenGL.
Use QQuickWindow::setGraphicsApi() to override the default

Change-Id: Iab7c0cc486b150723000cc11ba4c6d9cd4be8b03
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-25 13:31:59 +00:00
hjk
984d992abf Docker: Fix DockerDevice::runProcess again
We need the on-device path in "docker exec", not the global version of it.

This was not visible earlier as some more places used local paths,
accidentally matching the on-device path.

Change-Id: If1d7e94d2cf0730e85e5a89972d7eaa309743fa6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-25 12:59:26 +00:00
Eike Ziller
ef5423d6ce Fix another unguarded access to a QScreen
QGuiApplication::screenAt(pos) can be nullptr.

Task-number: QTCREATORBUG-25466
Change-Id: I0dd4b8afbc5e63927f6b910479db8ca68eea9c3e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-25 12:52:02 +00:00
Christian Stenger
4956be9935 AutoTest: Take failed to run ctests into account as well
Otherwise the result will not be displayed and may lead to
wrong test results with a contrary correct summary.

Change-Id: Id041dbac441eea8a1a1d623acd87e049bca9a281
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-25 12:27:28 +00:00
Eike Ziller
fcf9c42e40 iOS: Make SimulatorControl static
It already contained only static members, so creating instances didn't
serve a purpose.

Change-Id: I261503b606c21cf498dcd8470d5645d92d97c325
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-25 11:46:23 +00:00
Alessandro Portale
20604cedd8 Android: Lower the time-out for license checks
An issue in SynchronousProcess causes a time-out when the process output
is not terminated with a \n or \r.

This workaround lowers the timeout from 600 to 4 so that the
unterminated output gets consumed nevertheless, and the user needs to
wait only 4 seconds for that.

Task-number: QTCREATORBUG-25667
Change-Id: I40f3053c7c4948c27003e9ec73d00a9d660024a4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-05-25 10:24:22 +00:00
Jarek Kobus
69b3c6c1fd Use Utils::FutureSynchronizer in IosSimulatorToolHandlerPrivate
Add a new method: void FutureSynchronizer::cancelAllFutures().

Change-Id: I5a4e1ea3230ac3c0ce9d3f26b751b2c05fe3dfd4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-25 10:13:11 +00:00
hjk
76db1e3746 Core: Add FilePath based overloads to EditorManager::openEditor{,at}
Part of the overall FilePath migration. Keep the original version for
a while to allow using code to catch up.

Change-Id: Ia7c5ea14416a06e679e8661c0e4045981db87b9b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-25 09:55:50 +00:00
hjk
925c49a1f1 Debugger: Adapt Utils::FilePath dumper to recent change
Change-Id: I0c21fe0bc795a24ce6b61d739f221f28cefc6df2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-25 08:30:46 +00:00
David Schulz
44e7047450 Editor: Allow defining custom snippet parser function
Task-number: QTCREATORBUG-22406
Change-Id: I21ae9740d348d4e0869029343d51b70f9df9cdac
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-25 08:16:38 +00:00
Eike Ziller
627f298ce1 COIN: Increase number of CPUs
There is some fancy logic in COIN that sets different number of
CPUs depending on configuration, which lead to our Linux machines
crawling, while macOS and Windows at least got 4 CPUs.

Fix (and increase) the number of CPUs for all platforms.

Change-Id: I3191f1645420805f5899af8966fd1d377a89bf85
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-25 06:55:24 +00:00
hjk
770d87709e Utils: Join SynchronousProcess::run and runBlocking implementations
Make functionality dependent on an (intentionally ugly)
setProcessUserEventWhileRunning call.

Also, back-paddle a bit on API combination of QtcProcess and
SynchronousPrceoss for now and prevent the QtcProcess-and-
runBlocking and SynchronousProcess-and-start combinations.

Goal is still to have all in QtcProcess in the end, but this
may take a while.

Change-Id: Ic146ec5db0ab8dc9613e5b2af5f4dc90bc7465ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-25 06:40:01 +00:00
Johanna Vanhatapio
c36b50f401 Doc: Add content to the QDS FAQ
A couple of Q's and A's to get us started. We can keep adding content to this topic whenever something suitable comes along.

Fixes: QDS-3086
Change-Id: I6a1a92e358365f0f7c72c55b5d01a7dc98e1e6e5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-05-24 14:04:23 +00:00
Cristian Adam
e6ec73517e QNX: Add specific environment variables to the kit
This way they can be forwarded to the debugger, which starting
with version QNX 7.1 requires also these environment variables
to be set.

Change-Id: I9ad7cf6032f65980ce96dea1cba8beebf7dfc996
Reviewed-by: hjk <hjk@qt.io>
2021-05-22 13:18:07 +00:00
Cristian Adam
f205412e4e Debugger: Add kit's environment to the debug environment
QNX 7.1.0 requires some specific environment variables to be
available to the debugger.

These environment variables can be set in the kit, and then
they will reach the debugger.

Change-Id: I9debec8240a6369823cc2fcf882355ef7ca4aa28
Reviewed-by: hjk <hjk@qt.io>
2021-05-22 13:17:58 +00:00
Christian Stenger
c6213df1c6 Unittest: Fix source location after merge
Change-Id: I671f6d8edd3d2989b0b1d1af86e2a3abac9a6c48
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-21 17:41:48 +00:00
hjk
b63a5a0411 Debugger: Remove one (and only) use of QProcess::systemEnvironment
This is not recommended to use, and using Environment::systemEnvironment()
also saves a conversion.

Change-Id: I7af24a5bbf432617a75421e6950292acc4b529a3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-21 17:18:49 +00:00
hjk
77d7b24326 Utils: Make Environment::setEnglishOutput a proper member function
The previous indirection was useful as long as they were overloads
for QProcessEnvironment and QStringList, but these are gone now.

Change-Id: I5066bd2e72fd06948a5cc7bbac6dda9006db96ed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-21 15:07:34 +00:00
hjk
2be8061930 Utils: Fix QtcProcess::exitCode for non-SynchronousProcess
Change-Id: I18706e55db3fd31a69161be69e1cbec1a4fca975
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-21 15:06:53 +00:00
Cristian Adam
9449bfbf04 CMake: Fix build with MSVC 2019 and Qt 6.2
Qt 6.2 requires __cplusplus preprocessor set to at least 201703L

According to https://docs.microsoft.com/en-us/cpp/build/reference/zc-cplusplus
one needs to add the compiler flag /Zc:__cplusplus

CMake doesn't set the flag, there is an issue opened at
https://gitlab.kitware.com/cmake/cmake/-/issues/18837

This flag is passed to any target that links to Qt6::Core, unless
the flags are not manually copied for some reason.

Task-number: QTCREATORBUG-25730
Change-Id: I271e85fe857b5d4ac8980f77c723e5704a8eb743
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-21 14:02:33 +00:00
Eike Ziller
587657d47b CMake: Fix build with Qt 5.14
qlitehtml links against "Qt${QT_VERSION_MAJOR}::Widgets",
but Qt Creator uses find_package with "Qt5" not "QT", so "QT_VERSION_MAJOR"
is not defined/empty.
For Qt 5.15 that is not a problem because that defines unversioned aliases
"Qt::Widgets". For Qt 5.14 we must make sure it is set though.

Change-Id: Icb0a195afadae3cdb164d28f15340c0a5e156543
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-21 14:02:18 +00:00
Christian Stenger
8d5e9c3636 CMakePM: Fix running selected ctests
Do not use a pattern to address tests when running selected. Instead
get their respective test number and use this.
This avoids executing unchecked test cases that match a shorter selected
one. Beside this it shortens the commandline which might be also a
benefit on Windows.

Change-Id: Ic1c0cf8eedab478564f04fb494679eca4521f402
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-21 10:26:09 +00:00
hjk
61a3457729 PE: Run process in ClangClToolChain::msvcPredefinedMacros only once
Double-execution was accidentally introduced in
https://codereview.qt-project.org/c/qt-creator/qt-creator/+/349499/7..8
when rebasing on a merge from 4.15.

Change-Id: I3c108185a59b738d0e5176d9e9f0432b4cc3c453
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-21 10:17:17 +00:00
Christian Kandeler
6ffe16d90b ClangCodeModel: Use clangd for all "follow symbol" actions
Change-Id: I4e33342d9683c24ad6ea5fbb578a1b460790aa4d
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-21 08:41:51 +00:00
Alessandro Portale
aabb6d3539 Tracing: Add a manual test
A minimal application that displays the tracing view with some dummy
data.

Change-Id: Ie564a3be017731313659aef7958138613b0bb94d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-21 07:00:49 +00:00
Leena Miettinen
3f31cd654d Doc: Make it clearer that Qt Quick Timeline module must be installed
If you want to use Timeline view in Qt Creator or if you installed
Qt Design Studio using the Qt Installation Tool.

Change-Id: I33c0f3709fc8f3b37c9630e0030b8a64ffa2093f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-05-21 06:33:59 +00:00
hjk
d3e2ae35cb Doc: Add some rules about use of Utils::FilePath and Utils::QtcProcess
Change-Id: I6c21fe0bc795a24ce6b61d739f221f28cefc6df2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-21 06:07:35 +00:00
Christian Stenger
ad16790140 AutoTest: Do not ignore crashing tests
If a test crashes we need to take its output into account
to avoid not displaying a result for the respective test
and having a wrong visual view of the results.

Change-Id: I349153192fa06c5d61bc51f8274d32ceb8cf8731
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-21 06:04:17 +00:00
Knud Dollereder
e7f923e9f1 Fix InvalidArgumentException for variant properties
Attempting to convert a QVariant to type QVariant::QVariant
fails with Qt6. This is now solved by constructing the QVariant
with the QVariant in question.

Fixes: QDS-4391
Change-Id: I20f64a3f2b3360705c73b3c1e1fd9e8987a31f3c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-20 17:11:12 +00:00
Knud Dollereder
415be13be2 Add missing includes
in order to be able to compile creator with Qt6 on macOS

Change-Id: Idea6feafe63ec099a4f4e552bb97df497f9254b1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-20 14:58:58 +00:00
Erik Verbruggen
3ed6f58056 Change the generator for the GHS and GHS-Arm compiler to Jom
Using Ninja not all modified files will be compiled in an incremental
build.

Fixes: UL-4247
Change-Id: I0bdb1e611e54ea6674ccae4d23391ac86f0960b8
Reviewed-by: <christiaan.janssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-20 14:04:10 +00:00
Leena Miettinen
2512d1970f Doc: Move information about exporting and importing under one topic
The new "Exporting and Importing" topic contains information about
exporting and importing 2D and 3D assets, as well as exporting QML
types.

Fixes: QDS-4369
Change-Id: Ie98ede4b0bcec4b872778fa7b2f054f1af4175fd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-20 14:03:18 +00:00
Erik Verbruggen
d98feae8f6 Add support for the Cypress traveo II kit
Fixes: UL-4242
Change-Id: I0b492a3edd6a1dce9d214e6490e174050c3fdb30
Reviewed-by: <christiaan.janssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-20 14:03:05 +00:00