Commit Graph

47434 Commits

Author SHA1 Message Date
Christian Kandeler
a8a6a9e774 ProjectExplorer: Make project window state persistent
Task-number: QTCREATORBUG-24690
Change-Id: Ia261fc5a98681676e8d67e6d840f2f48073cdbb2
Reviewed-by: hjk <hjk@qt.io>
2020-10-26 13:54:04 +00:00
Henning Gruendl
2c65e2323c QmlDesigner: Fix delegateMargin not used warning
Change-Id: I981607f68cad9a55e3d8f4b43e33eb14db515c47
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 12:45:31 +00:00
Eike Ziller
96f6bd53b9 Merge remote-tracking branch 'origin/4.14' into master
Change-Id: Ic5e99ec54e2cedbabd78eabc2f0350f90daa0cec
2020-10-26 12:13:49 +01:00
Henning Gruendl
15db0bb173 QmlDesigner: Rework SpinBox dragging functionality
* Replace DragHandler with MouseArea due to the DragHandler not being
  able to accept MouseEvents
* Replace TapHandler with MouseArea due to MouseArea stealing press
  signals from TapHandler, but needed to get press events due to
  removal of DragHandler
* Add functionality to keep cursor in place while dragging
* Keep ActionIndicator visible while dragging
* Fix qsTr in RectangleSpecifics

Change-Id: I6558623287e1864359128d4194c9db78736ee3a4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 10:37:47 +00:00
Henning Gruendl
fcb3fabd13 QmlDesigner: Update look and feel of navigator
Task-number: QDS-2880
Change-Id: I5e54e6c35afe8bd0149f35486ac308ce0ea0d59a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 10:37:35 +00:00
Marco Bubke
553929f322 QmlDesigner: Ensure that cache directory exists
We write data to the cache directory and it is easier to ensure it at
the initialization of the plugin than in multiple different places.

Change-Id: I2b6e5d607e1b28b13ee4968842d21d4dad7aaf15
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 09:51:56 +00:00
Mahmoud Badri
98d7b5b6e5 QmlDesigner: Optimize deleting nodes
- remove unnecessary call to directSubModelNodes()
- replace foreach with for (avoid unnecessary copies)

Change-Id: I42721a4c4e69f320664af8364f8baa0df0d11459
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 09:38:11 +00:00
Mahmoud Badri
4a3bd72db8 QmlDesigner: Fix duplicate locked item entries
Fix: When selecting more than 1 ancestor of a locked item and pressing
Delete, the locked item will appear duplicate in the warning message
box as many times as the number of selected ancestors.

Change-Id: I72c5e35edb2974da3d630a87e236b58e0d7e8ab3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 09:37:53 +00:00
Christian Kandeler
cc4bd3b738 TextEditor: Add "F1" hint to tooltip if and only if help is available
Note that this does not have performance implications, as we already
call HelpItem::isValid() in the same code path.

Fixes: QTCREATORBUG-24782
Change-Id: I8495099c97233e4df4b8d2a30579fb6324122e92
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-26 09:15:48 +00:00
Eike Ziller
5e67bc5055 Fix build with Qt6
Add missing includes for "incomplete type" issues.
Remove usage of QDesktopWidget.
Don't compile native WebKit help backend (missing native widget integration).
Add SvgWidget dependency.

Task-number: QTCREATORBUG-24098
Change-Id: I1b3afb54d385940ff283824870fa7454866212a4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-26 08:44:21 +00:00
Assam Boudjelthia
62e84f129a Android: fix "uninstall app first" checkbox placement
Change-Id: I2f79e9a5c344e5364fa377422f682f8e0c2927e2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-26 07:13:30 +00:00
David Schulz
859d2edbb5 TextEditor: Always destroy old context when displaying new proposal
This makes sure that the old proposal widget is disconnected from the
finalizeProposal slot and thus prevents resetting the currently shown
proposal.

Change-Id: I80d58d9a04831d464bea69697568359990ac5260
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-26 05:00:49 +00:00
Kai Koehne
4d8cd5fa03 Welcome screen: Add "Get Qt" link
Change-Id: Ic3a6210a0b1600ae308bbdb43f0c50fc72d910e8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-25 08:47:07 +00:00
Vikas Pachdha
8848eb7d7e AssetExport: Use QFontInfo for font properties
Task-number: QDS-2867
Change-Id: I7a5d622f4f43cc8a73e29950616595a314bb6ffc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-23 12:01:21 +00:00
Christian Kandeler
f515672ffd CppEditor: Offer class-level quickfixes also when clicking "in class"
That is, allow the cursor to on some "neutral" place in the body of the
declaration, not only strictly on the class name.

Fixes: QTCREATORBUG-15699
Change-Id: I74ad6048c16c19d418446c990178535d878fc630
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-23 10:27:49 +00:00
Mahmoud Badri
2bf40dddfd QmlDesigner: Fix copy / paste bug
Fix a bug in calculating the scatter value when pasting an object. Also
some tweaks and clean ups in the same file.

Fixes: QDS-2982
Change-Id: Ic2847d03ccf03d188c5fbca2cd14bc74b9d20223
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-23 08:40:41 +00:00
Christian Kandeler
c2913f65e4 QbsProjectManager: Do not cache incomplete environment
Retrieving the run environment for a qbs product can fail if the qbs
session is busy at the time of the call. In such a case, caching the
result will cause subsequent accesses to retrieve an incomplete
environment. This patch fixes the latter problem.

Task-number: QTCREATORBUG-24599
Change-Id: Ia0c6831cf371995ac8399d15e4dd93b8bb6e4f3b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-10-23 07:21:25 +00:00
Thomas Hartmann
98a649ccfd Fix crash for missing BuildSystem
There is no gurantee that a Target has a BuildSystem.
Target::additionalData() does expect a BuildSystem.

Task-number: QTCREATORBUG-24817
Change-Id: I41edf89fa6dbf6ed24a27129b8353a9506b7b176
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-22 13:34:09 +00:00
Orgad Shaneh
b1cd859219 VcsManager: Fix adding files to VCS from locator
The files are listed by file name without path, so git add was executed
from the user's working directory instead of the target directory.

Amends commit 48c56416f5.

Change-Id: Iba7c5ff33378265d3c22479d7abb6ccf8db75d07
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-10-22 12:59:01 +00:00
Robert Loehning
89d36b418a Make Help mode Squish-testable again
Change-Id: I09bcdb63c44c4728cce63d5a5c2b29bf9fc96ac1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-22 12:44:54 +00:00
The Qt Project
ffb5a3977f Merge "Merge remote-tracking branch 'origin/4.14' into master" 2020-10-22 12:43:04 +00:00
Christian Kandeler
5a8501ffaf CppEditor: Fix over-eager undo
We must not call QTextDocument::joinPreviousEditBlock() unless the
symbol name was actually edited, i.e. key presses that don't change the
content do not count. Otherwise, QTextDocument will merge the renaming
action with the previous change to the document in its undo stack.

Fixes: QTCREATORBUG-16350
Change-Id: Ie5a3a6a2f5a15caa038bf111673d4c32077fe4ba
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-22 12:40:33 +00:00
Eike Ziller
9c6108afd1 Merge remote-tracking branch 'origin/4.14' into master
Change-Id: Ib4363db8e71488e1d13e8c1012023abfaf06286b
2020-10-22 14:38:01 +02:00
Christian Kandeler
baf25e4cdb ClangCodeModel: Do not ignore highlighting for raw string literals
Also add the special handling for prefix and suffix like in CppHighlighter,
as not to re-introduce QTCREATORBUG-19119.

Fixes: QTCREATORBUG-16183
Change-Id: Ie264946782220a8e5a862c1d4550bcd49bc2349f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-22 09:48:02 +00:00
Christian Stenger
860eeca6c5 QMakePM: Restore old system() handling to old behavior
Parsing qmake based projects without execution of system()
may lead to inexact parse result and can end up with unusable
projects.
Amends dd62254.

Change-Id: I7300a810c82959aab159d2492b4020998d26de38
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-22 08:27:17 +00:00
Henning Gruendl
73a26c0039 QmlDesigner: Update icon font
* Add pin and unpin icons

Change-Id: I42773d3f86f68d9bc638fa27500fb0b1b4e5d35d
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-22 06:46:57 +00:00
Christian Stenger
c9d2a8d69e AutoTest: Support QTest::addRow as well
Fixes: QTCREATORBUG-24777
Change-Id: I33ac86a226036855a304b71e2e7ebfe8884d8dc3
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-21 10:16:04 +00:00
Christian Kandeler
135e76f965 CppEditor: Offer InsertDefsOperation quickfix for all classes
The check whether there are unimplemented member functions takes quite
long, so Creator would freeze for several seconds when right-clicking on
the name of even a medium-sized class.
Therefore, we offer the operation for all classes with member functions
and move the expensive check into the perform() method.

Change-Id: Ie19958ba8c53493be859f9982d7d5697e6e9d88b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 08:19:25 +00:00
Eike Ziller
dbb6201605 Merge remote-tracking branch 'origin/4.14' into master
Change-Id: Id7ad82997873da828456a15c441620d93c6fc7e7
2020-10-21 09:31:01 +02:00
Eike Ziller
cc6f35016a Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: I6aa2cb51dcbb4d76238a2ed8603bf57a35ee4fd6
2020-10-21 09:10:50 +02:00
David Schulz
0ca9ea353c Editor: Do not use disabled code color for right margin highlight
Fixes: QTCREATORBUG-17174
Change-Id: I68729d5a44b23fe46b810054a1dc472ffd63e272
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-21 04:32:27 +00:00
Miikka Heikkinen
6b8d8e414a QmlDesigner: Port 3D edit view to Qt6
Task-number: QDS-2899
Change-Id: Iedbe5e8561e5ab71ef32922e69da43cd3cc57e90
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-20 14:55:43 +00:00
Christian Kandeler
2b5e1ea62e CppEditor: Fix some "convert to camel case" edge cases
Fixes: QTCREATORBUG-16560
Change-Id: I8573ae6c5dce0956c868addc69a921c62f1d571a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-20 13:27:54 +00:00
Christian Kandeler
526579b09d TextEditor: Support highlighter results that cross block boundaries
This is needed to properly highlight raw string literals.

Task-number: QTCREATORBUG-16183
Change-Id: I00c59a26891bd339b58cc515041d237e496d6068
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-20 13:08:08 +00:00
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
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
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
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
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
80951d3e59 Merge remote-tracking branch 'origin/4.14' into master
Conflicts:
	src/plugins/cppeditor/cppquickfix_test.cpp

Change-Id: Ib2984a3b3d9d071d11304b6cf132c2f8cef77e1c
2020-10-19 15:22:37 +02: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
Alessandro Portale
af0e135e73 Utils: Improve InfoBar border
Replace 80s 3d frame with a slim separator line.

Task-number: QTCREATORBUG-23176
Change-Id: If50d35f500323bf4b963cb2222b5f947a307a5bc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-10-19 10:44:44 +00: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