Commit Graph

66658 Commits

Author SHA1 Message Date
Ivan Komissarov
f45cfbe634 Update Qbs submodule to the top of 1.18 branch
Change-Id: I9bca087996cad51c2bfe015e739d06ef73dac9cf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-04 13:16:29 +00:00
hjk
5ca4427bb7 Debugger: Create list of arguments for manually created template types
This is one of the roadblocks for the current failing Qt 6 QVariant
dumper for self-registered types.

Change-Id: I304ce8e8aa3dfc5b3694b65198fbac4f42de6d4b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-04 11:41:35 +00:00
hjk
d861778ff1 Debugger: Adapt Qt6 QVariant(QHostAddress) dumper test
Just brush over the differences between the versions, the actual
contents is ok.

Change-Id: I4fe8e1a0e87ab6c4157a048f215b8abb13887cd4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-04 11:40:35 +00:00
hjk
54f281944d Debugger: Use @ as Qt namespace placeholder more widely
Change-Id: I73a7abaed17c1a8a1461a66e66860cba64d4f9d9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-04 11:17:20 +00:00
Eike Ziller
78f0bbd5ad Qbs submodule update for pulling fixes in
Fixes after c21932163779bcfe4577ac2e3326b8c113884829

Change-Id: Ic72a76e824e68405bb1582c2b6b59bd59858212c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2020-12-04 10:39:08 +00:00
Miikka Heikkinen
98af1e5033 QmlDesigner: Reset puppet alive timer when connection is cleared
It is simpler to just recreate the timer than reuse the existing one.

Change-Id: I50a8507a69b83917ff522bb5ae472285135c351c
Fixes: QDS-3026
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-12-04 09:01:44 +00:00
Jarek Kobus
7a85771c20 Fix a warning about conversion from size_t to uint
Fix a warning: conversion from ‘size_t’ {aka ‘long unsigned int’}
to ‘uint’ {aka ‘unsigned int’} changes value
from ‘4939931809569846361’ to ‘3557831769’ [-Woverflow]

Task-number: QTCREATORBUG-24098
Change-Id: Ibc123d8e28c7072dd947a1f8058dc8561ff7f6df
Reviewed-by: hjk <hjk@qt.io>
2020-12-03 21:00:03 +00:00
Ivan Komissarov
601c636e0e Update Qbs submodule to the top of 1.18 branch
Change-Id: Iefc4d43e14ecd9a001b41191883c6ddd22a9320a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-03 18:08:17 +00:00
Leena Miettinen
8d44cd1d5a Doc: Update info about platform support for QDS
Fixes: QDS-3245
Change-Id: Ifa434db2769331698956d7a2f0d037f0b0c0e137
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-12-03 17:07:27 +00:00
Thomas Hartmann
de3faf853d QmlDesigner: Update transitions if position changes
Change-Id: Ie971ee68f9f0ea9b200955487fe53e6465030129
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-03 16:31:45 +00:00
hjk
e62d364d97 Debugger: Adapt QVariantMap dumper and test to Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: I4e157a18ce5ff06a732fccbec1ec3d2ff507b961
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-03 15:22:24 +00:00
Eike Ziller
ed23cecc44 Bump version to 4.14.0
Change-Id: I419bf8e73519be8f796dbf4399ebebedf3d74ffb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-03 14:21:43 +00:00
Aleksei German
b7628865fb QmlDesigner: Fix for Image Browser cancel button
Task: QDS-3243

Change-Id: I25ead59b39f33927bd7283b19da3b4910d9ecf83
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-03 14:06:43 +00:00
Christian Stenger
7fbc926c64 Dumper: Adapt Qt handling for Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I62f2a4d91ed2f95ac167b836ea0e811599d0655f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-03 14:03:28 +00:00
Christian Stenger
5ed3357bed Tests: Fix expected type
Amends e6873b5b24. As on it fix handling for key, value
handling for Qt6.

Change-Id: Ie13b02f92fd56d9372150763a2d56df511185baf
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-03 14:03:20 +00:00
Christian Stenger
42bc7af96f Python: Do not pretend being C++
This avoids checking the debugger engine on Windows
which may fail when using a wrong kit.

Change-Id: I427281f6749cbccc3d3d85f6bdafa0138e1d54f0
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-12-03 14:03:11 +00:00
Johanna Vanhatapio
ca405966d9 Doc: Describe data collection
Task-number: QDS-3197
Change-Id: Ic8f32b4ffe378b9baa2c354a57b6d387f82fa790
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-12-03 13:56:46 +00:00
Christian Kandeler
b385bf8eb5 RemoteLinux: Classify executables correctly
... in the MakeInstallStep.
See also d56e88d36a.

Fixes: QTCREATORBUG-25022
Change-Id: I0824355e0604cd4a7cc2ac9cdb4a55733cb0f706
Reviewed-by: hjk <hjk@qt.io>
2020-12-03 13:18:24 +00:00
Knud Dollereder
a02be5442e Restore zoom-all special case for the flowview
Change-Id: Ifbed53253b0f00773dcd040f0bd2b06a2b941bd4
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-03 12:52:51 +00:00
Leena Miettinen
0c29e50353 Doc: Describe building docs with CMake and using the online style
You can now use CMake to build docs.

You also have an option to use the online style, which
enables you to check how the docs will look after release.

Change-Id: I63f573a58a2daf3aa05a2f0dd57f33f859e25bc2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-03 11:53:24 +00:00
Eike Ziller
eeea1e6c32 CMake: Apply configuration changes to fresh build directories
Fixes opening a new project without existing build folder, changing
some configuration values, and pressing apply or choosing Run CMake.

extraCMakeArguments contains the arguments needed to apply any changes
done in e.g. the CMake configuration list in projects mode.
When pressing Apply, the build directory gets created, and CMake run
with REPARSE_FORCE_INITIAL_CONFIGURATION. But we may not remove
REPARSE_FORCE_EXTRA_CONFIGURATION which might even just have been added
a few lines above after asking the user via mustApplyExtraArguments().

Amends af4e74a972

Task-number: QTCREATORBUG-24936
Change-Id: I5e5547611262490ebdebb30dc1bfc690f1cdedde
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-03 10:59:14 +00:00
Eike Ziller
7aa96780ed CMake: Improve handling of QML Debugging and Profiling option
The additional parameters to pass to CMake are set in a
"extraCMakeArguments" property, but we had two places where this was
set, overwriting each other: from the list widget where the user makes
changes, and from the QML debugging option.

Combine the two code paths. This has the additional advantage that the
changing QML Debugging and Profiling option behaves the same as changing
variables in the list - the "Apply Configuration Changes" button gets
enabled when changing the option, and one can use it to apply the
change.

Task-number: QTCREATORBUG-24988
Change-Id: I785c6804c9597a9eba471f56babaae966ce84b17
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-03 10:58:58 +00:00
hjk
f946e5b356 Debugger: Consolidate some string data extraction helper functions
Change-Id: Icfa395de5237e0f58e63b3ca0d88ff8c9a1998a9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-03 10:55:06 +00:00
Christian Kandeler
ff2322ac0b CPlusPlus: Fix mis-classification of pure virtuals
Syntactically, they do have an initializer, but they are not
initializations.

Change-Id: I0556b279ce2d173868585cbce085b803c1cff285
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-03 09:09:52 +00:00
Christian Kandeler
3a6e4860c4 Wizards: Delay validity check in LineEditField
... until the values have actually been set up.

Fixes: QTCREATORBUG-24971
Change-Id: Ia967fe95545eda1c9044faf8ab1ee885bf3d9e02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-12-03 08:32:03 +00:00
Leena Miettinen
bfba7a1e07 Doc: Fix commas
Change-Id: I55f18d0cabc35c345bc382118d4fc59cf69813bc
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
2020-12-03 07:58:10 +00:00
Thomas Hartmann
3838bb4e08 QmlJS: Fix resolving of implicit dependencies
If the QtQuick import was less than 2.15 implicit dependencies
were not properly resolved.
For example if a type from a module derives from QtQml.QtObject.

Change-Id: I42a3320ee91496da0991de2018efcd124d56f6cd
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-12-03 07:34:40 +00:00
hjk
08a1117c26 Debugger: Extend and fix QPolygon dumper and test for Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ia2e43d15263e18698d9db6b4d23fa553c7b7ae5b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-02 15:22:35 +00:00
hjk
b1f5bfdd4e Debugger: Fix compilation of manual dumper test with Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: Id835f4d9ac85e701cc57290e686f17a57ee221e2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-02 15:19:40 +00:00
hjk
8e0780e28c Debugger: Fix QHash dumper for empty containers
Task-number: QTCREATORBUG-24098
Change-Id: I2bf15504ffefdb458a5d93c9185f8b695f120189
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-02 15:16:55 +00:00
Knud Dollereder
6efb484868 Create zoomaction widget for the live-preview
Fixes: QDS-3203
Change-Id: I460fdc5882ff22c6a8c590402e0efe06dece435a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-02 14:28:14 +00:00
hjk
25a89250f6 Debugger: Adapt QVariant dumper and tests to Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: I9543bad098bb11d21079c1e2711b639bde3873b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-02 10:16:33 +00:00
Alessandro Portale
6c14b4dfaf QtQuick Application Wizards: Set default Controls Style to "Material"
The Controls Style "Default" that is currently by default in the
generated qtquickcontrols2.conf is not present in Qt 6. That leads to
QML runtime errors and aborting applications with Qt 6.

Let's switch the default to "Material" which is available since Qt 5.7
and present in Qt 6.

Fixes: QTCREATORBUG-25027
Change-Id: Ic8b631b771487624d7459a276d290b80c7ad8be0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-02 07:38:25 +00:00
hjk
e1790ed9d0 Debugger: Fix some dumpers with namespaced Qt
This makes the use of '@' prefixes in split('{@QString}'...) etc
mandatory, thereby removing the guessing on whether namespaces apply
or not on the dumper 'core' side, and removes the guessing on
whether dropping the '@' 'works' on the individual dumper implementation
side.

Amends 1074c2ffce.

Change-Id: I44611eb09557638dec12d2e2f78cdaeac0bbd449
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
v4.14.0-rc1
2020-12-01 14:59:06 +00:00
Miikka Heikkinen
cfacbb773b Utils: Use padding instead of margins for CrumblePathButton
Clicks on QPushButton margins are no longer detected as clicks, so
change the text alignment to be done with padding instead of margins.
See QTBUG-81452 and QTBUG-86587 for related issues.

Change-Id: I85971c4defc5d43f959095d4d8e4457804aae0f9
Fixes: QDS-3180
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-01 14:41:19 +00:00
Thomas Hartmann
88c13153b3 QmlDesigner: Add flag to usage statistics for stand alone mode
Change-Id: I5cc001ccd59059174c7f34978fda7c682900ad3d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-01 14:21:25 +00:00
hjk
dd2a880b8c Debugger: Simplify QByteArray dumper again
Change-Id: Id2622db1e855c7706260796b633f06d0e5da0503
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-01 13:57:06 +00:00
Robert Loehning
9a33333849 Test: Debugger: Gui: Compile fix for Qt6
Change-Id: I9c3c4b49e458c16115fead38255cfe197308916b
Reviewed-by: hjk <hjk@qt.io>
2020-12-01 12:26:07 +00:00
Leena Miettinen
b9886a4b04 Doc: Fix the \youtube macro for use with liteHTML help backend
Create a common directory for extra image files, and move the video
thumbnails there. This folder structure is required to work around
the fact that relative image paths passed to qhp.<project>.extraFiles
are not resolved correctly when loading the generated help project.

Change-Id: Iff5583a9a318670571b7f706182723e54e0ec466
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2020-12-01 10:40:02 +00:00
Christian Kandeler
2c2c7255b9 SSH: Do not use sftp -b
The -b option turns on "pure batch mode", i.e. users won't get asked for
a password. This does not seem to be overridable. Therefore, we use
input file redirection instead.

Fixes: QTCREATORBUG-24979
Change-Id: Id1f703ffd61a7b8d194437ee89676770990d0efa
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-12-01 10:15:24 +00:00
Christian Kandeler
990aa5e45b CppTools: Adapt autotest
Amends 370804c2ab.

Change-Id: I054a44948cd4a473ae22284d7669c4a7adb2fc86
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-01 10:15:04 +00:00
Christian Kandeler
9d44df05d0 clang support: Make qmake aware of libclang-cpp
Newer clang releases do not use the static tooling libs anymore.

Change-Id: Ia0766dce9ccf79266ec8a3fd0b0f9c638fc41ced
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-01 10:14:46 +00:00
hjk
e556463dc7 Debugger: Fix value endianness of register data with LLDB
Fixes: QTCREATORBUG-25009
Change-Id: I4de44cee6ef322791e3f4058a369548bfb210e77
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-01 10:09:44 +00:00
hjk
dda6775325 Debugger: Fix crash in GdbMi::parseValue with Qt 6
QString::begin/end may be null in Qt 6.

Fixes: QTCREATORBUG-25018
Change-Id: If50cb79c58096d5fa68e494e33bea131063968fb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2020-12-01 10:03:17 +00:00
Thomas Hartmann
35380afb93 QmlDesigner: Disable rich text for TextInput
TextInput does not support rich text.

Task-number: QDS-2769
Change-Id: I6ae9862f65c866cce2975f7f53cb2683f41f0d9a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-12-01 09:02:20 +00:00
Assam Boudjelthia
68e20abfef Android: partially revert 4035fc2433
The links for the new sdk tools were using a different folder structure
in the zip archive which are different from the previous packages and
from what QC expects.

Fixes: QTCREATORBUG-25017
Change-Id: Id288d5cc59a3bad87ce2c795fba28b7ebfa027e5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-30 17:29:26 +00:00
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