Commit Graph

72643 Commits

Author SHA1 Message Date
Jarek Kobus
8260074c67 Integrate ConsoleProcess into QtcProcess
Change-Id: I8e2b43ef27af6ff279b575a8d43f1ff918562951
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-25 08:36:09 +00:00
Alessandro Portale
14eb2ce0a5 Android: Make a couple of AndroidConfig's functions static
They do not access non-static members. This way, the functions can be
called (e.g. by auto tests) without having an AndroidConfig instance.

Change-Id: I2551bddc2f4745ee7486b490f1abf935204c7763
Reviewed-by: hjk <hjk@qt.io>
2022-01-25 07:06:28 +00:00
Leena Miettinen
a86979ddce Doc: Update screenshots of Welcome mode
The Welcome mode has been redesigned. The screenshots use
the Flat Dark theme. No text changes are needed.

Fixes: QTCREATORBUG-26884
Change-Id: Ic0d785fee78d50f6cb44d8a1cb17fe691d2167d4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-24 17:31:24 +00:00
Henning Gruendl
e05ecea4f5 QmlDesigner: Fix colors in some control states
* Fix color of press state in AbstractButton and CheckIndicator
* Replace hard coded color value for disabled due to MCU

Change-Id: Ic73c95e263ad30a5804f77ef1bfa44fa16ed5de9
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-24 16:37:03 +00:00
Henning Gruendl
94bf7a656f QmlDesigner: Fix SpinBoxIndicator hover/edit state
* Make global hover work on disabled SpinBoxIndicator
* Fix disabled state not showing in edit mode
* Hide/blend indicator on drag operation
* Some color changes

Task-number: QDS-5970
Task-number: QDS-5975
Change-Id: I4965b4c6ad906fe05f8a43cabb1914e15a23ba7d
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-24 16:36:27 +00:00
Henning Gruendl
7c38ee31e3 QmlDesigner: Update SpinBoxIndicator icon in font
Change-Id: Ib2921239fc5e29b5a0b14bb90eda56117fba12cf
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-24 16:36:16 +00:00
Henning Gruendl
c7c7747906 QmlDesigner: Adapt theme colors to welcome screen
Change-Id: I566a692c05f9799e4f44718a426d9536d5e2b9cd
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-24 16:36:05 +00:00
Thomas Hartmann
8d327c1cf7 QmlProject: Add option to always open ui.qml files in qds
This patch adds an option to always open ui.qml files in
Qt Design Studio. If that option is enabled an info bar is used
to propose the option.

Change-Id: Ia80ecd87de7fcf4c5824e7a8bb806c3d4d77b935
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-24 16:01:19 +00:00
Christian Kandeler
96083103d1 ProjectExplorer: Dissolve gcctoolchainfactories.h
The implementation of these functions being in a source file
corresponding to a different header made code navigation attempts super
annoying.

Change-Id: I10b33b31735021e92dd3775f4e88cbbe79cfde3d
Reviewed-by: hjk <hjk@qt.io>
2022-01-24 15:58:52 +00:00
Christian Kandeler
8a70f66c9c ProjectExplorer: Move GCC config widgets out of header file
They are only used in one source file.

Change-Id: I9a267be83156fb50c98da63fab165ef6123e7e59
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-24 15:58:30 +00:00
Christian Kandeler
35e908d835 Fix build
Change-Id: Ie23c6c8b131507e9ae2579ef361002654f55e282
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-24 15:58:01 +00:00
Christian Stenger
01d199ea82 Docker: Register only matching toolchains
Change-Id: I0d5b0f9686b4a8256167fc4f1b2b464885590e20
Reviewed-by: hjk <hjk@qt.io>
2022-01-24 15:09:28 +00:00
Christian Stenger
a08a7dda46 PE: Do not disable gcc detection on macOS completely
Otherwise we may miss the gcc toolchains on docker devices.
So, keep the detection disabled for desktop devices, but
allow to detect gcc in general.

Change-Id: If8feb33a7dd46451e6c16fc543b6799b7dcdd663
Reviewed-by: hjk <hjk@qt.io>
2022-01-24 15:09:19 +00:00
hjk
a48a96e05c QtSupport: Introduce a type alias for QList<BaseQtVersion *>
Change-Id: I96b0eccc04da2f4a1a4e5ea9bdceb91b3fa3d724
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-01-24 14:38:20 +00:00
Cristian Adam
761e1fb13f CMakePM: Add additional CMake parameters to the Kit's CMake config
This way one could pass --warn-uninitialized in the kit's configuration,
which will be transferred to the "Initial Configuration" and so on.

Fixes: QTCREATORBUG-26826
Task-number: QTCREATORBUG-26869
Change-Id: I6d9833a065ea790fc298a75b1120dfa360f885e8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-24 13:29:40 +00:00
Christian Stenger
016e497242 Tests: Add another docker device script
Change-Id: I5cd62cc3277fa495bbac74efd4db25f5e1fc9488
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-01-24 13:10:54 +00:00
Christian Stenger
22dd26bc76 Docker: Improve iterateWithFind
Handle critical file pattern after we got the results from find
to avoid finding to many false positives.
File patterns like "lldb-[1-9]*" end up using "lldb-?*" inside
find and will basically find anything starting with "lldb-"
which includes lots of additional lldb tools that cannot be
used as debugger at all and slows down the detection unnecessarily.

Change-Id: I0c816ae6b6e472b710ffede532c97c55a9d698fa
Reviewed-by: hjk <hjk@qt.io>
2022-01-24 13:10:45 +00:00
Christian Kandeler
cfae24a6e5 ClangCodeModel: Enable clangd's new "dirty headers" flag, if possible
This feature will be availabe with LLVM 14,
see https://reviews.llvm.org/D95046.

Task-number: QTCREATORBUG-26810
Change-Id: I0a6797a836c56f5b72cca34be8f2d3edf8ac7359
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-24 12:46:29 +00:00
Alessandro Portale
13af635b5e Android: Use native paths format when setting an environment
ANDROID_HOME, ANDROID_SDK_ROOT and JAVA_HOME should be set as native
paths in an environment to follow common practice.

Change-Id: I073d125c93e27a02cc2b909e8c641ea61b3e9f8e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-01-24 12:40:44 +00:00
hjk
25f5771aa4 Rename QtSupport::BaseQtVersion to QtVersion
... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid
conflicts.

Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-01-24 12:13:19 +00:00
Christian Kandeler
6cec0e2033 ProjectExplorer: Allow users to override the gcc target triple
... for the clang code model. Otherwise, it won't work with GCC
compilers for architectures clang does not know about.

Fixes: QTCREATORBUG-26913
Change-Id: I90115f2f562eae9922b90c500630ccf988542ca3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-01-24 12:10:56 +00:00
Leena Miettinen
2ac3704e76 Doc: Update links to video tutorials and talks
- Remove links to videos that describe using the Qt Quick Designer
  plugin that is disabled by default since Qt Creator 6.0 or Qt Design
  Studio.
- Replace links to old video tutorials with those to newer ones
  created by Qt support.
- Add the production year as a tag to help estimate the usefullness of
  the video.
- Remove link to the discontinued Qt for Automotive video.

Fixes: QTCREATORBUG-26868
Change-Id: I27f32f8b240747abca380d79119be9ce0862d4f9
Reviewed-by: Tero Pelkonen <tero.pelkonen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
2022-01-24 12:03:07 +00:00
Thomas Hartmann
533b2d3655 QmlDesigner: Remove check for QtQuick3D 5.15
The check can create false positives if multiple projects are opened.
By now not many old projects should be around anymore and therefore
we can remove this.

Change-Id: Iec46e584a5e806bb29374d92b8f1afb1e6393c86
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-24 11:44:08 +00:00
Christian Kandeler
b85e2bc17b ProjectExplorer: Do not set GCC install dir during auto-detection
The accessor has lazy evaluation built in, so no need to set the value
prematurely.
This reduces the amount of calls to the gcc binary at initial start-up
by a third, which corresponds to ~500 ms on my machine.

Change-Id: I35fb290c5f3e7572a129e4fdb1e4c8b12e766ad1
Reviewed-by: hjk <hjk@qt.io>
2022-01-24 10:27:40 +00:00
Christian Kandeler
1ed92cf926 ProjectExplorer: Do not run Qt Creator's own clang on every start-up
Change-Id: Id3f783113f44b4296de41c22099b2086cd4a14c8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-01-24 10:02:27 +00:00
The Qt Project
fad13c26b1 Merge "Merge remote-tracking branch 'origin/6.0'" 2022-01-24 09:52:22 +00:00
Christian Kandeler
a3d7cb300d Update qbs submodule
... to HEAD of 1.21 branch.

Change-Id: I9d0b5074e2afe6ae3e00bb5431c1db1adf1a5bb4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2022-01-24 09:47:03 +00:00
Christian Kandeler
64a4154596 ProjectExplorer: Add convenience method ToolChain::isSdkProvided()
Change-Id: I4f8bfcfbd5baef8210a41f6ccc878b0454e4697b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-24 09:45:15 +00:00
Assam Boudjelthia
9d221706f4 Android: Install both target and whole project artefacts with qmake
As a workaround for qmake projects with dependencies for shared
libraries, make sure to install both the current target and the whole
project artefacts, the latter was the default before QTCREATORBUG-25793.

Task-number: QTCREATORBUG-26550
Change-Id: I8f313652bb582b2512ebe3471933e53120baf020
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-24 09:36:07 +00:00
Eike Ziller
51d23ad64f Merge remote-tracking branch 'origin/6.0'
Change-Id: I55d228482ceda144f903fb85eef048d53602ad18
2022-01-24 10:34:10 +01:00
Alessandro Portale
da225e0784 QmlProfiler: Add quick3dmodel.cpp/.h to qbs
Change-Id: I87d70b8a1905bf348784a667ba75c18c759d4afe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-24 07:51:03 +00:00
Janne Koskinen
e37f1d3d6b Add Quick3d profiler support
Add support for quick3d profiling

Task-number: QTBUG-98146
Change-Id: Ida84537df685e8bddc536158519600d722a23d2e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-24 06:21:54 +00:00
Orgad Shaneh
0d600b0761 Git: Support HOMEDRIVE/HOMEPATH home directory
MSYS is using %HOMEDRIVE%%HOMEPATH% as home if exists, and falls back to
%USERPROFILE%. So Git settings are supposed to be in HOMEDRIVE on this
case.

Change-Id: Ia15fd30031eedd3e7669e63b265bed83b03518c8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2022-01-22 19:40:00 +00:00
Christian Kandeler
a2c861beaa Fix qbs build
Change-Id: Ief7fde692ec7afed19eadd122f90da40e2393f00
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-01-21 16:09:50 +00:00
Jarek Kobus
89fb9e6b2b Make a copy of ConsoleProcess class
This is needed for transition period. Make a copy of
ConsoleProcess and name it TerminalProcess. Make it a private,
non-exported class. The ConsoleProcess is going to be removed
after unification of TerminalProcess and QtcProcess classes
is over.

Change-Id: Ib2d4bc8e8fd7ff714d891c57f695dd0debcb5a11
Reviewed-by: hjk <hjk@qt.io>
2022-01-21 15:13:15 +00:00
Jarek Kobus
1f0ecd600e Move TerminalCommand into a separate file
This will ease the ConsoleProcess and QtcProcess
unification.

Change-Id: Idda9ad393d184088c3e3a734389761d7176bd0c0
Reviewed-by: hjk <hjk@qt.io>
2022-01-21 15:06:28 +00:00
Jarek Kobus
74f522e0de ConsoleProcess: Make setSettings() a static member
Since it's not possible to use directly ICore::settings()
inside Utils lib, make setSettings() a static member.
This simplifies the API of other static methods.
Set the settings just once now, inside main().

Change-Id: I2bcc58d4d29b5aba4a1a21a98a9f4245b24b530f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2022-01-21 14:53:17 +00:00
hjk
b3375cfd56 CMake: Prevent crash if kit has no toolchain
Amends beb167a963.

Change-Id: I65feee771a21bdfbb2a102419a0d778af97a22eb
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-01-21 14:11:48 +00:00
Thomas Hartmann
f55ec2f930 StudioWelcome: Use theming for extraction dialog
Task-number: QDS-5984
Change-Id: I2e5d067e47208214c81d126ebbc78fd7e560b7a0
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-21 13:37:41 +00:00
Christian Kandeler
a04cc5b7e1 ProjectExplorer: Collect bad baremetal toolchains
Extends 16ef8b6253.

Change-Id: I51d16057b45f21f50453a1d54a8bed7915c4d053
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-21 11:50:03 +00:00
Leena Miettinen
7a5b71b9b8 Doc: Update CMakeLists.txt files used in Qt Quick tutorials
...to the ones created by version 7.0 wizard templates.

Task-number: QTCREATORBUG-26610
Change-Id: I67409b5ba4800199f209d9ad1a85c6657e9210df
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-21 09:52:41 +00:00
Alessandro Portale
c9374b4d74 Core: Fix drawing of items without images
For items without images (e.g. Marketplace items during the loading
phase), the description text is drawn as fallback.

This change fixes the layout of the fallback text. Also, The drawing of
the hover effect is fixed by drawing a solid rectancgle instead of the
"blurred" image.

Fixes: QTCREATORBUG-26916
Change-Id: Icd1151d3b9412752a482abf869a2ec9ff5c3465e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-21 08:47:00 +00:00
Alessandro Portale
ebe5879723 Core: Fix redrawing of the current area in ListItemDelegate
If the ItemView is scrolled during the hover animation (e.g. via
mouse wheel), the previously stored Item QRect is not valid,
anymore.

Change-Id: I97b81cf063479a988221142474c9f511d02414d8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-21 08:46:53 +00:00
hjk
7aa458f490 Conan: Rename RunData to ConanPluginPrivate
The *Private convention won.

Change-Id: I21e9cc335d3da05e5530feb7a9394c3c281475bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-21 06:49:57 +00:00
Thomas Hartmann
189ff75709 QmlDesigner: Use logging category
Change-Id: I0e578650201f358adbf703bc057a02e8e902aaa2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-20 19:01:37 +00:00
Jarek Kobus
c0003c908d ConsoleProcess: Uniform the common interface of QtcProcess
This is a preliminary step before merging ConsoleProcess
into QtcProcess.

Rename command() to commandLine().
Return const references from commandLine() and from environment().

Change-Id: Iacbf48030d00f8dbba053ece70bd460924f96041
Reviewed-by: hjk <hjk@qt.io>
2022-01-20 16:42:50 +00:00
Jarek Kobus
c4054b5d1c ConsoleProcess: Uniform the common interface of QtcProcess
This is a preliminary step before merging ConsoleProcess
into QtcProcess.

Don't return bool from start(), all callers ignored it.
Rename stop() to stopProcess().

Change-Id: I2fda1337e6f490685669fbd7ad6987a97866fdbe
Reviewed-by: hjk <hjk@qt.io>
2022-01-20 16:42:44 +00:00
Jarek Kobus
15479285e3 ConsoleProcess: Uniform the common interface of QtcProcess
This is a preliminary step before merging ConsoleProcess
into QtcProcess.

Rename applicationPID() to processId().

Change-Id: I1f9a28e768505c08c2ca3529c2ff0432f2a62c78
Reviewed-by: hjk <hjk@qt.io>
2022-01-20 16:42:38 +00:00
Jarek Kobus
92e450951c ConsoleProcess: Cleanup internal fields
Remove unused members. Rename one member. Init some members
with sensible default values.

Change-Id: Ia7a6e561fcbb612c90aeb7a2c4c6b041d2018a7f
Reviewed-by: hjk <hjk@qt.io>
2022-01-20 16:26:24 +00:00
Christian Stenger
ca653a6a2c Core: Fix resetting animation timer on marketplace items
While the current animation is played other items may be painted
as well and will reset the animation what they should not.
Reset the animation hover timer only if it is the same
item we are hovering over.

Fixes: QTCREATORBUG-26908
Change-Id: I5fc55b5efb6f6b0db541604a92c7e4ddb8811336
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-20 14:24:29 +00:00