Commit Graph

67787 Commits

Author SHA1 Message Date
Christian Stenger
b4742c03db QmlDesigner: Fix compile of tests
Change-Id: I3bab23e47702904f1602963e0c843f8f45c8b8c4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-12-10 12:03:26 +00:00
Eike Ziller
1283b15117 Merge remote-tracking branch 'origin/4.14'
Conflicts:
	doc/qtdesignstudio/examples/loginui1/qtquickcontrols2.conf
	doc/qtdesignstudio/examples/loginui2/qtquickcontrols2.conf
	doc/qtdesignstudio/examples/loginui3/qtquickcontrols2.conf
	doc/qtdesignstudio/examples/loginui4/qtquickcontrols2.conf
	share/qtcreator/debugger/dumper.py
	share/qtcreator/debugger/qttypes.py

Change-Id: Id44a67cdeeb0889ff96eddcdf409d20ca7cbdd0b
2020-12-10 13:02:02 +01:00
hjk
8d6ca33a7a Debugger: Remove more dead code in dumpers
Change-Id: If0a48377470b75a2d9c5d7f3cb47a492b9214791
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-10 10:55:20 +00:00
hjk
e7e0fa5745 Debugger: Remove create{Container,List,Vector}Item
Not used anymore.

Change-Id: I1d534a094717cfc44aea73e6b4ca948c088480ae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-10 10:55:11 +00:00
Kai Koehne
33487984b9 Doc: Use version independent Qt link
or use direct links where possible.

Change-Id: I00d559ad53a95caf91c39985bd9fb5ea99f9aed7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-12-10 10:48:25 +00:00
hjk
9c8c5b6363 Debugger: Strip inner typenames in pointer type lookup fallbacks
To compensate for a potential 'Foo*' vs 'Foo *' difference in
debug info.

Change-Id: I90e822f89bc13bdf7ffed30ee12a984a659aa38f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-10 10:22:47 +00:00
Christian Stenger
9c8768e752 Dumper: Remove some fallback code
..and unused or unknown variables.

Change-Id: I13d1d03fa09ef3952fe2cb3f4b257fb2882709f2
Reviewed-by: hjk <hjk@qt.io>
2020-12-10 10:21:34 +00:00
Thomas Hartmann
ad2699773d QmlDesigner: Set focus policy for 3D canvas
Otherwise the widget does not get focus.

Change-Id: I8209f85c375ff419d34397d9a9e1826d07b4e432
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-12-10 10:14:55 +00:00
Thomas Hartmann
c282551569 QmlDesigner: Track usage of flow tags
Change-Id: Id9e27c601dcb67e6758de51e8a1fcfd02b3ac6e5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-12-10 10:14:48 +00:00
hjk
eac85f8261 Debugger: Fix QObject property display with Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: I6e1013fe39208ef6e9ba792e6b2fb745eb5e3108
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-10 09:59:58 +00:00
Thomas Hartmann
ca33079e91 QmlDesigner: Add QTC_ASSERT
In corner cases m_nodeInstanceServer can be null.
This should be considered as an error, but there is
no reason to crash in this case.

Change-Id: If2b5e11b7d2462634ab8f9bce653bdbc5b3c8b45
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-12-10 09:58:29 +00:00
hjk
c902974423 Debugger: Simplify QObject parent dumping
Change-Id: I24fd6bf684a213c2e47978485442dd6c47073a7a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-10 09:54:08 +00:00
hjk
11d079a0fe Debugger: Partially fix QV4 dumper for Qt6
Just the 64 bit case, simple types.

Task-number: QTCREATORBUG-24098
Change-Id: If13e342c1fb419a026cdaa35b21483566e8494b7
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-10 09:32:13 +00:00
David Schulz
f440dfe43a LanguageClient: Restructure request response handling
Instead of working on a Client member IContent now returns an optional
response handler that consists of an id, a name and a callback.

Change-Id: I5ca7dd4eaa7ae37f333f99c9fe60339db03ebf2c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-10 09:31:31 +00:00
Miikka Heikkinen
757d3200aa QmlDesigner: Reset puppet if shader code changes
If a shader file inside the project is modified, reset the puppets to
update custom materials and effects that use the modified shader.

Change-Id: Ie81accf5f3029c31b49b65b5e1b53e1259a9b4eb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-10 08:54:01 +00:00
hjk
276c0ae482 Debugger: Adapt QStandardItemDumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I1c21e6a1ee3db3532029638eedfcf58eead53424
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-10 08:52:49 +00:00
David Schulz
34dfbe73b6 Debugger: Fix QVector and QList dumper with incomplete template types
This can hapen when QList and QVector is used in split.

Change-Id: Idb48901854e373139a38670a3d811bf01aef1915
Reviewed-by: hjk <hjk@qt.io>
2020-12-10 08:50:36 +00:00
Jarek Kobus
558532b45f Remove unneeded include
Change-Id: Ia61dd59af9bcb1157f9d601892695680974e31f2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-10 08:37:02 +00:00
Christian Kandeler
b83bbfa754 Wizards: Add placeholder text
... to class name field in "New Class" wizard.
This way, users understand right away that the class name can include
namespaces.

Change-Id: I84aaf2aca532a97ba40f72fd2385fcab40788970
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-10 08:27:23 +00:00
Christian Kandeler
d12e3cb72d Wizards: Use a FancyLineEdit::ValidationFunction
... rather than a QValidator.
QLineEdit's behavior of preventing invalid input is not suitable here,
as its concept of intermediate states is too limited.

Change-Id: If34793966e8b06762db86b90bb1dbb1526b74ea7
Fixes: QTCREATORBUG-22080
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-10 08:26:41 +00:00
Cristian Adam
5b1cff753a CMakeProjectManager: Match only on Cxx and C languages on import
This way Qt Creator won't be creating imported kits on every import.

On Windows the language "RC" is not part of the kit languages and
would always discard valid matching kits.

Fixes: QTCREATORBUG-25069
Change-Id: Ib4ec323ebf514c82e5036f7d0123100a75f3ea10
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-10 08:20:53 +00:00
Leena Miettinen
4e806fc194 Doc: Add location of anchor buttons to tutorial
Fixes: QDS-3308
Change-Id: Ib177cfee01689ff51e6a4c56dce52857ac1f0705
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-10 07:36:31 +00:00
Thomas Hartmann
fdf6cd7899 QmlDesigner: Reload file if type information is incomplete
Unfortuatly we require this. The code model might be still parsing imports
which will lead to an error. Reacting to ModelManagerInterface::libraryInfoUpdated
and then reloading the document does fix this.
This issue has high visibility.
In case the puppet debug mode is enabled we ignore this.

Task-number: QDS-3113
Task-number: QDS-1592
Change-Id: I6cbf9d01d1702f61c6bbbb86dca546174fecc825
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-12-09 14:58:47 +00:00
Leena Miettinen
a45689f85c Doc: Update instructions for using the \youtube macro
We needed a workaround to make this work in Qt Creator
and Qt Design Studio help mode.

Change-Id: I9b66fe91a5faa07366375a886a9f99352629945d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2020-12-09 14:19:23 +00:00
Ivan Komissarov
b0b419f7f8 Update Qbs submodule to the top of 1.18 branch
Change-Id: I1c0744603cbd9765a6752d15dc70f3e1d040c792
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-12-09 13:53:49 +00:00
Thomas Hartmann
5daee38ee3 QmlDesigner: Add compiler flag required to build Qt 6
Change-Id: I47defc9b8d4509f1a1aa367349c9b8268d876518
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-09 13:51:57 +00:00
Thomas Hartmann
37ec7f904a StudioWelcome: Set correct help topic
Change-Id: I7cc2ae25d8adf0034a7d4eb10956607dd5e5e1c0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-12-09 13:51:42 +00:00
hjk
ddb2ae657d Debugger: Improve QMeta* dumper for default-initialized objects
Null-dptr strikes again.

Task-number: QTCREATORBUG-24098
Change-Id: I4e24cbe4cad4995ce39116a1b51b26153004ccfc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-09 13:42:08 +00:00
Eike Ziller
ca016bfb2e deploy.py: Support Python 2.7, do not require all clang executables
FileNotFoundException is new in Python 3.
We might not have a LLVM build with e.g. clazy-standalone and clang-tidy,
make deployment of Clang executables optional.

Change-Id: Id25b2f65a8d060bac9cb7a66fb2cd7022e2724e0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-09 13:35:38 +00:00
hjk
3b7aee724d Debugger: Fix QFile dumper 64 bit for Qt6
32 bit offsets are mechanically adapted on the base that the size change
was due to five containers changing from one to three pointer in Qt6,
but this has not been checked.

Task-number: QTCREATORBUG-24098
Change-Id: I492485a720f75df5fdde3dedb2fcfe9e953f1ed7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-09 13:17:03 +00:00
Eike Ziller
344802b8b2 Don't call erase without namespace qualification
C++20 adds free a function `erase` as API for containers, and Qt 6.1
adds it for Qt containers.
Since it is a free function, ADL kicks in and creates issues if
we don't fully qualify calls to our `erase` function.

Change-Id: Ie5971d9206ae9e87e0f28f1390c09ded6f431b90
Reviewed-by: hjk <hjk@qt.io>
2020-12-09 13:15:22 +00:00
hjk
36c2e441ef Debugger: Adapt BoostSharedPointer dumper test to Qt 6
Use QList<QString> instead of QStringList for the test, the
actual dumper is unaffected.

Task-number: QTCREATORBUG-24098
Change-Id: Ibbdd9255add9744acc06144f8f8d5b34e42186c9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-09 12:40:02 +00:00
hjk
c06d3e39d8 Debugger: Adapt dumper test for QTCREATORBUG-4904
Maps have changed.

Task-number: QTCREATORBUG-24098
Change-Id: I3a078e0168fb0e2a95d4c92fefc7c3cdeba9114f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-09 08:51:00 +00:00
hjk
ce2e8bd2fb Debugger: Adapt QJson dumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I0bdfca1389763582072fd774b6288b9a855cf8cf
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-12-09 08:50:48 +00:00
Eike Ziller
4a0a466b75 cmake build: Fix sdktool default output path
The relative path that is passed to the sdktool build must be relative
from the sdktool binary to the data path. IDE_DATA_PATH is relative from
the Qt Creator binary.

Change-Id: If74d9a07cb491247861eef36ebf8406de4fdedd8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-09 07:54:02 +00:00
Assam Boudjelthia
ee199c3fed Android: setSticky behavior to follow other platform's kits
Don't set the whole kit's values to sticky, instead set only
device, toolchain, qt version properties to sticky to follow
the behavior of other platform's kits.

This also allow users to set specific CMake version for the kits
in case the selected one is not correct, since Android plugin doensn't
handle that anyway.

Fixes: QTCREATORBUG-25042
Change-Id: Ia6f6474b5ad9132e841e6e7024113439649b61f1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-12-09 07:38:30 +00:00
Johanna Vanhatapio
2b1de0c084 Doc: Add information about Telemetry and Crashpad settings
Change-Id: I94af94cd99537cc5fe15f3bd33b5edcafe0b33e2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-12-08 19:01:06 +00:00
hjk
17d7f24911 Debugger: Fix QGraphicsPolygonItem dumper for Qt6 64 bits
And effectively disable the 32bit version, too much effort for the gain.

Change-Id: Ia11da05f3d57feba915d6b2d2d9c901e5aec3433
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-08 17:19:49 +00:00
Alessandro Portale
19f2ed05d7 Dark Themes: Set the color for PaletteMid explicitly
Apparently, on macOS, the value of QPalette::Mid is set in a different
way than on the other OSes. Let's set it explicitly to ensure the same
painting of wigdets with dark themes.

The value PaletteMid=ffa0a0a0 was determined by manual trial and error,
to ensure that it does not change anything on non-macOS.

Fixes: QDS-3281
Change-Id: I7c044d3b41116e50b2c8a676f30a3b26019ad627
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-08 16:47:40 +00:00
Aleksei German
65fb5beb01 QmlDesigner: Extend QUL Metadata list
Change-Id: I2dbd3a4325ced09fdcf3667887ec2e67ccf59252
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-12-08 16:29:02 +00:00
Eike Ziller
b9a7864679 Android: Use new message manager API
Bring pane to front if error occurs when trying to install custom APK.
This is only triggered when the user explicitly presses a button, so
that is fine.

Task-number: QTCREATORBUG-24430
Change-Id: I4358e9a430ac220400ed70ebfe617f556d6e91a3
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-12-08 16:05:04 +00:00
Thomas Hartmann
036e6d9555 QmlDesigner: Normalize expression when comparing them
Change-Id: I0697e7cea74b942ee3c3f667741744f17281162e
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-12-08 15:50:08 +00:00
Thomas Hartmann
43b5b6fe4b Define PaletteMid explicitly
Since QTCREATORBUG-23505 we use QPalette::Mid for CheckBox
and some other control. The value of QPalette::Mid depends
on the system.
On macOS this created issues with contrast see: QDS-3281

Task-number: QDS-3281
Change-Id: Ic6f83703d16778732992df6bbde50a235306d7c8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-12-08 15:49:59 +00:00
Christian Kandeler
9cbcbfff33 Fix various clang warnings
Unused variables & functions, unneeded copies in range-for loops,
missing overrides.

Change-Id: I27b60e7c92a6ca425a84c89b537d5c3815449a94
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-12-08 15:39:20 +00:00
Ivan Komissarov
5abe6327fc Update Qbs submodule to the top of 1.18 branch
Change-Id: I57600318a5b9df143b5f2ce9fcbd4566865d8000
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-08 15:30:21 +00:00
Alessandro Portale
df482e27b7 McuSupport: Identify kits also by toolchain
Fixes: QTCREATORBUG-25052
Fixes: QTCREATORBUG-25053
Change-Id: I87e51fbdb8d01cb564574f996bdfb51420f28584
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-12-08 15:06:02 +00:00
Johanna Vanhatapio
e6b742a7e1 Doc: Describe the Group Component
Fixes: QDS-3080
Change-Id: Iea4bae5c8d2cbf3097fc99bfbb87132b460ab404
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-12-08 14:54:37 +00:00
Jarek Kobus
3796b66423 Remove unneeded include
Change-Id: Ifb857526ee559a4e1c8d48602fd89b3030238691
Reviewed-by: hjk <hjk@qt.io>
2020-12-08 14:44:34 +00:00
Jarek Kobus
e9ef83f4c6 Don't call non-const method on temporary container
...as it may detach. Fix the following clazy warning:
Don't call QList::first() on temporary [clazy-detaching-temporary].

Change-Id: I667c122c42ccfc1344508154466d9c1dc6ae6166
Reviewed-by: hjk <hjk@qt.io>
2020-12-08 14:44:18 +00:00
Jarek Kobus
c714cfa714 Don't clash signal names with other methods
Amends d2e1feceac

Change-Id: Icbd1179b29a9284d4dd64d3e4609a701a0708510
Reviewed-by: hjk <hjk@qt.io>
2020-12-08 14:44:08 +00:00