Commit Graph

67787 Commits

Author SHA1 Message Date
Yuya Nishihara
a112f02975 EmacsKeys: Replace U+2029 with LF when copying text to clipboard
Otherwise '\n' would be represented as U+2029 in clipboard, which is
useless.

Some of the cursor.selectedText() calls could be replaced with
QPlainTextEdit::copy(), which is backed by createMimeDataFromSelection(),
but there's a slight behavior difference such as EmacsKeysPlugin::copy()
does clear the selection. So I think it's better to consistently use the
lower-layer function.

Change-Id: Ida06b0c250774d80fb729224fd9492a35ea59b7d
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-22 10:46:30 +00:00
Tobias Hunger
f51f3c897e CMake: Do not crash without a supported CMake
Do not crash when a CMake < 3.7 (no server-mode and no file-api) is
used.

Change-Id: I72a4ce6bb81d4fcf3d59508c72e46f422a8a00c0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-22 10:38:27 +00:00
hjk
7d3c6f7c02 Android: Start lldb-server and attach
Change-Id: Id7c45d9161d3389e9de419835c312d87916a34bc
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-22 08:12:48 +00:00
hjk
0603eb925f Debugger: Work around deprecated QProcess::start(command)
Change-Id: I30d9656fb9a73399fb79b7a6e956ee0e6f0ab6a1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-22 07:52:43 +00:00
Christian Kandeler
f4c9c8e07a QtSupport: Work around OpenBSD's idiosyncratic naming scheme
Fixes: QTCREATORBUG-23818
Change-Id: I0b2ec8621224dbfbe1a1e2c5990a9c168573dc8e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-22 07:42:13 +00:00
Christian Kandeler
c7ce2fb2b2 ProjectExplorer: Support bulk removal of files in project tree
Find files with the same base name and offer the user to remove these as
well, like we already do for the renaming action.

Fixes: QTCREATORBUG-23869
Change-Id: Ibaa068e6e4d21b884e14c4ad1e95ec14b6e5e036
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-22 07:38:06 +00:00
Christian Kandeler
4353084f92 ProjectExplorer: Factor out code for finding file nodes
... with the same base file name. We want to re-use this functionality
in a follow-up patch.

Change-Id: Ia9b5b3f003406c7451d59801c49679d9575d1222
Reviewed-by: hjk <hjk@qt.io>
2020-04-22 07:37:25 +00:00
Tim Jenssen
dda945355f Merge remote-tracking branch 'origin/4.12' into qds-1.59
Change-Id: I39a979aba39c735ab6885808b6371e5c8c02d37b
2020-04-22 09:32:07 +02:00
Leena Miettinen
677fdb78c1 Doc: Fix references to projects-related UI strings
We now have a "Projects mode" and "Projects view",
but "Build & Run" options category.

Change-Id: I5bf1829cb3f9bd47bbbf06c5898e3efd417cb796
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-22 07:28:53 +00:00
Leena Miettinen
f21f7e97fc Doc: Move information about using Form Editor to separate topic
Rewrite information about the Qt Quick Editor to take new
workspace concept and 3D editor into account.

Task-number: QTCREATORBUG-23364
Change-Id: I053685b5e603ad75af3f7314c30e627fac5c6207
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-22 07:12:30 +00:00
Denis Shienkov
7c63a13460 Debugger: Fix warning about unexpected UVSC engine state changes
Change-Id: Iec3aba57b875222429564637e0cb7735e286e341
Reviewed-by: hjk <hjk@qt.io>
2020-04-22 07:05:30 +00:00
hjk
6285696091 AutoTest: Add a itestframework.cpp
To get a few things out-of-line in itestframework.h.

Change-Id: Iae6f702b789c98b17a4d255008736377030e3b6c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-22 05:46:44 +00:00
hjk
90fd6870c5 AutoTest: Simplify QuickTestTreeItem::markForRemovalRecursively()
Change-Id: I3ab1876aa2d4dc04b9b5d53f373751e0f5241e75
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-22 05:27:26 +00:00
hjk
c22c1d96a5 ProjectExplorer: Avoid warning on unused variable
Change-Id: Ia99067c56414aba8c2e9aa647c6322e5e819bb88
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-21 15:24:06 +00:00
Tobias Hunger
69b0a2cafc PathChooser: Allow for chooser-only selection of files/directories
Makes the line edit disabled and read-only in that case.
We also need to change the custom context menu from the line edit to the
path chooser itself, because disabled widgets do not show a context
menu, but we still want to see the select & copy, and the special
items for opening explorer or terminal.

Task-number: QTCREATORBUG-23798
Change-Id: Ib653b4eaaedfbe54c614377795ddc52d21ac12c0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-04-21 13:18:43 +00:00
Eike Ziller
5838b40c6d Enforce PWD in the environment of build steps
In the shell PWD can be different from the "real" working directory,
because the latter never contains symbolic links (getcwd).
E.g. Clang uses PWD as the basis for debug information.

Fixes: QTCREATORBUG-23788
Change-Id: I19f06dcfded5ccca2dc0162a3a543cdc756bffb0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-21 12:31:22 +00:00
Thomas Hartmann
10fece1795 QmlDesigner: Fix QmlFlowTargetNode::assignTargetItem()
The condition was simply wrong.

Change-Id: I3229be91636de6d4bd6a8665b16ece2ed670ec73
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
v4.12.0
2020-04-21 11:07:50 +00:00
Thomas Hartmann
38bfdd86e3 QmlDesigner: Add helper functions to remove transitions
Change-Id: I33c972f9080b5c344e07c3f910e0a36fa981063b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 11:05:06 +00:00
Thomas Hartmann
6b6b844020 QmlDesigner: Add QmlFlowTargetNode::isFlowEditorTarget()
Change-Id: Ieacd59baa5b99bed4def6001de88c43545d0e309
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 11:03:37 +00:00
Thomas Hartmann
8262fdf5f9 QmlDesigner: Fix QmlFlowTargetNode::assignTargetItem
FlowDecision can have multiple targets. No reason to delete existing ones.

Change-Id: Ifdc42234c132ce5e0e212e1b3803a7ddcc25c27d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-21 11:01:34 +00:00
Thomas Hartmann
88a76df3d9 QmlDesigner: Finish FlowDecision support
Change-Id: Ic4e10fa442ea684890cfb79285760bc38991b494
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 11:00:11 +00:00
Thomas Hartmann
543efebc53 QmlDesigner: Fix updates in FormEditor
Some updates when auxiliaryDataChanged were missing.

Change-Id: I73146d10b80e8905f073332b727ef809bcf4a471
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:58:11 +00:00
Thomas Hartmann
75e6d4402c QmlDesigner: Expose all states to property editor
Change-Id: I9b89a9f8a8ed23c18ef5421a4380e90a484ae097
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:57:58 +00:00
Thomas Hartmann
b39edea495 QmlDesigner: Add QmlObjectNode::allStateNames()
Change-Id: Icc6a7404f4437411189465cb71e8bc3543b68d23
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:57:45 +00:00
Thomas Hartmann
3caafb2b81 QmlDesigner: Inspect components for existing states
For each created items we retrieve a list of the names
of all existing states.

Task-number: QDS-1978
Change-Id: I8e85e439fce3c6204cb8bcf69f6be847cc8dae5c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:57:26 +00:00
Thomas Hartmann
dbccc57597 QmlDesigner: Support different transition targets
FlowDecision and FlowWildcard can now be connected.

Change-Id: Iee7f38a23ba2c12d2843996eca46ff31f66af5a4
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:56:38 +00:00
Thomas Hartmann
8b8a99cda7 QmlDesigner: Add QmlFlowTargetNode
QmlFlowTargetNode allows to abstract different types
of transition targets.

Change-Id: I222992389a00237d3f51026f8b0fc8ab82da5028
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 10:56:14 +00:00
Leena Miettinen
6c8c501d6b Doc: Update screenshot of kit debugger options
To use the Design theme.

Change-Id: I2b25bc7d3baf51b3430b0aaff848a2be8e180540
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-21 10:49:42 +00:00
Tobias Hunger
2e8cb8c901 BuildSystem: Make qml2puppet build with CMake
Change-Id: I2e6dbb253a9e5b2c69c9578b0c10d830186090e0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-04-21 10:38:53 +00:00
Henning Gruendl
07f8c1d0f3 QmlDesigner: Add padding for QtQuick positioner
Add PaddingSection for Column, Row, Flow and Grid positioner in
PropertyEditor.

Task-number: QDS-1501
Change-Id: Icd7b6ed2ab371e3a821e725668ca0c9c63d1c1c9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-21 10:38:10 +00:00
Tobias Hunger
9b78b9f766 CMake: Fix WS in cmaketool.cpp
Change-Id: Iffd3a7b8f53989c6756acb084e00543eba6d564c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-04-21 10:13:23 +00:00
Orgad Shaneh
4e66cd0770 Git: Support diff against a selected commit
Change-Id: Ibb4287bf00f1d0c3212630d60e59ab80b600a879
Reviewed-by: hjk <hjk@qt.io>
2020-04-21 10:06:44 +00:00
Robert Loehning
fd17810e82 Squish: Don't use negative y-position for QMouseEvent
Change-Id: Ib453b41e5906ddf24228b92f8c904b39eea4526f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-21 10:04:35 +00:00
Robert Loehning
7c95e17436 Make WidgetTips Squish-testable
Change-Id: I337fdca3541c5b2fb8f09ab2d7721b8950c0bea9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-21 10:01:01 +00:00
Thomas Hartmann
8c7a06efd5 QmlDesigner: Set the same style on both GraphicsViews
The timeline uses two GraphicsViews on the same scene.
To avoid glitches the styles have to match exactly.

Task-number: QDS-1977
Change-Id: Iac31e1773425feb2e2a63cdb5ff16ae266addc92
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:47:56 +00:00
Henning Gruendl
04265b2651 QmlDesigner: Fix workspace list update on clone
Adds a missing emit of workspaceListChanged when cloning a workspace in
the workspace manager. It will fix a missing update of the workspace
ComboBox in the toolbar.

Change-Id: Ic2eb3fe516841ba13456c7d94fe699518988ff7a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:45:08 +00:00
Thomas Hartmann
74ffff63eb QmlDesigner: Allow setting state property
This has to be blocked only for the root item.

Task-number: QDS-1979
Change-Id: Ia05255468623fe715e3f7172e2f058a70629b783
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:43:11 +00:00
Thomas Hartmann
0c94ab724a QmlDesigner: Map "base state" to empty string
The name of the "base sate" is "".

Change-Id: Ic1474a33e7cc98dd7f8980673599c4b7f0f8ecd0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:41:28 +00:00
Thomas Hartmann
970f075e33 QmlDesigner: Show proper error message for component
If a component cannot be created we have to show a proper
error message.

Task-number: QDS-1980
Change-Id: I48a6ff0fd89c9666328c501abb00dc0997171d96
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:41:12 +00:00
Thomas Hartmann
d8e986abca QmlDesigner: Add helper functions to BindingProperty
Change-Id: I5ec122a03e6d1476246e579ef0776bb8261e8364
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:40:58 +00:00
Thomas Hartmann
769db413b8 QmlDesigner: Fix BindingProperty::addModelNodeToArray
Change-Id: I140fecf4895005f8d860efae72242ef70cfe4bde
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 09:40:45 +00:00
The Qt Project
c49b9c9a21 Merge "Merge remote-tracking branch 'origin/4.12'" 2020-04-21 07:49:17 +00:00
Eike Ziller
4fcfb7aea6 Merge remote-tracking branch 'origin/4.12'
Change-Id: I97e4fe727ca9560f2a1f4b93abcfb9fda091364e
2020-04-21 09:26:50 +02:00
Christian Stenger
3b36dcc4c6 AutoTest: Provide catch settings
Users can now modify some settings of Catch tests.

Task-number: QTCREATORBUG-19740
Change-Id: I47e64a43f22fbf783cbf7b256e498d9037533e9a
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-21 06:37:40 +00:00
Leena Miettinen
d0e72c10da Doc: Update screenshots
Change-Id: I749f009c785243e9434f5ecc8885f9f7c0210392
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-21 06:20:43 +00:00
Leena Miettinen
e4ba8327ab Doc: Describe setting default line endings
For all projects or for the current project.

Change-Id: Ie29c4ad42e62810a5c51e950b0d764e906308bda
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-21 06:20:23 +00:00
Thomas Hartmann
756a9ca4ca QmlDesigner: Add missing updates to FormEditor
Change-Id: I500c3ffd4f6801a8ae3a5eb5dab968ad3c2611ac
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:46:47 +00:00
Thomas Hartmann
b75fac036a QmlDesigner: Fix crash
Change-Id: Id87a0fc3bb6b9369c743aa985f707facd994f387
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:44:19 +00:00
Thomas Hartmann
ad94463134 QmlDesigner: Take care of deleted items in FormEditor
The FormEditor did not take care of deleted transition items
in all cases.

Change-Id: Ic5a700b98ae8c400ffd398c5c6972587e2863971
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:43:59 +00:00
Thomas Hartmann
e75a1ea601 QmlDesigner: Force node list property
We assume a list property if forceNonDefaultProperty is set.

Change-Id: Iabfe4753dc9af17e0504cb94170597c3b2f3c47b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:43:33 +00:00