Commit Graph

67787 Commits

Author SHA1 Message Date
hjk
5951b26f1a Android: Make compile with Qt6 again
Use the special exception to use 'auto' for the return type of
QXmlStreamAttributes::values() to avoid preprocessor use.

Task-number: QTCREATORBUG-24098
Change-Id: I52362e6af6db728cb296bba033f9bfa08e93ca1b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-26 15:59:28 +00:00
Eike Ziller
d8eacfb863 Do not accept rich text in text display aspects
E.g. pasting from a html page should not take over formatting, and in
general we do not want formatting in these edits.

Fixes: QTCREATORBUG-24487
Change-Id: I4f268ed7ee1bd71026e7b446d9a62dcb145a9845
Reviewed-by: hjk <hjk@qt.io>
2020-11-26 15:55:13 +00:00
hjk
c625789d4a ClangBackend: Fix compilation with Qt 6
Change-Id: I2e921f5f5345a33f6d057f9df84a6da8c880e078
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-26 15:10:59 +00:00
Christian Kandeler
0f31458624 Core::OutputWindow: Make auto-scrolling more robust
We relied on the scrollbar position as an invariant, which breaks if the
formatter writes into the text editor directly.
Instead, we update the "auto scroll" flag only if the user actively moves
the scrollbar, which is what the intention was anyway.

Task-number: QTCREATORBUG-24728
Change-Id: Ic747391b3206d6a5ba8eaf4e3cac9a70fed6dfbc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-11-26 14:24:31 +00:00
Fawzi Mohamed
596e0c9fcb qmljs: avoid compiler warnings
Change-Id: I6640d461abb010ff694dfd06e1fe039f69338cc4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-11-26 13:34:26 +00:00
Fawzi Mohamed
6d8c1bd388 qmljs: fix wrong condition in import resolving
Change-Id: Ie6e0d3a5cbd97a9d15dc74b553bdc17d7d039bea
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-11-26 13:11:53 +00:00
David Schulz
f3830c68b1 Debugger: Fix dumper test using QVector
QVector is a typedef to QList in Qt6 so cdb reports vector types as
QList<T>

Change-Id: Ic1940bc9e3286906c42d29a9c29882b5b3699312
Reviewed-by: hjk <hjk@qt.io>
2020-11-26 12:23:10 +00:00
Eike Ziller
af4e74a972 CMake: Create build directory when user changes configuration
When opening and configuring a project, Qt Creator first tries to
configure the project in a temporary directory (if the build directory
doesn't exist anyhow). This is nice if you just open a project for
browsing, and the initial arguments are set up correctly for parsing a
project.

But if the user starts changing the configuration, either by changing
variables and applying the change, or by choosing a "QML debugging and
profiling" option, we should create the actual build directory and do
the configuration there.
Otherwise we have issues with redoing the correct configuration in the
actual build directory later on.

Fixes: QTCREATORBUG-24936
Change-Id: I54013a14f68eb7785e866cc2a9c09bbc43b44233
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-26 11:30:54 +00:00
David Schulz
e6873b5b24 Debugger: adjust QStringList dumper test for qt6
QStringList is a typedef in qt 6 so cdb reports the type as
QList<QString> now.

Change-Id: I9660935dfb26a2a765411acdec1a3478357040fe
Reviewed-by: hjk <hjk@qt.io>
2020-11-26 11:21:41 +00:00
Fawzi Mohamed
5ce8cf70e8 qmljs: Fix parsing and and loading of qmldir imports
Add most changes to the qmldir parser of Qt6. This is not a direct
application of the changes because they rely on changes to QtBase that
are Q6 only.
Ignore load errors of optional dependencies.

Fixes: QTCREATORBUG-24772
Change-Id: I0b85818b602c8c7c1712e52318b4ca3f15364cc5
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-26 11:14:26 +00:00
Ville Voutilainen
23501b4271 Android: Don't remove icons or splashes if files with similar names exist
Task-number: QTCREATORBUG-24879
Change-Id: Ie13a8a94534889c473414b5a5e771aae11d0f167
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-26 10:52:53 +00:00
Eike Ziller
6172fc8a9d Merge remote-tracking branch 'origin/4.14'
Change-Id: I8543d87779c0da6a876caa046f6852737c9ae680
2020-11-26 10:53:34 +01:00
The Qt Project
97c67fcf6c Merge "Merge remote-tracking branch 'origin/4.14'" 2020-11-26 09:50:12 +00:00
Christian Stenger
d31f2219fd Tests: Fix QString dumper test on Windows
Partially reverts 93fedb2c9.

Change-Id: I82c40c41a2d3e72774f046f91845fe2dc0745aad
Reviewed-by: hjk <hjk@qt.io>
2020-11-26 08:56:45 +00:00
hjk
0ce92b3ac7 Debugger: Adapt QXmlAttributes dumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I67ee0fae1308d20b474fe0dd565b46d2a83dd5e3
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-26 08:41:23 +00:00
David Schulz
786c131beb ClangTools: compare file names host os case sensitive
Change-Id: I31b889ca5e722bd565bde9b742e24da39151e8bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-26 08:02:16 +00:00
David Schulz
b40dcf6d29 ClangTools: Fix crash in document tool runner
Prevent removing refactor markers from already destroyed widgets.

Fixes: QTCREATORBUG-24982
Change-Id: Icf8950f8f8407fa8733a1ef30d05abb4a2b44dd4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-26 07:58:53 +00:00
Johanna Vanhatapio
3680d6aa5c Doc: Update Editing 3D Assets in Design Mode
Fixes: QDS-3105
Change-Id: I7ddbe2330c30c2bd8c5630bb499c64b7366e406a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-11-26 07:51:30 +00:00
Leena Miettinen
3d6ef913b7 Doc: Update info about 2D effects
The effects can now be dragged to components in Navigator.
Add icons to the table to follow the new style of listing
components.

Fixes: QDS-3153
Change-Id: I2c603acb165f809143b04adb93f65a2655344fab
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-26 07:11:05 +00:00
Eike Ziller
3ef279450b CMake: Don't overwrite existing builds when changing build dir
When changing a build configuration's build directory to a directory
with an existing build (i.e. CMakeCache.txt), do not overwrite it, but
just parse it (running CMake as needed to generate the fileapi
response). Do not ask funny questions in that case.

This solves the pattern that you want to use some preconfigured build
but configured the right kit already with the default parameters.
Switching to a different build directory should simply never "kill"
an existing build in any case (and running CMake with the
"initial arguments" basically kills the existing build in the
not-so-uncommon case).

Change-Id: I54ca1f14d72a11a3bfe5b09ce340b28be321f80e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-26 06:48:42 +00:00
Marco Bubke
1b477cbadb QmlDesigner: Don't copy the target
It is to costly. It is not thread save but we think there will be no race
condition. To improve the code we should capture only the needed data
and copy that.

Change-Id: Ide9c640a98c2aab6fbf25beedc9f533b695b9f02
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-25 19:38:57 +00:00
Eike Ziller
b243a794aa CMake: Fix missing run of CMake after saving sub-CMakeLists.txt
If you have a project with subdirs, changing and saving on of the
subdirs CMakeLists.txt would just "reparse" the existing project
data again.
Instead run CMake first, so the change actually takes effect.

Change-Id: Ia2b0f8b5681f10d426229470fdc420b3234eccec
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-25 16:19:38 +00:00
Jarek Kobus
e83a6f6610 Remove unused TypeSpecificDeviceConfigurationListModel class
Change-Id: I658e447d49bfd78b76c32f635f284eba859a0e94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-25 13:52:59 +00:00
hjk
93fedb2c9e Debugger: Disable Q{Typed,Byte,}ArrayData dumpers
Mainly because it is getting in the way of the string data dumper
consolidation. We can re-enable that afterwards. The loss here is
limited either way as QArrayData is only an implementation detail
of some Qt container, rarely, if ever used by end users.

Change-Id: I7e9074434f84da536d603b6a163a3a039facc8fc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-25 13:25:35 +00:00
Thomas Hartmann
9939b1844d Fix crash in ManhattanStyle
The widget can be a nullptr.

const bool isComboBox = widget->inherits("QComboBox");
Was crashing in the iso icon browser.

Task-number: QDS-3079
Change-Id: Ie7efa08ff5be094b94a835db895929158918bfcf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-25 13:17:15 +00:00
hjk
35c2d51ec9 Debugger: Adapt QDate{,Time} dumper and test to Qt6
Essentially removing the parts that are gone in Qt6

Task-number: QTCREATORBUG-24098
Change-Id: I49f7ed8ea8e568803850bd4a0118b690248013af
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-25 13:06:28 +00:00
hjk
1f75893eba Debugger: Adapt QDir dumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I5346a8eb129dd042279754748b26852acf082f94
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-25 12:45:57 +00:00
Christian Stenger
c13c9f1dea Clang: Avoid flooding unknown warning on macOS
clang seems to be pretending to be gcc (besides clang and llvm) on macOS.

Change-Id: Ifd838a2918673b8877f5bb5fd8248d4a849664f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-25 11:52:51 +00:00
hjk
79df1c0804 Debugger: Use Values instead of addresses in putStringValue
Change-Id: I31a3c1a326d777d9e7081552d5a956e8e2882dcf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-25 11:41:24 +00:00
hjk
1074c2ffce Debugger: Remove shortcut to get known type sizes in dumpers
This was incomplete, can conceptionally not be complete, and most
of the sizes were wrong for Qt 6.

Change-Id: Id107b30dd6707b280c18a5d2065a4ec9c39fb035
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-25 11:36:46 +00:00
hjk
961c660ebd Debugger: Use Values instead of addresses in encodeByteArrayHelper
Change-Id: I4ee44f14b5b0d6afddb305a923d25a737f0d3d97
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-25 11:36:26 +00:00
hjk
147ca66932 Debugger: Rename byteArrayDataHelper to qArrayDataHelper in dumpers
It's generic, and operating on QArrayData (-subclasses).

Change-Id: Ieedc0f1e3f573aeeb422eb9516d4634e6e0da4b9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-25 11:35:16 +00:00
Christian Kandeler
a10a1acd23 ClangTools: Fix terminology
Make it clear we don't disable specific diagnostics, but the checks that
triggered them.

Change-Id: Ie9b5568a1749f59d80827e342cb5299ebfc63227
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-25 11:27:04 +00:00
Eike Ziller
8245523653 Merge remote-tracking branch 'origin/4.14'
Conflicts:
	src/plugins/designer/cpp/formclasswizard.h
	src/plugins/designer/cpp/formclasswizarddialog.h

Change-Id: I9f9d166e1a9249022305503f9cbe571136c2a2b1
2020-11-25 11:25:34 +01:00
Thomas Hartmann
edef529df6 QmlDesigner: Fix crash
ToFront/ToBack is not always available.

Task-number: QDS-3167
Change-Id: Idfd4049e28505d4d87cb724c5efc46209e3be3aa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-25 10:11:22 +00:00
Jarek Kobus
166b7116a9 Fix a warning about deprecated qChecksum overload in Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: I00853b0cb4e0b4a36ad1e50319ba796e696341ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-25 09:35:59 +00:00
Leena Miettinen
80777e7579 Doc: Document context menu commands for components
- Add a table that lists commands available for components
  in Navigator and Form Editor
- Include the table in Navigator and Form Editor topics
  using an include file
- Add documentation for new commands (and those that were
  not documented for some reason)

Task-number: QDS-2744
Change-Id: I6d2d886aaeb9d7f5e21ca5e8007e3b036c61f1d0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-25 09:07:15 +00:00
Christian Stenger
02c876f6e8 PE: Fix handling of compiler command on Windows
Broke with c60c642fe5 and resulted in losing the
compiler command for Qbs and CMake for MSVC based tool
chains.

Change-Id: I400fda14869ebf11dc7ddc2fda7d5a52a2fc096a
Reviewed-by: hjk <hjk@qt.io>
2020-11-25 09:05:29 +00:00
Leena Miettinen
6fa57b79c1 Doc: Describe using NOT check box in Binding Editor
To use the NOT operator.

Move the summary of logical operators into an include file
and include it in both the States and Binding Editor docs.

Fixes: QDS-3163
Change-Id: I8547c3dee50db35cf7d3037df84de7fe2d24ac3c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-25 07:43:34 +00:00
Leena Miettinen
c01711435f Doc: Show "Using QML Modules with Plugins" in QDS Manual
This topic is also interesting to QDS users, who want to use
C++ plugins to simulate data in their applications.

Show and hide parts of the topic depending on whether the
QC Manual or QDS Manual is built.

Fixes: QDS-3126
Change-Id: Iba55de73cda265f3261bf6f790103251a6ef01db
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-25 07:43:16 +00:00
Thomas Hartmann
ecfa623ee8 QmlDesigner: Default canvas of 40000 is sufficient
Change-Id: I238cddd277739860fb32a89e3521b61cf488aa8b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-25 07:22:59 +00:00
Thomas Hartmann
d14fe41bc1 QmlDesigner: Reduce calls to updateGeometry
Those calls can really become slow in large flows
and do not seem to be required.

Change-Id: Ibd3cda917c2d71db10bc90ad2ca58351e8bf7d0f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-24 19:48:30 +00:00
Thomas Hartmann
95ae082404 QmlDesigner: Set the correct root item rect in flow mode
This method is called when showing the form editor again, after a hide.
Without this the RootItemRect is not set correctly in this case.

Change-Id: Ia2339daebb2b2cbcafc223b29878d24cbe371708
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-24 19:48:22 +00:00
Thomas Hartmann
4c4a25d08e QmlDesigner: To not render huge items
Rendering large items takes too much memory.

Change-Id: I19084d707989e846fc446e24da228bc73c024013
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-24 19:48:07 +00:00
Jarek Kobus
a3926b282e Fix a crash when opening pro file (Qt6 build)
When move c'tor of ProFunctionDef was introduced
it became possible, that m_pro may be NULL.
In this case we need to destruct this invalid state
of ProFunctionDef in a special way: we ensure,
that m_pro is not null before calling deref().

Amends: bf5cc934ea

Cherry-picks: 907923b7cafad8cff6f0f5c8764e9181ac1531bd from qtbase
Task-number: QTCREATORBUG-24840
Change-Id: I5b2643f2241407101dbf95a8d6ea9974cf8ae6ea
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-24 18:40:33 +00:00
Leena Miettinen
038cac9fe6 Doc: Describe adding Studio Components and Effects to Qt installations
The Qt Quick Designer Components module is currently only delivered
with Qt Design Studio. To build projects that use the QML types in
the module, the developer must build the module and install it into
their Qt.

Fixes: QDS-3147
Change-Id: I649576be7f07e19ac2fc3fa9ace6fcb65882ea84
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-24 16:39:39 +00:00
Eike Ziller
b47d95449d deploy.py: Fix when running with Python 3.6
Which happens to be the default version on macOS 10.14.
Python 3.6 does not return a sensible default encoding if you don't
fiddle with your environment (like explicitly setting LANG). Fall back
to UTF-8.

Change-Id: I12534e4745e9c29b40a02c4946d8079d395cc650
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-11-24 16:13:56 +00:00
Aleksei German
a118dc4836 QmlDesigner: Fix for Annotations dialogs crashes
Change-Id: I161dfcf1181af4a45dd98f71fea08fc8ec56e3f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-24 15:40:55 +00:00
Eike Ziller
471892deb0 Bump version to 4.14.0-rc1
Change-Id: Ifcb361437d1cac7d69e871a980a1824dc94b4c22
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-24 14:25:44 +00:00
Eike Ziller
d04355dfb0 cmake build: Re-add a "Dependencies" component that runs deploy script
And use that from the build script.

Change-Id: I97d5b593cf703bb8e51556240f37c80aad654732
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-24 14:10:07 +00:00