Commit Graph

66382 Commits

Author SHA1 Message Date
Robert Loehning
675a85bef0 QmlDesigner: Add missing include
Amends 3614ab81ce

Change-Id: Ib8a02fe5829462379ae9a665b5c0e8e8832cc090
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-20 10:57:13 +00:00
Mahmoud Badri
1a8c802f56 QmlDesigner: Remove Switchsplittabwidget
Removed the unused class Switchsplittabwidget from the codebase.

Change-Id: Idb0071d4e6bb54b6a08e6026f8768f9239a5c342
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 09:32:06 +00:00
Robert Loehning
15c9de9251 Squish: Update tst_codepasting
Change-Id: Ie908f0af267f420e107c06ae039bb085462f945d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-20 09:26:28 +00:00
Eike Ziller
3614ab81ce QmlDesigner: Fix incorrect conversion between double and int/long
And fix macOS build which complained that std::abs with doubles is
ambiguous (between int and long and long long).

Amends aaf564cab7

Change-Id: I87d4453afa4dda676cc27c219d7dbfc22fcee70a
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 09:19:34 +00:00
Alexandru Croitor
fb0db5c745 ProjectExplorer: Fix sorting predicate to have a strict weak order
Fixes random crashes when opening the 'Manage session' dialog.

Amends 8c0906e8fb

Fixes: QTCREATORBUG-24797
Change-Id: Ic3118163d1a9a10eacc1ea1cc90f54c86ac790d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-20 08:48:12 +00:00
Eike Ziller
08d84a688a Fix compilation of sdktool against old Qt versions
Amends 6c5eaed92c

Change-Id: Ia664ea16767e9787252ec529061c7d5f5d89a7de
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-20 08:28:04 +00:00
Mahmoud Badri
83da45adde QmlDesigner: Remove AnnotationTool
Remove AnnotationTool from FormEditor's selected item's tools.

Change-Id: I797ed4002d14c04956aaeb5d779f1cf3f326f849
Fixes: QDS-2970
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 07:57:36 +00:00
Christian Stenger
05ecdba5d8 Tests: Fix compile and code
Change-Id: I2f2a8a4ff9e7bcd3138b93b177e07f2aa3850fcb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 07:35:33 +00:00
Cristian Adam
ab8cda95a6 ClangRefactoringBackend: Fix build with Clang 11
Change-Id: Id03b0771e242534943e062dee3e63022ec9d9ce8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-20 06:57:35 +00:00
David Schulz
f220cb0e23 Revert "Editor: Make line spacing adjustable"
This does not work with text wrapping since there are multiple
QTextLines inside a block but we can not adjust the line hight inside a
block. This needs to be addressed inside Qt.

This reverts commit dc64f3207b.

Change-Id: If6c28056da9891eeeb75f5939a42f08360013a80
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-20 04:35:42 +00:00
David Schulz
a962a08b1a Editor: fix completion character completions
Cleanup the proposal after an item is activated even if the proposal
widget is not visible anymore. Otherwise we might wrongly cleanup a
proposal that was triggered by a completion character while a completion
list was already open.

Change-Id: Ie95247de09313c5816cffd9a865b05183db02354
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 15:56:47 +00:00
David Schulz
b0d4414dfc LanguageClient: pass id as a const ref when handling client messages
Change-Id: I7ab6a7517d4dd0fe66f601661e7b3f6a7afb338b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 15:56:31 +00:00
Christian Kandeler
f72c2b84f7 Unittest: Fix qbs build
The image test uses unexported classes from QmlDesigner. Let's just
remove it.

Change-Id: I42cae90d7333bf1ad7f75839c93eef773cb5fab8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 15:34:18 +00:00
Knud Dollereder
aaf564cab7 CurveEditor: Fix bounding rect computation for the graphicsscene
Task-number: QDS-2957
Change-Id: I0019d538e7460e923b35024bd02f7186e1935f6b
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-19 14:43:04 +00:00
Eike Ziller
b771f400de More change log for 4.14
Change-Id: I33de8128e19d530793f9af97f8eedb1ca03fec2a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-19 14:38:17 +00:00
Eike Ziller
f21d0b531f Fix github actions for Qt Creator plugin wizard
For Qt Creator 4.13
- rename directory to 'workflows'
- use MSVC 2019 for Qt
- fix Qt Creator platform names
- don't use GitHub's now deprected set-env

Fixes: QTCREATORBUG-24412
Change-Id: Ifdd3e95da74fef4ad9f65ae2c084ff82b2ca1972
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-19 13:48:56 +00:00
Eike Ziller
436f111a46 CMake build: Fix build of QmlDesigner
Follow-up of d1b0c12d6b

Change-Id: I04491e815f8a8220c3719ca6bfdbf6de3e30b527
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-19 13:07:07 +00:00
Christian Stenger
6c5eaed92c Utils: Fix matching wildcards to full paths
Fixes: QTCREATORBUG-24792
Change-Id: I82b4edea6260b07e1bdff065b157a4cd044ec629
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-19 13:02:00 +00:00
Henning Gruendl
9f6eb972b7 QmlDesigner: Fix reversed order on Navigator drop
Task-number: QDS-2910
Change-Id: Iab58b79b6f3cdb3f922824a7f608b633b019c9ae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-19 12:35:53 +00:00
Eike Ziller
4d39f2736f Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: If549dd1bc610704ece881c408cf44192dabed8b9
2020-10-19 14:10:51 +02:00
Robert Loehning
91fb438b94 Remove invisible translated strings
Change-Id: If03c1e5d160d375e3a8ecd2c534214e3c92ae918
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 10:01:04 +00:00
Cristian Adam
d7e24f28ba CMake Build: Fix missing pythonXY.zip on MSVC
Ammends 94b9b33a17

Change-Id: I531a648a108233fbefbe6878f65f8ab7186db39a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-19 09:45:04 +00:00
Christian Kandeler
3ff8c42431 ClangCodeModel: Use a configurable timeout in the tests
Change-Id: Ie3923217f79a72d2774aaa2a499144c3191cb478
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 08:18:14 +00:00
David Schulz
30f21bcf01 LanguageClient: Generate BaseMessage only once per send content
Change-Id: Ife4135dce924db83b8539035b4837ecee1403ad8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 08:16:13 +00:00
Christian Stenger
6c385365d5 QmlDesigner: Fix qbs build
Change-Id: Ia2671a5491b8f5dbc8e4b771c5fe2a080a76b863
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-19 07:53:39 +00:00
David Schulz
05ad4e3daa TextEditor: fix selection highlight
Also compare the anchor when looking for the selection. Otherwise we
might get a selection highlight that expands on adjacent extra
selections like code model warnings.

Change-Id: Ib8460c1089ed69d14b7a408ca70e7ac1f8642f6e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 04:16:13 +00:00
Lukasz Ornatek
80dda222e0 Automatic generation of Description & Display Condition tab
Task-number: QDS-2862
Change-Id: I367f336e84025b593e51faf282ad9c923cfeac54
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
2020-10-16 11:50:09 +00:00
Assam Boudjelthia
4946677df4 Android: fix aab label name and supported versions
Task-number: QTCREATORBUG-24681
Change-Id: I5634deaf395d547d2659d71d1612897e1a3d9a2b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-16 11:43:37 +00:00
Christian Kandeler
dd62254e4e QmakeProjectManager: Make "system" execution opt-in
It has too many side effects.
Amends fcd6384f4d.
T_SYSTEM and E_SYSTEM are now treated the same.

Fixes: QTCREATORBUG-24551
Change-Id: Ib6df2762d329f2ddc0dd66190454159d446a9ac9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-10-16 10:40:45 +00:00
Marco Bubke
d1b0c12d6b QmlDesigner: Add image cache
The image cache is saving images and icon of this images in a sqlite
database. If there are no images they are generated in the backgound.
The icons are fetched by item library.

Task-number: QDS-2782
Task-number: QDS-2783
Task-number: QDS-2858
Change-Id: I5a32cccfef7f8fd8eb78902605a09f5da18ce88e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-16 10:01:21 +00:00
Henning Gruendl
58e612c85f QmlDesigner: Sort items in FileResourceModel
* Sort items in FileResourceModel
* Add FileSystemWatcher on directory

Task-number: QDS-2919
Change-Id: I0ba50f03d4f901a48709ed0cc0e7f05d3037aeec
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-10-16 09:32:37 +00:00
hjk
5a97fa53dc Android: Aspectify AndroidDeployQtStep
Change-Id: Ibc2f04336831494c04a2283a59e1f550776c8bf3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-16 07:24:46 +00:00
hjk
5467faa0d7 Debugger: Use -file-symbol-file for core files with GDB
Task-number: QTCREATORBUG-24541
Change-Id: Ib6d070629f5a7d1505c272ce78f99dc14cd15fdc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-16 07:24:28 +00:00
Christian Stenger
d11aa98219 AutoTest: Prefer active target over further
If there are more than one target for a run configuration
we ended up in the first matching.
Tests may use different environments to test different things.
If the user tried to handle this by using a modified
environment for different targets failed even when the
correct target was selected.

Change-Id: Ie954c985969ffd187fe60b4ecb86aa2717d559f1
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-16 06:22:31 +00:00
Thomas Hartmann
4cb4bcec0f QmlDesigner: Fix recent regression
After calling differenceHandler.typeDiffers() the modeNode
can be invalid. We have to account for this.

Task-number: QDS-2954
Change-Id: I76e28dcd3f1a824802e60bf47b773f5b8cb3d15a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-15 18:20:02 +00:00
Thomas Hartmann
5edac46edb QmlDesigner: Fix UrlChooser
Change-Id: Ie5a6297cf29dd6e9a120293346431c497805a28e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-15 17:03:49 +00:00
Assam Boudjelthia
c121e48589 Account for qmake.bat script for Qt 6 targets
Qt 6 targets that are built with CMake have a qmake.bat instead
of qmake.exe, while they can be registered from the Qt installer
using QC's sdktool, it's not yet possible to select a new version
manually because the FileDialog selection offers only qmake*.exe.

Fixes: QTCREATORBUG-24721
Change-Id: I647be1e0fba2f306402b8dbed747e9614a4eb0ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-15 10:12:23 +00:00
Christian Kandeler
e7df6bba18 ClangTools: Further increase the test timeout
The clazy tool in particular can be exceedingly slow on Windows.
Increase the default timeout and also add a hook to set the timeout at
runtime via the environment.

Change-Id: I94c46ce03f8348fb239870df4d5627bf8d545307
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-15 07:54:19 +00:00
Christian Stenger
70851d371d QmlDesigner: Fix compile of tests
Change-Id: Idd2097a7e571d5891c3769102bb7b0ebd9264ac6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-15 05:55:39 +00:00
Marco Bubke
60567d385a QmlDesigner: Bind meta info cache to model
A global variable is not helping for multithreading and the cache has
anyway a 1:1 relationshit to the model.

Change-Id: Ic05f32744b70ef63aa5ae7d475afc0b5b17f2f09
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-14 17:00:31 +00:00
Marco Bubke
3e9e768b35 QmlDesigner: Bump the C++ version to 17 for the qml puppet too
Task-number: QTCREATORBUG-24684
Change-Id: I2502593d45f93b36162a4009cca238a83da2dc53
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-14 16:59:20 +00:00
Orgad Shaneh
e3ace00a43 Git: Deduplicate stderr output on commit
It appears while the process is running, then printed again when it's done.

Change-Id: I86737eccfcf34d82ccca1ec4b9a7f42fc66bf86c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-10-14 16:49:51 +00:00
Tim Jenssen
57e77ec449 qmlpreview: fix calling right localeIsoCode method
Also add some QTC_CHECK to get at least some warning
in case the functions are renamed in future.

Change-Id: Ie4e78855152e9946950603c95fa881755e850c62
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
(cherry picked from commit 165ccb828d)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-14 15:14:48 +00:00
Tim Jenssen
7cc478cfb1 Revert "QmlDesigner: Keep possible imports updated"
This reverts commit a9619b53f3

Reason for revert: broke stop puppet debugging feature

Change-Id: I88cf4ca7503a6bd7c3d8309cd7c3220428d07a20
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-14 12:17:08 +00:00
Christian Kandeler
76febea8ee QmakeProjectManager: Ensure consistent include path lists
... before and after a build.
The previous algorithm did not guarantee the same order, leading to
failure when analyzing an unbuilt project with clang-tidy/clazy.

Change-Id: I8a700408ca0c23b1b14b47ebfe334a41c52afa5b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-14 08:55:56 +00:00
Vikas Pachdha
6fe4f028a4 Designer: Relax type difference check on node sync
Task-number: QDS-2535
Change-Id: Ic762d40f9088d287db4d7c0c88bb7817b2bf6475
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-13 10:42:39 +00:00
Christian Kandeler
2e25e2859d CppTools: Fix test on Windows
Another CRLF issue.

Change-Id: I172bcef5beabf1c85eb3c0b66a1839c03a870f8c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-13 08:27:20 +00:00
Knud Dollereder
19f2d3a7a8 Enable touch-pad navigation
For the curve-editor, transition-editor and timeline
Renamed ruler-scaling-factor to zoom in order to not confuse it with
ruler-scale-factor

Change-Id: I099e8e9a1e6092c9abb0a1a935fb8510aa90d5e4
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 16:39:04 +00:00
Henning Gruendl
4ba6c7988e QmlDesigner: Icon visibility in navigator
Show alias, visibility and lock icons in the navigator only when either
checked or hovered.

Task-number: QDS-2785
Change-Id: I1eca1b9f44cfbdd839daa64849156e1c9ffa4acd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 15:25:06 +00:00
Henning Gruendl
2860e57112 QmlDesigner: Add lock functionality to navigator
* Update icon font and change related theme and constants files
* Add locked column to Navigator
* Add auxiliary property "locked"
* Integrate locked feature into the following components:
  * Transition Editor
  * Connection Editor
  * Form Editor
  * Text Editor
  * Timeline
  * Navigator
  * State Editor

Task-number: QDS-826
Change-Id: Ibf3ae96e0d5daeb1ab00279b94df5aaabe75e0bb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 15:24:55 +00:00