Commit Graph

67787 Commits

Author SHA1 Message Date
Tim Jenssen
0c6231d7ec Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Conflicts:
	src/tools/clangpchmanagerbackend/source/pchtaskqueue.h

Change-Id: Ibe8ac2fa0eafcbcc86ac445f0be035839e06ff40
2020-07-01 09:40:01 +02:00
Eike Ziller
6d9ccbdf69 Merge remote-tracking branch 'origin/master' into 4.13
Change-Id: I85e235f2fabf0a98f61f259b7c8820979714fff9
2020-07-01 09:18:26 +02:00
Eike Ziller
5a97e8ceb9 Merge remote-tracking branch 'origin/4.13'
Conflicts:
	src/plugins/android/androidsettingswidget.cpp

Change-Id: Iadf1d58a1e867ae7bb2dca55d3951613cfcc3d07
2020-07-01 09:01:26 +02:00
Christian Stenger
ebf03b5c23 QmlDesigner: Fix compile with Qt 5.12
Change-Id: I630496ae7351026d207fb5c87e2eb32e2d2aff34
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-07-01 06:48:15 +00:00
Leena Miettinen
41a69be366 Doc: Clarify what happens during export and import with Qt Bridge
Fixes: QDS-2433
Change-Id: Ia30957863c7200eb0438db4e271e5c2be0208637
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-07-01 06:41:16 +00:00
Alessandro Portale
42b5aa4aca Target selector: Fix drawing of the run icon
With the new layout calculations (see QTCREATORBUG-24148), the
option rect can now be used to center the icon with the provided
functions in QRect.
The current code kind of works if RunColumnWidth matches the row height,
so that it can do things like subtracting vertical from horizontal
dimensions. But in fact, the icon is not centered on the option.rect.

fillRect(option.rect, Qt::red) <-to verify.

Apart from that it has a few more downsides.

This change:
- Uses the run icon made for dark background
- Paints the icon at its native 16x16px (instead of 15x15px)
- Uses QRect::center()/moveCenter() to actually center the icon

Change-Id: Ib280c650bd454b551f9e30ca108579fee06d81f0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-30 20:49:09 +00:00
Thomas Hartmann
f9df5b445a QmlDesigner: Fix tests
Change-Id: I74442bf004a462d5d310f128b64f8bc82073d822
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-30 18:47:17 +00:00
Knud Dollereder
5143e6c8ba Fix coverity warning: Initialize result
Change-Id: I95a094ecd24e78dd452a58b0757a9ae69c81a555
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-30 13:39:28 +00:00
Henning Gruendl
a2f282e440 ADS: Fix uninitialized member
Change-Id: Iffbe8aef11a705930da3c3ab22ac61ab7139b9f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-30 12:54:29 +00:00
Alessandro Portale
a6bf71a327 McuSupport: Bump supported Qt for MCUs version from 1.2 to 1.3
Task-number: QTCREATORBUG-24203
Change-Id: I259a4bfba49624d313fd1a2562f6288e047a16da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-30 12:47:46 +00:00
Marco Bubke
a8819d0efd QmlDesigner: Add missing header
Change-Id: I028438968176af0c42759de06d93b8043383cfe9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 12:14:20 +00:00
Christian Kandeler
59b84c8d19 Wizards: Update templates in regard to deprecation warnings
The QT_DEPRECATED_WARNINGS macro has no effect anymore, so let's remove
it along with the huge chunk of comments that took up an inordinate
amount of space in the resulting project file. The concise comment for
the QT_DISABLE_DEPRECATED_BEFORE macro is perfectly sufficient.

Fixes: QTCREATORBUG-24244
Change-Id: I549c16c2c037bb64c2833e4807047ab3a8b2103f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-30 12:13:41 +00:00
Christian Kandeler
e9fed0e536 Meson: Fix build with older GCC
Change-Id: I3a3ed1ea65e066e73d3cabb29a8858677197f18f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 12:12:51 +00:00
Alessandro Portale
c43ef81d4f McuSupport: Add MCU/Board SDK package to kits
In order to access target specific APIs/services, one needs a vendor
specific SDK. In Qt for MCUs, these SDKs get integrated to the build
system by a couple of environment variables.

Some examples: EVKB_IMXRT1050_SDK_PATH, STM32Cube_FW_H7_SDK_PATH,
STM32_CUBE_L4_INSTALL_PATH, etc.

This patch adds a path chooser for MCU/Board Sdk installations to the
McuSupport Kit creation settings page. The selected path is set as
environoment variable in the Kits settings.

A fix in parseDescriptionJson was needed to read the boardSdk/envVar.

Task-number: QTCREATORBUG-24201
Change-Id: I4ceb9ce0f54e321646bbdeb256703011583feefb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-30 12:05:56 +00:00
Eike Ziller
6a095d6c9a CMake build: Make option to include dumper tests discoverable
Change-Id: I9828f362561b8392d31a56f8a60fe9531accf4ce
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-06-30 11:39:44 +00:00
Eike Ziller
7f44d8582b CMake build: Remove timeout for dumper tests
They take much longer, but are also optional.
Makes it possible to run via e.g. "ctest -V -R tst_debugger_dumpers"

Change-Id: I8bbda6ca36e25cd896b1f3be5d1696a27b8acc53
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2020-06-30 11:39:24 +00:00
Vikas Pachdha
2faeb4641e AssetExport: Fix build error
Change-Id: I11fb23e15e11a7542faccb7c1ed3db6936021db2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 10:55:43 +00:00
Leena Miettinen
af69612daf Doc: Describe moving types and symbols in Outline view
Task-number: QTCREATORBUG-21993
Change-Id: I2a156549e8eb8c5f31e505edeb3ab5f741be0245
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-06-30 10:35:31 +00:00
Leena Miettinen
a8cfe3d560 Doc: Fix menu paths to submenus and items that moved to View menu
The Views and Workspaces menus as well as some menu items were moved
from Windows to View.

Change-Id: I2e196c09f0e9e2bf8ef1623167ec3e87ed1f77f5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-30 10:35:07 +00:00
Eike Ziller
b684d4c827 CMake: Fix handling of setting for Ninja path
When Ninja is installed via the installer, it writes the full path to
the Ninja binary into the settings.

Change-Id: I95a19c8c1afbf980c899fb1eeb8656e7e86ad4a2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-06-30 10:33:31 +00:00
Marco Bubke
1e6807c680 QmlDesigner: Add listmodeleditor
Task-number: QDS-2294
Change-Id: I66cae3a0d4265ab112eaf6b04e3a5972d185ff43
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 10:28:07 +00:00
Assam Boudjelthia
097c9ed484 Android: remove unnecessary validateNDK function and ticks
The NDK is installed via sdkmanager anyways, and custom NDK paths are
verified upon choosing in the file dialog and rejected if not valid.

Change-Id: I18f876dfacdbc1045679c6b082a500527a933673
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-30 10:05:55 +00:00
Marco Bubke
009c2745e2 ClangFormat: Relax the clang format file a little bit
It will not always insert a line break after 100 sign but tries to find
middle ground. Normally it's not a problem but it will prevent some strange
looking formatting.

Change-Id: I0ba987f944d360b3d0f0d8dce29ef825696b1a92
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 09:52:59 +00:00
Marco Bubke
32e181f5ce ClangRefactoring: Remove not used pch files
Because we use UUID for pch files every time we rebuild a pch we get
a new file. This patch is collecting and removing this pch files.

Change-Id: Ia8688e7215ee7b41f39b2285323eaa345056bda3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 09:52:50 +00:00
Marco Bubke
c924a45fb2 Refactoring: Fix unit tests
One if the LLVM 10 hot fixes was not working.

Change-Id: I1e6cab39ffd5c52f55fb83ff777f6eca457dea35
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 09:52:42 +00:00
Marco Bubke
36b72e2bab QmlDesigner: Break dependencies
To get the model under unit tests we have to break every depenedency to
code outside of the unit test scope.

Change-Id: Ib613c3308e48990c55b2ed0cd42bc4b0e1041a01
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 09:52:34 +00:00
Assam Boudjelthia
518e7970bf Android: remove "Bundle" from ndk name
Change-Id: I5368d77cfe3e94560fb897bfd0213fc3dec74d55
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-30 09:38:37 +00:00
Christian Kandeler
66d74ac566 Target selector: Make sure the run icon is not hidden under scrollbar
Fixes: QTCREATORBUG-24148
Change-Id: Icae939d8f63a99b372f32d91d33acdfb2130a4f7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-30 09:03:45 +00:00
Christian Kamm
2c2cd08761 QmlJS: Fix codemodel reset
The QML import paths weren't scanned for modules when the code model was
reset.

Task-number: QTCREATORBUG-24082
Change-Id: If818ebf4ef123529e5fe8de40e6b5d0154c84680
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-06-30 08:57:28 +00:00
Vikas Pachdha
4d17a2c50a AssetExport: UI improvements
Add checkbox to export assets and fix progress bar

Task-number: QDS-1560
Change-Id: I8a23f4bc4a2f7ba99fcc4cf235ce94fa69ac151a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 08:37:33 +00:00
Vikas Pachdha
4b99200870 AssetExport: Add typename and export type to metadata
Task-number: QDS-1556
Change-Id: I46602334d2887024a4f1f121e3f4bf804fd01846
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 08:37:17 +00:00
Vikas Pachdha
d8e3bc43b5 AssetExport: Let user cancel the export
Change-Id: I6c2ee983bf9633744a74ad1c1f01fda4cdefd0ca
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-30 08:37:06 +00:00
Alexis Jeandet
66c3fe931f Meson/Doc: Initial documentation for Meson build plugin
Mostly copied from CMake and adapted to Meson.

qtcreator-kits.png screenshot has been taken on Linux but
https://doc.qt.io/qtcreator/creator-targets.html#specifying-kit-settings
has Windows specific stuff (item 11. "Select the Force UTF-8 MSVC compiler").

Fixes: QTCREATORBUG-24216
Change-Id: Ie6c3c48fea7f1732f010eb10cbb152406e08810c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-30 08:11:37 +00:00
Alessandro Portale
1e4166b850 Revert "McuSupport: Bump supported Qt for MCUs version from 1.2 to 1.3"
This reverts commit 09cb6d0d1e.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I463f10f1f25e610d1e7b9e8d84d8a8564f5a26f3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-29 21:24:28 +00:00
Alessandro Portale
09cb6d0d1e McuSupport: Bump supported Qt for MCUs version from 1.2 to 1.3
Task-number: QTCREATORBUG-24203
Change-Id: I378dca375bcd9a533c585369bb61c2c329a8a1d1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-29 20:33:41 +00:00
Alexis Jeandet
bce43c15af Meson: Trivial fix for tests
Meson sample folder was renamed without updating tests.

Change-Id: I95b984b6d18a43e0f570368b76b669376fff4f0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-06-29 15:25:33 +00:00
Venugopal Shivashankar
3a2f09c1bb Doc: Update the setup instructions
Dropped/moved links to the Qt for MCUs documentation
at some places. This should improve the reading
experience and avoid confusion.

Fixes: UL-2324
Change-Id: Ied18323355884092d9b02a2228bdf8a9e1c4235c
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-06-29 13:41:47 +00:00
Miikka Heikkinen
38ded4ffea QmlDesigner: Turn the 3D edit light on initially for lightless scenes
Change-Id: Ib840adec751604f08b5135b3e3088b7ce663685a
Fixes: QDS-2316
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-29 13:30:07 +00:00
Miikka Heikkinen
28c6457b8c QmlDesigner: Change style of connection view
Style updated according to UX specification (QDS-2201).

Change-Id: Id1bf1fec0a5f0e742c1f5146d905800b53ed5125
Fixes: QDS-2437
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-29 13:22:29 +00:00
Henning Gruendl
7f0a0d2c60 QmlDesigner: Property Editor cleanup
* Put align distribute section in separate file

Change-Id: I8f0219f32f847c11733833164c5287af5df429cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-29 10:35:16 +00:00
Miikka Heikkinen
85bcae2c38 QmlDesigner: Handle active scene id change properly on edit 3D view
The scene id shown on the corner of edit 3D view is updated and
toolstates are also stored under the new id.

Change-Id: Ib3ac2f2bb829a5d908e22932c313c76bd4143592
Fixes: QDS-2277
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-29 10:19:45 +00:00
Henning Gruendl
ddde374b40 QmlDesigner: Set height according to active tab
* Add binding to current tab height
* Remove unused specficsOneHeight statement

Task-number: QDS-2051
Change-Id: Ia1ac6af4e65d3de5e1db96f2bcc2d1ec8eb08312
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-06-29 10:15:16 +00:00
Miikka Heikkinen
ba942583b8 QmlDesigner: Update 3D edit view on state change
Change-Id: I56b16afe4d9ccab802d6e07f60b57e46a353cc26
Fixes: QDS-2378
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-06-29 10:06:55 +00:00
Thomas Hartmann
7ab00c4e94 QmlDesigner: Fix crash
Change-Id: I67c2a97e44c2bdc6973c2a3d3cbc222c46b1c461
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-06-29 09:35:42 +00:00
Alexis Jeandet
8a2cb794b9 Meson: fix broken project tree on windows
Change-Id: I88d0e5b6f1547d5fa6fe832d26bafee59e535a4b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-06-29 09:12:13 +00:00
Christian Kandeler
1c8b9e3d48 QmlDesigner: Fix qbs build
Change-Id: I6abaeebf4bb37bc676ecea6d34bd9484b09054a7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-06-29 09:07:17 +00:00
The Qt Project
82574a2357 Merge "Merge remote-tracking branch 'origin/master' into 4.13" into 4.13 2020-06-29 08:21:37 +00:00
Assam Boudjelthia
34963768c0 Android: move non UI functions from settingsWidget class
Change-Id: I2d6c6806fc8b219b65d241a0243ee1edab5125a1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-06-29 08:13:27 +00:00
Christian Kandeler
08d16332f2 ProjectExplorer: Do not activate kits via right click
... in the target selector. When requesting the kit context menu by
right-clicking, we get extra mouse events on Windows that activate the
kit, which is annoying to users. Suppress these events.

Fixes: QTCREATORBUG-24156
Change-Id: I8a5de927634dfdfafb54d265ab31763c6120a527
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-06-29 08:02:45 +00:00
Alessandro Portale
f1a5939e86 Android: Fix default (Android Studio) Sdk path for Windows
By default, Android Studio on Windows puts the SDK into:
%LOCALAPPDATA%\Android\Sdk

Change-Id: Iadbb1cb5c15c6cdb581cbe07b2a0e83ac11e384e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-06-29 07:35:22 +00:00