Commit Graph

66760 Commits

Author SHA1 Message Date
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
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
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
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
David Schulz
5cd057d9fe Debugger: Prevent calling windows lldb on startup
The LLVM package on windows contains an LLDB linked against python but
misses a python library. Calling this lldb to get the version number
results in an ugly error message that python36.dll cannot be found. Use
the file version info instead.

Fixes: QTCREATORBUG-23848
Change-Id: I6d8e6cac07b427de564eaaedf7de369391aed37e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-24 13:52:58 +00:00
Eike Ziller
3e00fd1ed0 Fix qtcreator_process_stub on Windows
When building with CMake, this is compiled with `-DWIN32_LEAN_AND_MEAN`.
This reduces the number of headers that are included by default,
and lead to e.g. malloc and exit not being available:

..\src\libs\utils\process_stub_win.c(149): warning C4013:
'malloc' undefined; assuming extern returning int

And therefore reading the environment file was failing.
Include the needed stdlib.h.

Fixes: QTCREATORBUG-24829
Change-Id: I24722dfd17ecf0e4e6c9059e2cececbb5923a976
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-24 13:14:18 +00:00
David Schulz
8f4be88eea ClangTools: prevent creating duplicated diagnostic marks
If we already have marks from the analysis for the open file we do not
need to create marks for the explicit analysis.

Fixes: QTCREATORBUG-24955
Change-Id: Id550566c6e9a2dbd4e4eb3e9b9460a7778e39a50
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-24 12:48:31 +00:00
Richard Weickelt
ff74a945be Update Qbs HEAD of 1.18
Change-Id: If19fd189b09ab09643d3f65ef7daddfb71e47197
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-11-24 12:42:08 +00:00
Christian Kandeler
baaccc87ba clang support: Adapt some version checks in qmake/qbs files
Change-Id: Ic1ea0e10586c5ab33f7fad87f76d742e13a55834
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-24 12:16:47 +00:00
Eike Ziller
ee6b329f10 Fix Qt deployment on Windows
Broke with 07128078b9

Change-Id: Icfc1ef7766017abf983115b20428931214a2a7c5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-24 12:02:13 +00:00
Eike Ziller
eaec56e6b6 cmake build: Fix issue with tests and CMake < 3.14
For the CPlusPlus target the target sources contain
"$<TARGET_OBJECTS:3rd_cplusplus>" with older CMake versions.
Looks like that was fixed in CMake 3.14.
Work around it by removing TARGET_OBJECT entries, which we definitely
don't want.

Change-Id: I036720f122aa2d0727e85b611f1e32c65fae57ae
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-24 09:55:11 +00:00
Eike Ziller
07128078b9 Integrate deployqtHelp_mac.sh into deployqt.py
For now this is a dummy integration by just calling the former from
the latter, which has the advantage that
- only one script needs to be used for all platforms
- passing just qmake instead of individual install paths is enough
  also on macOS

Change-Id: Ie05077ada950addd287b87d88045605d3bddb48f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-24 09:36:56 +00:00
hjk
1c244bd623 Debugger: Adapt dumper helper for embedded QString members for Qt6
This fixes the QUrl dumper.

Task-number: QTCREATORBUG-24098
Change-Id: I2dbc2f477c33bc0c7337e8a925dd0a35d15aa31f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 08:52:44 +00:00
hjk
8f338eb04f Debugger: Adapt QVarLengthArray dumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ic93e15bd474d42be49de34c87d56ffbc07757bdb
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 08:52:38 +00:00
hjk
56b2158500 Debugger: Adapt QRegion dumper and test to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ie9c75c779595a981e75f20e73bfaccb5d24cf16b
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 08:52:31 +00:00
hjk
0ede48270f Debygger: Adapt QLazilyAllocated dumper test to Qt 6 changes
Task-number: QTCREATORBUG-24098
Change-Id: Id5dde3089af8bffdc7b8d9ebfaf9e6748257fd9f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 08:39:40 +00:00
hjk
5ad9b00cf7 Debugger: Adapt QImage and QPixmap dumper to Qt6
Task-number: QTCREATORBUG-24098
Change-Id: Ib9b6c824df67d18d9b4282340f2ab0d4a5bae837
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 08:21:15 +00:00
Jarek Kobus
4c9361124d Fix compile warnings about missing overrides
Add missing overrides.
Remove validateCurrentPage() completely,
since it didn't do anything useful.
This method is not overridden in any superclass up to QWizard.

Task-number: QTCREATORBUG-24098
Change-Id: Iffa335c471469c56e830b6160da49359fc5d6bc2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-11-24 08:10:41 +00:00
Leena Miettinen
5d602466a5 Doc: Update info about Form Editor
Describe move, resize, and rotate cursors.
Add and update screenshots.

Change-Id: Id309b7ccc2221192813814d917e018f78971d60b
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-24 08:01:18 +00:00
Leena Miettinen
c9b53add47 Doc: Describe new and changed Navigator functions
- Locking
- Reversing
- Arranging

Fixes: QDS-3082
Change-Id: If1a246661219d8d55b66efa4cf16f5cad0c086af
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-11-24 08:01:02 +00:00
Assam Boudjelthia
b52ad29f3a Android: fix logcat not fetched when app exits/crash at start
Application output from logcat might not work if an app
crashes at the start, so with this patch we avoid that by
making logcat process fetch logs faster by not getting
the full logs but only the logs starting from the moment
we start the app (using -T arg).

This can be very annoying bug, because when starting the
app from QC it usually only prints "app_package_name died."
which forces the user to go into the logcat manually and
search for an error from thousands of lines.

Change-Id: Ic5ac0389cb28e7c80586490877a697272f3648af
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-24 07:51:26 +00:00
hjk
d0991ae5ae Debugger: Simplify user side of QString dumper code
Move the version dependency into the dumper base instead.
This also fixes the QFileInfo display, but not yet QFile.

Change-Id: Ia2cb75b2a74cbbd4bb2d6ede2178d96792883912
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-11-24 07:13:39 +00:00
Tim Jenssen
ec202c82a3 cmake: fix no libclang builds
Change-Id: Id5ce15851bf1cdbd3661adcf5751e66a4cf96930
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-11-23 19:57:25 +00:00
Assam Boudjelthia
bc5ffdb56b Android: fix copy gradle files button function
The the value was being set before the checkbox is connected, which
is useless.

Change-Id: Ifdbbccc1fe190e4dd646e77303af78757fadebb2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-11-23 19:31:31 +00:00
hjk
c80313f777 Debugger: Adapt QHash dumper for Qt6
This is a completely new structure, also effective order when
iterating is completely different.

QHashIterator doesn't work yet.

Task-number: QTCREATORBUG-24098
Change-Id: I917cacf7952d9d54a31d14a0691213ab944d0d8f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-23 12:26:24 +00:00
Tim Jenssen
5267efc234 cmake: disable reuse pch files for static libs with MSVC
Was not able to build something against these libraries
from another "cmake project".

Change-Id: I3876d102a320b4f5324e25fd8e840c181010c2a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-23 12:26:23 +00:00
David Schulz
a8ceeaf7df ClangTools: remove already existing temporary files
If we already have a temporary saved file for a modified document in the
VFSO remove the old one.

Change-Id: I748cd05a45dc74e5d84faa48a574983a628b050f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-11-23 12:23:47 +00:00