Commit Graph

67787 Commits

Author SHA1 Message Date
Christian Kandeler
4f45319e80 QmlDesigner: Fix warnings
Change-Id: I818bd2d6a7512609ee7f7c1345ba314ab304850d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-30 16:37:13 +00:00
Christian Kandeler
cb2a241e02 Utils: Filter adjacent carriage returns in OutputFormatter
It shouldn't change the semantics, and it helps on some systems with
strange line endings.

Fixes: QTCREATORBUG-24556
Change-Id: I8158ddda458e5500bce6ce7b9ff4d5d981f88d7d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-30 16:36:43 +00:00
Michael Winkelmann
7048a89fa1 FormEditor: Return correct bounding rect for rendered QPicture
The bounding rect is calculated by union of all child item boundings rect
of all FormEditorItems.

Change-Id: I908e9d08b581671436bc7334b3b7eb0a5cd25aa8
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-11-30 16:25:00 +00:00
Eike Ziller
5c5c023304 Update 4.14 changes file
Change-Id: I3fae8dfeacc19ad027090bc112d888efbc780f19
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-30 16:12:16 +00:00
Leena Miettinen
21f16c8d3d Doc: Add text properties
Fixes: QDS-2849
Change-Id: Id1fc33208bb5bfea10947b2c699ce2c9fb14250f
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-30 16:09:28 +00:00
Leena Miettinen
8cbbdacf3e Doc: Update info about custom components
- Describe "Edit Master Component" button in custom component
  properties.
- Organize the different ways of creating custom components under
  one heading.

Fixes: QDS-3164
Change-Id: I4b7c1f42e32c6d615ad5b2d9da26f15e69b2cb69
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-30 16:09:13 +00:00
Mahmoud Badri
f30565873a Fix Qt Creator + Coco build
param name "interface" is causing Qt Creator build fail when integrating
Froglogic Coco tools with Qt Creator.

Change-Id: If3fa3d44e941089a882deb44ba12dec6d00ad73d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-30 16:00:15 +00:00
Miikka Heikkinen
a1e9e6b70b QmlPuppet: Fix preview tooltip image creation for material components
There is an unknown issue causing the first premade material from
QtQuick3D.Materials library encountered in the scene to fail to load
properly as a component. In scene creation this is worked around by
falling back on primitive creation, but the same issue prevents
loading the component for preview image generation purposes. Luckily,
materials can be shared freely between views, so we don't need to
actually load the component in this case. We can use the existing
material instance just like with non-component materials.

As a side effect, this change also fixes the issue where premade
custom material previews didn't reflect the changes in material
properties, like other materials do.

Change-Id: I7f1d6863fe96734a610d725f2f71e252f03a4428
Fixes: QDS-3114
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-30 15:57:29 +00:00
Eike Ziller
d02afbe6b4 Merge remote-tracking branch 'origin/4.14'
Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: I2136ba89d3aa3c4c2a0e7a4f9d8ba9cec32924ce
2020-11-30 16:14:32 +01:00
Alessandro Portale
43c73b20e4 Android: Prevent multiple concurrent downloads of SDK tools
...by making the "Downloading SDK Tools package..." progress dialog
application modal.

Fixes: QTCREATORBUG-25013
Change-Id: I59979350d8f1ce5632ec520e1c661fff3399a283
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-11-30 15:01:11 +00:00
Johanna Vanhatapio
6250b13eb3 Doc: Add a link to Getting Started Video 2
Change-Id: I912ac899e658945f4ede5eb0ad5da70fa3df622d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-30 14:48:50 +00:00
hjk
398a74b027 Debugger: Adapt QObject name dumper to Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: Iee8a71eda4c15b3cd36e569805fef769f6eb090f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-30 14:30:13 +00:00
Jarek Kobus
448cdb7bb5 Fix a crash when editing cpp file
std::mismach() overload taking 3 arg assumes, that
second string is at least as long as the first one.
We don't guarantee this, as somethimes filePath2 is
empty string. Use 4 arg overload instead, which
ensure we don't exceed the valid range.

Fixes: QTCREATORBUG-24970
Change-Id: I8b7b11d124f69c7c9cb3246ee969f134fa026e08
Reviewed-by: hjk <hjk@qt.io>
2020-11-30 12:43:54 +00:00
Christian Kandeler
1a8fdb1379 ProjectExplorer: Remove unused virtual Toolchain::builtInHeaderPaths()
Change-Id: I684b4b7fba9b74baf0834e7d5a0815673c666112
Reviewed-by: hjk <hjk@qt.io>
2020-11-30 12:40:05 +00:00
hjk
e65b9cde28 Debugger: Partially adapt QObject dumper to Qt 6
This makes meta method and property names visible again.

Task-number: QTCREATORBUG-24098
Change-Id: I2e0522396a5e91be43ae6b850217b9153b29a962
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-30 12:02:29 +00:00
Bernhard Beschow
51fd8f5f70 Nim: Remove unused code
Change-Id: I989b951c0fa3a7bc732105c5b3985ea6b61a2fab
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
2020-11-30 11:44:45 +00:00
Bernhard Beschow
75c1b8d582 Nim: Remove unneeded wrapper method
Change-Id: I12b6a42a0611342644b2ff448cd33cedd3eb6ec8
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-11-30 11:44:18 +00:00
Bernhard Beschow
287196a008 Nim: Remove unused attribute
Change-Id: If8961425f658cac96f49e1d78f083c20aed6d818
Reviewed-by: hjk <hjk@qt.io>
2020-11-30 11:43:31 +00:00
Christian Kandeler
f772f09853 ProjectExplorer: Remove unused virtual Toolchain::predefinedMacros()
Change-Id: I24e515ba1767c72cbf43ae250908f571f0229e9f
Reviewed-by: hjk <hjk@qt.io>
2020-11-30 11:41:30 +00:00
Christian Kandeler
16bc10a66f ClangTools: Finish "disable checks" logic
- Take project settings into account.
- Fix some bugs in the initial implementation.

Task-number: QTCREATORBUG-24852
Change-Id: I4960fc68ef0b27777a152ca871dfa554fea72c51
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-30 11:38:08 +00:00
Christian Kandeler
aabdbb7d9e clangbackend: More libclang cursor adjustments
Fixes: QTCREATORBUG-21856
Change-Id: I034b463238b4b8da4c36f95cacab79adf94c11eb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-30 11:35:24 +00:00
Leena Miettinen
bd17dd445b Doc: Add instructions for using the \youtube macro
The macro shows a thumbnail with a play button to start the
video.

Change-Id: If4dcddfbdbc40e795f4306e83ede43187dd2439c
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-30 10:12:00 +00:00
David Schulz
7853c6ba4d AutoTest: add ITestBase::type() for better readability
Change-Id: I67133f4940329483f2d8d25d1212f4e07f57d39d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-30 05:15:15 +00:00
Eike Ziller
18e3e70887 qmake: Do not bring general messages pane to front
- message(): Print to general messages and blink
- warning(), error(): create item in Issues pane
- parse error and other errors: create item in Issues pane

Task-number: QTCREATORBUG-24430
Change-Id: I6b37cef0b9e53e2207341bd179e2c60a40da9ee0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-27 15:43:33 +00:00
Miikka Heikkinen
d3412cfcdc Add optional fps counter to 3D edit view
Currently it is enabled via #define FPS_COUNTER in
qt5informationnodeinstanceserver.cpp

Change-Id: If9af313232fc91fca674a43c7ca70b04db7e59f7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-11-27 14:24:40 +00:00
hjk
2bb32ed7a3 Debugger: Use Values instead of addresses in vectorDataHelper
Also rename it to vectorData, in line with byteArrayData and stringData

Change-Id: I91a4ddba272fcada3e451680ba5a5a756f7a976e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-27 13:58:30 +00:00
hjk
80fdbfff05 Debugger: Use qArrayData instead of qArrayDataHelper
Change-Id: I97a6c428e6b09232c420e2b8cb3b5b31588c949f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-27 13:58:04 +00:00
Leena Miettinen
b92a445a64 Doc: Describe "Create sub directory for each metadata" check box
In Asset Import dialog.

Task-number: QDS-2744
Change-Id: I4c675f7406735ab808008e92cadac0770bb4f342
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-27 13:55:08 +00:00
Leena Miettinen
8c2e1eef86 Doc: Describe valid property names
The error message, "Error rewiting document" is unfortunately
not helpful.

Change-Id: Ie9973865929e5a7048411cc400d5c45fc60bc3a3
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-27 13:54:48 +00:00
Leena Miettinen
e1a8923699 Doc: Replace most occurrences of "artwork" with "design"
...or remove the term. Qt Bridge can be use to export complete
UI designs, instead of just artwork, and we want to stress that.

Task-number: QDS-2744
Change-Id: I843b09d822c77ca4a59b993a9b3e392b747c15f6
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Antti Aaltonen
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-27 13:54:38 +00:00
Leena Miettinen
7f28237915 Doc: Add support for the \youtube macro
Show links to Youtube videos using thumbnails with a play button.

Change-Id: I131f24b1fb723c817c2387429bbf52997003f105
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2020-11-27 13:51:31 +00:00
Christian Kandeler
370804c2ab CppTools: Work around problems with our definition of __FUNCSIG__
This basically extends the existing hack to cover one more case. It may
very well break again in some other context, in which case we will
remove the custom definitions entirely, as the reason they exist in the
first place does not seem terribly relevant.

Fixes: QTCREATORBUG-24580
Change-Id: I757ac23682c81c647a5d968fa549baac5716010c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-27 13:46:45 +00:00
Michael Winkelmann
68e1247d99 FormEditor: Check that widget and graphicsView still exist after timeout
Change-Id: Ie1c3ea49221611240e58d738dccc6e350866d640
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-27 13:37:14 +00:00
Alessandro Portale
a3857a996a Don't access static functions/fields via instance
Courtesy of readability-static-accessed-through-instance

Amends: b2a766a79a

Round #2: This time done with Qt Creator's Analyzer, which
found other occurences than run-clang-tidy.py

Change-Id: I479e280c7abcf2d24baccbb0af69ae4bda05198e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2020-11-27 13:26:07 +00:00
Christian Kandeler
013f2a9d73 Wizards: Prevent deprecation warning in generated QtQuick application
Fixes: QTCREATORBUG-25002
Change-Id: Ic118e98a48913acc2abc841b985685059ef3741a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-27 12:31:16 +00:00
Miikka Heikkinen
dd279759dd QmlPuppet: Use QQuickRenderControl to render 2D views
Port QQuickRenderControl rendering used for 3D edit view also for
2D views.

This also fixes the issue of only partially rendered form editor
view for root items with non-origin position by adjusting the
position to 0,0 on the puppet side via an extra injected item.
As a result of the root item always being rendered at origin,
the visualization of the root item offset is no longer visible in
the form editor (the checkerboard background item).

Change-Id: Ide29510ef52513340d205ed35ac35c8cce66715c
Fixes: QDS-3159
Fixes: QDS-3175
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-27 12:28:57 +00:00
Miikka Heikkinen
ae15780f84 QmlPuppet: Hide 3D edit view render window
Rendering is now done using QRhi private API and QQuickRenderControl.

In addition, input event handling was changed to use sendEvent instead
of postEvent for our fake mouse events, as mouse event position
gets corrupted somehow if event is handled asynchronously when the
window is hidden.

Change-Id: Ia2466622cd4b60e3f73e0ad3e7e4da7c7c335451
Fixes: QDS-3125
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-11-27 12:11:28 +00:00
Jarek Kobus
a0dd5d2b4f Fix a warning about using deprecated Qt::AA_EnableHighDpiScaling
Task-number: QTCREATORBUG-24098
Change-Id: Ieb58a74e32fd55d95a701299f831d073ebbf4f8e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-27 11:13:11 +00:00
Orgad Shaneh
b801fc7ae7 BinEditor: Fix MSVC warning
warning: C4309: 'argument': truncation of constant value

Change-Id: I5da62c2534474f65d5b4d1b44b995dd765d02265
Reviewed-by: hjk <hjk@qt.io>
2020-11-27 11:09:47 +00:00
hjk
0cc5ee12c5 Test: Compile fix
Change-Id: I99a62c2534474f65d5b4d1b44b995dd765d02265
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-27 10:56:09 +00:00
hjk
4ac7bb5a01 Debugger: Use -file-symbol-file for cores, not for remote debugging
In 5467faa0d7 the replacement of -file-exec-and-symbols with
-file-symbol-file accidentally ended up in the wrong branch.

Task-number: QTCREATORBUG-24996
Change-Id: I2d6cb5432c0b11b02c3f8d3517075a7c00b05c9f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-27 10:35:41 +00:00
Christian Stenger
c217f0694d AutoTest: Allow registering ITestTools
Task-number: QTCREATORBUG-23332
Change-Id: I529b1cc1f110739c264c7a021aada063f697b1db
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-27 09:53:43 +00:00
Alessandro Portale
81f3452e1c Aggregation/Utils/ExtensionSystem: Make member functions const/static
readability-make-member-function-const finds lots of member functions
that could be made const. This change just picks getter functions that
really should be const.

readability-convert-member-functions-to-static finds non-static member
functions which do not access this. This change turns most of them
into static ones, but leaves some non static to keep the class API
consistent.

readability-static-accessed-through-instance fixes the places where
the originally non-static, now static functions were called through
instance.

Change-Id: I8cf16c01f7988a7c9d073b5f8ede6a9706b94fb0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-27 09:16:08 +00:00
Orgad Shaneh
08972d1952 ProjectExplorer: Fix crash on close while tree is scanned
* Open CMakeLists.txt of Qt Creator
* While it scans the tree, close Qt Creator

Change-Id: Ieabec0f7fe0495f68e833d7ced03076bc1ceddbb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-27 09:15:42 +00:00
Christian Kandeler
ae794d5914 MSVC: Also understand the "-D" syntax
... when filtering defines from the compiler command line.

Fixes: QTCREATORBUG-24985
Change-Id: I28b06aa640638578d384f744c63d1430cb4b99bd
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-27 09:12:21 +00:00
Christian Kandeler
ef05f29940 ClangTools: Use built-in header paths again
This was broken in 7b6ab79f3e.

Change-Id: I037474ecce62bfebfe167d8dce15a6e7dbf7a001
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-27 09:04:41 +00:00
Assam Boudjelthia
3df31e9b4b Android: remove unnecessary setSummaryText for AndroidBuildApkStep
Amends 2d05822e27.

Change-Id: I24a9da450801953e1994384ae926c4f8b732b7b9
Reviewed-by: hjk <hjk@qt.io>
2020-11-27 08:28:02 +00:00
Fawzi Mohamed
054e3fa28f qmljs: actually fix incorrect condition
Suppress error message if either the current or the sub import are
optional.

Change-Id: I6ab8592c6aa8b20576bfa897e432d317f8a7e3b5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-11-27 08:26:47 +00:00
Assam Boudjelthia
6f17ad0562 Android: avoid QTC_ASSERT in addTask
Change-Id: I0b3eee749f21a031ff7b7f910b07719b03585759
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-26 19:03:01 +00:00
Assam Boudjelthia
2d05822e27 Android: move <b> from displayName to summaryText
In case or error QC will mention the name of the step where the error
happened, and it doesn't look right quoted in <b> tags.

Change-Id: I4b0b49367daeda845483c0bdbbc036c6d4c90f51
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-26 18:54:40 +00:00