Commit Graph

67787 Commits

Author SHA1 Message Date
Henning Gruendl
447171400b ADS: Adapt Essentials preset layout
Adapt Essentials preset layout so it will look like before ADS was
introduced.

Change-Id: I08ea0cbac41f2de53a3c62c032494e219963bada
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-05 13:08:12 +00:00
Tobias Hunger
e5f4cfbeb8 CMake: Do not default to CodeBlocks extra generator
Now that CMake without server-mode or file-api are no longer
supported in Qt Creator, there is no more need to push for the
CodeBlocks extra generator which was required for the
"tealeaf" reader only.

Change-Id: Iec280d960b9f50ee6f9b954ecc532745a62213f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-03-05 12:50:18 +00:00
Christian Kandeler
ae0d2bd1ac QmakeProjectManager: Try harder not to access nodes of in-parse project
For extra safety, do not touch the project nodes if any build system of
any build configuration is currently parsing.
This is a bit of a stab in the dark, as I cannot reproduce the crash
described in the linked bug report.

Task-number: QTCREATORBUG-23597
Change-Id: Ie62a94232e89d8fba5866ea3572535e2ab209924
Reviewed-by: hjk <hjk@qt.io>
2020-03-05 12:40:47 +00:00
Henning Gruendl
5683f2df85 ADS: Cleanup workspace manager workflow
- Add workspace presets
- Add reset button to workspace manager
- Fix last workspace settings save/restore
- Move functionality from DesignModeWidget to DockManager
- Remove factory default workspace
- Cleanup a few if statements

Task-number: QDS-1699
Change-Id: I282dd6162a5a36041f8cd2aacd7407750d54cc22
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-05 11:12:51 +00:00
Mahmoud Badri
fb843d3442 QmlDesigner: Remove the standalone view3D window implementation
Task-number: QDS-1692
Change-Id: I6c04aaee9ab6a119cfcc22ee2e19b808bb95ae0a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-03-05 11:00:11 +00:00
Aleksei German
5b8fe22337 QmlDesigner: ColorEditor Fix and Tooltips
- Fixed an issue with not-clickable recent color button
 - Added tooltips with color hexes for recent and original colors

Change-Id: I21c2e4c98005b473a3450606eb27428977578bdc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-05 10:33:16 +00:00
Miikka Heikkinen
eadbce7b80 QmlDesigner: Fix 5.15 build
QtQuick3D Type API changes broke build.

Change-Id: Ibbd7fc3f699875b24f6345dfca66c5f442915544
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-05 09:51:41 +00:00
Orgad Shaneh
4dcc480865 Merge remote-tracking branch 'origin/4.12'
Change-Id: I5de0b3e1940998d4aca79b1698ef408ae4d43e69
2020-03-05 11:32:27 +02:00
Leena Miettinen
eea835eab0 Doc: Add a section about finding and filtering output
The standard "find in file" functionality is now used, so
link to it. For filtering, describe the options.

Change-Id: I379d23fbc35ebfbbfef1d6fa3007af5b9d7f23b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-05 09:14:34 +00:00
Leena Miettinen
ae1a4250e1 Doc: Describe integration with Qt Marketplace
There is now a Marketplace tab in the Welcome mode.

Task-number: QTCREATORBUG-23452
Change-Id: I8043adb3104d542b63d5963261e92d7044222204
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-05 09:05:00 +00:00
Eike Ziller
abd4d68696 Merge remote-tracking branch 'origin/4.11' into 4.12
Change-Id: I00ccdc2c79176799fe9d20ecfe42c260796d7d97
2020-03-05 09:36:40 +01:00
Tobias Hunger
8e47fc18a6 CMake: Pick Ninja generator when installer added ninja
Pick the Ninja CMake generator when the installer has installed
the ninja binary.

Task-number: QTCREATORBUG-23650
Change-Id: I966b369513e7d489161b210819832f1bbbb5a0fc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-05 08:31:46 +00:00
Eike Ziller
d2759075de TextEditor: Do not overwrite existing indenters
In 6959618d7b a default indenter was set
on all text editor factories.
Unfortunately some editors, like the C++ editor, set their indenter in
the text document constructor, which would then be overridden by this
default indenter.
For now remove the default indenter again until this is better thought
through.

Partially reverts 6959618d7b.

Change-Id: I8f32e92438883edb6be853fa838b75297347a937
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
v4.12.0-beta1
2020-03-05 07:14:40 +00:00
Eike Ziller
7a3f5edfaf Locator: Use QJSEngine for script locator filter
QJSEngine is interruptible since Qt 5.14. Make that the requirement for
the script locator filter and remove (optional) dependency on QtScript.

Change-Id: I3d6df04571441ddf152a213f0053c46e3cb317fa
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-04 14:04:41 +00:00
Christian Kandeler
103ab51f70 CompilationDatabaseProjectManager: Fix autotest
Amends 45d42d4518.

Change-Id: I7404bbc782278d09b419906a0d74f29d66c3867b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-04 13:59:37 +00:00
Christian Stenger
a82f707ee5 QmlJS: Fix up compile fix
Amends 33b091bd40.

Change-Id: I26d98bae8a074f7c3515b46994afd5548e2ca82f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-03-04 10:15:16 +00:00
Aleksei German
103a602f8d QmlDesigner: Auxiliary data auto-fold
- Made TextEditorWidget::restoreState() virtual
 - Added function to fold qml Auxiliary Data
 - Extended settings page to fit the new option

Task: QDS-1667
Change-Id: Id1256fcc72a67ac822888d5fd2e23d6076349573
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-04 08:43:46 +00:00
Christian Stenger
33b091bd40 QmlJS: Fix compile
..in general, with tests, and when using a namespaced Qt.
Amends b09a48599e.

Change-Id: I99e275e10df5eed741d021911a360457f0d0d2e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-04 08:22:12 +00:00
Orgad Shaneh
37abf3beb5 GitEditor: Fix order of arguments
Oops!

Amends commit b52ffa2501.

Change-Id: Icec6b569c69ae4baf227f6510b45d596c5969ce8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-03-04 07:25:26 +00:00
Eike Ziller
995ba78fae Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/cmakeprojectmanager/tealeafreader.cpp
	src/plugins/cmakeprojectmanager/tealeafreader.h
	src/plugins/projectexplorer/miniprojecttargetselector.cpp

Change-Id: I88d85be3903f57a55fddb7901e771a4822db1b85
2020-03-04 08:15:50 +01:00
Eike Ziller
6959618d7b TextEditor: Use simple text indentation as default
Simple indentation based on the previous line was already available in
the NormalIndenter class. Merge that up the hierarchy chain into
TextIndenter which is the base for other text-based indenters, and make
that the default indenter for text editor factories.

Text editor factories that don't have a special indenter get at least
basic indentation support for free that way.

Change-Id: Ib977a990f10a99bead82bc8a8348c02a106665f1
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-04 06:55:37 +00:00
Miikka Heikkinen
a77ef4ca7f QmlDesigner: Port Edit 3D View to 5.15
Qt 5.15.0 is now the minimum version to enable Edit 3D view.

Change-Id: I15cee59e6a7665477825caa0ae412fc6ac7b570a
Fixes: QDS-1694
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-04 06:27:45 +00:00
Robert Loehning
59560fb817 Core: Translate "on" and "off"
Change-Id: Idcd1e1c16c188eeff1f6d43a69d2c31b3300a652
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-03-03 18:36:55 +00:00
Orgad Shaneh
e4dab6b83e QmlJS: Fix compiler warning and add a missing include
qmljsdiagnosticmessage_p.h: In static member function ‘static QmlJS::Severity::Enum QmlJS::DiagnosticMessage::qtMsgTypeToKind(QtMsgType)’:
qmljsdiagnosticmessage_p.h:72:5: warning: control reaches end of non-void function [-Wreturn-type]
   72 |     }
      |     ^

Change-Id: I2183199bf257453e0af2998b739fae8c90f5c098
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-03-03 17:28:52 +00:00
Orgad Shaneh
989eb36012 QmlJS: Fix Qbs/CMake build
Change-Id: I27b4e2024ad1cddafea7ca7be5eb3055d34bf297
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-03 17:05:17 +00:00
Tim Jenssen
e935291c85 QmlDesigner: Use ActionManager in FormEditor
We assign an ICore context to the FormEditorWidget and
associate it with a Context (C_QMLFORMEDITOR).
This guarantees that the action are only active when
the FormEditorWidget has focus.
The actions are then registered as Commands. The shortcuts are set on the
command and are configurable in the options of Qt Creator.

Task-number: QDS-1712
Change-Id: I327f35736205c9337386cf70e6f058d4b19be50e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:15:38 +00:00
Thomas Hartmann
4f55b9a0fa QmlDesigner: Do not allow keywords as properties in annotations
Otherwise we get a syntax error.

Change-Id: Id69be9ef0426dae64c461f21dda14eca340f720d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:09:55 +00:00
Thomas Hartmann
4d04eecc5e QmlDesigner: Set override size for FlowView
If the root item is a flow view we need a canvas
for the FlowItems.

Change-Id: I611b5ee690eff499e60fbed15615b4e1e8de19e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:09:27 +00:00
Thomas Hartmann
49b90dfb3a QmlDesigner: Fix copy and paste for FlowAction
Task-number: QDS-1708
Change-Id: I229bea5f2b35cf07a59e4f7bb67772e7a96ebc88
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:07:51 +00:00
Tobias Hunger
699d1b974c QmlPuppet: Initialize InputEventType
Change-Id: Ic0871aff4658a388f803a90abd722f34a522c68c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:05:35 +00:00
Tobias Hunger
f78e7e3f60 ADS: Properly initialize FloatingWidgetTitleBar
Change-Id: Ibc430d45b833fbd5d99cdccaf43dfe06cccb17a4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:05:14 +00:00
Tobias Hunger
5c91b630b4 ADS: Remove struct from FloatingWidgetTitleBar
We do not use struct in Qt Creator.

Change-Id: I1fda8f68520e77b46209890f1355facc723f351e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:04:54 +00:00
Tobias Hunger
d13efc6c72 QmlDesigner: Properly initialize QActions in Edit3DView
Change-Id: Iaa3f70192c808c272646f782d5d83c80583ad6d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:04:35 +00:00
Tobias Hunger
9e03dfe46c ADS: Initialize all members of DockAreaTitleBar
Change-Id: I1e5002f42d105b7cc17f1ebcc01ba38f65d489d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:04:12 +00:00
Tobias Hunger
3eba1fd302 ADS: Remove struct from DockAreaTitleBar
We do not use struct in Qt Creator.

Change-Id: Ieb5f9f4514a8220fa1d2a616baf2c8ef69d4a2c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:03:54 +00:00
Tobias Hunger
63f74ca573 ADS: Properly initialize DockWidgetTab
Change-Id: Iea920eb8fa958d1590c2d7ec8e2b7d7a1ae69837
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:03:30 +00:00
Tobias Hunger
d09c92ccee ADS: Remove struct from DockWidgetTab
We do not use struct in Qt Creator.

Change-Id: I299effff6a7e6b79494be9a9e2dece1d6492714a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:03:06 +00:00
Tobias Hunger
ce6b5b37e0 ADS: Properly initialize DropAreaTabBar
Change-Id: I1f1163cb8c2b005844fc8d689cfa616595e7a672
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:02:39 +00:00
Tobias Hunger
95d5a07de7 ADS: Remove struct from DockAreaTabBar
We do not use struct in Qt Creator.

Change-Id: Id9abb6f3a5a4f4406fbefa24735e5f7e1215eeb4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:02:18 +00:00
Tobias Hunger
b5ba4dcb16 ADS: Properly initialize DockManager
Change-Id: I2728c6d7dd6db736be14efc71a5ab62efc40d6ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:01:53 +00:00
Tobias Hunger
95182dc6b9 ADS: Remove struct from DockManager
We do not use struct in Qt Creator.

Change-Id: I7755d66bc7b77825ab17ed333b23cbe36e52ff72
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 16:00:50 +00:00
Tobias Hunger
2642f8537d ADS: Properly initialize DockOverlay
Change-Id: I3aa43624617858858cd6b27ead506c299d0c0a47
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 15:59:49 +00:00
Tobias Hunger
5fe479002a ADS: Remove struct from DockOverlay
We do not use struct on Qt Creator.

Change-Id: I61597081ecdcbc8fcfdc3c0317f83976b268cb7d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 15:59:16 +00:00
Tobias Hunger
437f49504c ADS: Add initialization and remove dead code from FloatingDragPreview
Change-Id: Ia9116581728de5dad8ef263597bc6bc30216e14f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 15:58:39 +00:00
Tim Jenssen
1b32f54d4e ADS: Remove struct from FloatingDragPreview
Change-Id: Ib254b9eff1a2a5bd6951d5c9c59c9290664c2c89
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 15:56:13 +00:00
Tim Jenssen
805cc24bec ADS: DockManager: Handle potential read errors for XML data
Change-Id: I63f6dee64a26abb4f5102faad2b914b844847f14
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 15:53:39 +00:00
Tobias Hunger
86f3b518f5 ADS: Initialize all members in FloatingDockContainer
Change-Id: I41cb9095e7b888e5ed50729dee1ea865351348e6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 15:48:26 +00:00
Fawzi Mohamed
b09a48599e Update qmljs parser to Qt 5.15 parser
* parser side support for annotations, inline components, new UiVersion
  and all the things included in QT 5.15 parser
* SourceLocation moved from QmlJS:AST to QmlJS
* Visitors now need to handle throwRecursionDepthError
* BaseVisitor for visitors that want to override all visit

Task-number: QTCREATORBUG-23591
Change-Id: I682a30d0b08b6c929739fd0e339ef6fbde3eb630
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-03 15:31:10 +00:00
Tobias Hunger
a24dead5f6 ADS: Remove struct from FloatingDockContainer
We do not use structs in Qt Creator.

Change-Id: I179013eb40f6fd2a836b49f40c6ee17b5f0ce6d7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 15:12:01 +00:00
Tobias Hunger
bc64318e31 QmlDesigner: Remove dead code
Change-Id: Ia9db826ff5237755b2794a1ebee8df2a7bedace6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 15:02:21 +00:00