Commit Graph

43591 Commits

Author SHA1 Message Date
Thomas Hartmann
5943219ba8 QmlDesigner.PropertyEditor: Add sheet for ApplicationWindow
Change-Id: Id3d05201a20fce24f20c65e101818ac2231f38ee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:03:08 +00:00
Thomas Hartmann
bae4bba353 QmlDesigner.PropertyEditor: Fix expression in dot properties
We have to use the original property name in the model.

Change-Id: I7e34a576ea2bb95c0346885ec7668f5d993ca7ff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:02:20 +00:00
Thomas Hartmann
35bfa19b84 QmlDesigner.PropertyEditor: Add support for Layout properties
Since the Layout properties do depend on the
context (attached properties),
the meta info system does not provide those.

This patch adds those properties to the backend
if the item is in a layout.

Change-Id: I4040ced3ec6cedaf578ec67d5ea2a8caba484e88
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:02:09 +00:00
Thomas Hartmann
7c9318637f QmlDesigner.PropertyEditor: Allow attached Layout properties
These properties are unknown to the meta info system.
Therefore we have to explicitly allow them.
Since Layout attached properties are not handled corretly by the puppet,
we have to handle them manually.

Change-Id: I0b83b57daddbd4c6d17bd5c3ab16677d7db3cfdd
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:01:59 +00:00
Thomas Hartmann
e68f261056 QmlDesigner: Adding const
Change-Id: Ic8fa31ded61992f05c1eec7f5cab85022e9b3d77
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:01:51 +00:00
Thomas Hartmann
0546f805ef QmlDesigner: Extending navigator
Add support for exporting items as a property of the root item.
Show errors from the qml2puppet.

Change-Id: Id3d05201a20fce24f20e66f101818ac2231f38ee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:01:43 +00:00
Thomas Hartmann
03aa367276 QmlDesigner: Fix for the navigator
If we update a subtree, because a node was moved or reparented, we
have to expand this subtree.

Change-Id: I7f8f004b649a695dddddde4dbec5af19c700d109
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:01:35 +00:00
Thomas Hartmann
e7b642eb4c NavigatorView: Cleanup ItemLibraryView
Change-Id: I9af564864fc91e494bed0e810d781bdacb8dddff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:01:27 +00:00
Thomas Hartmann
c2a6e33da1 QmlDesigner: Adding override
Change-Id: Id3d05201a20fce24f20e65f101818ac2231f389e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:01:12 +00:00
Thomas Hartmann
d775d708af QmlDesigner: Cleanup ItemLibraryView
Change-Id: I9af569864fc91e494bed0e810d781bdacb8dddef
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:01:07 +00:00
Thomas Hartmann
e1798e380f QmlDesigner: Cleanup StatesEditorView
Change-Id: I9af569864fc91e494bed0e710d781bdacb8dddff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:00:59 +00:00
Thomas Hartmann
985062124b QmlDesigner: fix warning if statelist image provider fails
Change-Id: Id3d05201a20fce24f20c65e101818ac2231f38cc
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:00:14 +00:00
Thomas Hartmann
f63e405649 QmlDesiger: Add diagnostics to DebugView
Change-Id: Ibce886a9b11c2d4b2a4a3f0ddf1f3a0eaa0de2ee
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 10:00:07 +00:00
Thomas Hartmann
ee051546c5 QmlDesigner: Move ui file to the QmlDesigner namespace
Change-Id: Ic8fa31ded61992f05c1eec7f5cab85022e9b3d66
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-17 09:59:36 +00:00
hjk
2d30693450 Debugger: Fix LLDB extra dumper passing
Change-Id: I1601a894b8adb3365894b21e06d4929e381b7a01
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-07-17 09:38:33 +00:00
Marco Bubke
2443f18b85 Clang: Reparse the translation unit for unsaved file changes
Change-Id: I49711ce040a995f193d36961e010decc27c34c4c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-07-17 09:08:08 +00:00
hjk
efada54950 Debugger: Fix enable state of breakpoint command text field
There was no actual error in practice, as the handling was lumped
together with the tracepoint checkmark, which (accidentally) did the
right thing in all cases.

Change-Id: Icf12aaf0c48855b747d25a0252c8215e259c4227
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-07-17 08:51:42 +00:00
hjk
af394ecc8b Debugger: Hide "Tracepoint only" item from breakpoint options
Did only work for Symbian, for now the user can use something like

   echo Trace hit!
   continue

in the "Commands:" field instead.

Change-Id: Ib7ad273bc6de4bbd46845c9e1c75c99e5bddd2bc
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-07-16 13:54:52 +00:00
hjk
d4206752ca Debugger: Only pass environmental differences to inferior
This amends 0f46ad4a55.
Passing the whole environment is unneeded, and can cause
problems with multi-line variables.

Change-Id: I49a32c550ba52737bb8f797e227bb883be8b1df1
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-07-16 13:09:58 +00:00
hjk
7a675e2d64 Utils: Make Environment::diff() result not contain common entries
The resulting diff contained all the items that were equal as well.
Since the function was unused so far, no real harm was done,
but the function would be useful to have in the debugger.

Change-Id: Ia0b0cea79cfc3ee5442aaf7bb392121590c0f338
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-07-16 13:09:51 +00:00
hjk
799461ee7a Debugger: Fix evaluation of "this" item in JS debugger
Change-Id: I88a502f044fca4c842c21563988d0a95e128c664
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-16 13:00:56 +00:00
Marco Bubke
f6d67bebcf Clang: Decrease the priority of operators
Change-Id: Ib04d2a14989fd221ab6d8f36c92d3520261b99ee
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-07-16 12:55:22 +00:00
Marco Bubke
5df8085529 Clang: Remove the hint and snippet field from the CodeCompletion
It is not used and is producing overhead.

Change-Id: I1398b18a40c0f5c0b90fe4c058996d7eb109f9f2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-07-16 12:54:58 +00:00
Marco Bubke
336501943e Clang: Add tooltip for clang snippets
Change-Id: Ifccfd72c52910c6e1086d6c782552c60fbb89f5f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-07-16 12:54:48 +00:00
Nikolai Kosjar
8d23d80139 Clang: Clear the project part completely on remove
Change-Id: I6fdb1766a3b407fbaaf86b0216a0dd710673aec1
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-07-16 12:31:15 +00:00
hjk
f77f6e2144 Debugger: Make QmlEngine heed "Sort Struct Members Alphabetically"
Change-Id: Ib24e62c60eea4b0af355c3e93e48a78dc0b51efc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-16 12:19:12 +00:00
Robert Loehning
184b161224 Squish: Adjust expectations when using clang codemodel
Change-Id: I204ff6eb3820f67d50f8f4b77012d538741cec47
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-16 12:18:37 +00:00
hjk
3f084fa026 Debugger: Split update/expand paths also in mixed engine
Change-Id: Ic341e4a3e974cfde3fbf4afd8cef41080b922067
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-16 11:55:31 +00:00
hjk
c81407f28d Debugger: Lift restriction one-shot breakpoints deletion
This was/is a workaround to not lose the extra information carefully
crafted one-shot-breakpoints might carry (e.g. conditions). However,
it gets into the way when simple one-shot breakpoints are used
automatically ("Jump to line", or native-mixed debugging),
so actually deleting the bp in the ui if it's gone on the debugger
side seems the lesser evil nowadays.

Change-Id: If00dc4e8f27881236c05b17109b57d7c53d424ab
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-16 11:52:32 +00:00
Marco Bubke
0bc18df655 Clang: Do not work on unspecified values in ProjectParts::remove
Change-Id: Icc322bc64988cbc1b5ec4e6d6474b1b6b956c667
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-07-16 11:51:13 +00:00
Nikita Baryshnikov
7bc397b1ff GitPlugin: reorder namespaces endin
that is all:)

Change-Id: Idf32e241f6c94f5717518b4e0f66f41ea8aed034
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-07-16 09:42:01 +00:00
hjk
6c9c79d058 Debugger: Make LocationMark draggable
Issue a DebuggerEngine::executeJumpToLine() in response.

Change-Id: I7be5738241ce91f61002d6f6b49c796824569024
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-16 09:17:22 +00:00
hjk
63c5fc034b Debugger: Split updateWatchData() paths
There are two cases that do not coincide in asynchronous
engines such as the QmlEngine: Inserting a new watch item,
and expanding the children of an existing item.

Change-Id: Ic98a5f1e89aca37146039a241de737c407606e83
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-16 08:05:36 +00:00
Christian Kandeler
80712e80a3 Utils: Fix process stub look-up.
The path where the tools are located has changed.

Task-number: QTCREATORBUG-14732
Change-Id: Idb404b291ef651d2c0f03bce454b9aa0c0319183
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-07-16 07:44:38 +00:00
hjk
66964ac91c Debugger: Rework QmlEngine watcher expansion
Use callbacks in QmlEnginePrivate::evaluate(). This separates the
four code paths through the machinery into three separate handlers
and one direct access to the console.

This also fixes a bug where items were put into 'debuggerCommands'
but attempted to be removed from 'updateLocalsAndWatchers'.

Introduce a QmlEngine::updateLocals similar to what the other
engines do. Let the frame() and assignValue() paths use it.
Keep track of pending changes and call notifyUpdateFinished
if and only if the pending lookup queues is empty.

Finally, remove some dead code.

Change-Id: I173a52911d0de994b849fc6ab4f52ef7f64a8ba5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-16 07:21:34 +00:00
hjk
1adbcc03f8 Debugger: Start using callbacks in QmlEngine commands
Version, Backtrace, Frame, Scope and Lookup for now.

Change-Id: I615c8f8c00484e9bb1742485f24bdfc537f83021
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-16 06:10:46 +00:00
Daniel Teske
17c04dccc0 Android: Compare typeId() to the correct constant
Broken in e6d1141e1e,
which changed the code to use typeId() instead of type() but
didn't change to what it was compared.

Change-Id: I5b4f76395bd193ee30ee606023483d3bd0b062e8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-07-15 15:55:22 +00:00
Daniel Teske
857bae3146 Android: Mark debug output in red for Android <5
We do that for Android 5 and onwards.

Change-Id: Ia79fbf3cd50ed561e5dba1b8707d296fe1daa82d
Task-number: QTCREATORBUG-14663
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-07-15 15:30:25 +00:00
Daniel Teske
21d547998f Fix leaking of CMakeTools
Change-Id: I36d3d19cbd0bccc3ee74f8aae1622dbed22aa45a
Task-number: QTCREATORBUG-14727
Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-07-15 14:56:04 +00:00
Christian Kandeler
91d248c28f Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: Id8b7ecc1dbcbe381c5766666e4cc91c75ad502f4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-07-15 14:25:25 +00:00
Marco Bubke
e9c2148806 Clang: Reserve result vector in CodeCompletionChunkConverter
Change-Id: If05c053afd0e422bb407e85bd2d403690084d637
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-07-15 13:54:08 +00:00
Marco Bubke
9795a50fdd Clang: Reserve result vector in the CodeCompletionsExtractor
To prevent re-allocations.

Change-Id: I25f8d56bc8e55938e1888364414bc316da7fdf6c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-07-15 13:53:59 +00:00
Marco Bubke
fbd549f213 Clang: Prevent double spaces for clang snippets
Change-Id: I62f9b9c217570dd6dafc45719e898cc2ac4d2937
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-07-15 13:53:52 +00:00
Marco Bubke
f9899c2da8 Clang: Little speedup for code completion
...by ensuring that the precompiled preamble is created.

Change-Id: I80784b6a79c40a7e452530e8288783f33f881efc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-07-15 12:20:59 +00:00
Tobias Hunger
dbe4e32201 QML wizards: Do not offer .ui.qml files for Qt 5.3
Qt 5.3 is the only version we are going to support that does
not offer ui.qml file support. So just check for the QtQuick
version shipped in Qt 5.3 to decide whether or not to display
the checkbox.

Task-number: QTCREATORBUG-14712
Change-Id: Ibb2204f2bcff819b749e1ed744c14a2e96769351
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-07-15 10:14:43 +00:00
Eike Ziller
68acdd7d0d Follow-up fixes for the libexec path change
The fallback puppet must be found in libexecPath now.
Deployment on OS X must also be adapted to the new location.
Broke with 6d5a5aff94

Change-Id: I8dc3d62188a2f19a7e203f939bd88065fb0504f8
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-07-15 09:49:15 +00:00
Thomas Hartmann
f07e3670c1 QmlDesigner:Compress restartProcess()
Calling restartProcess() is delayed by 100 ms and all subsequent calls
in that timeframe are ignored.

Change-Id: I59dd2e91475444cea4ee70bafb130213176cb666
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:18:28 +00:00
Thomas Hartmann
9bb38f94de QmlDesigner.PropertyEditor: Adding override
Change-Id: I3c48c199992c3661b0eff3a6df36aa281438d155
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:14:06 +00:00
Thomas Hartmann
aea31a1c6e QmlDesigner: Cleanup PropertyEditorView
Those notifiers do not have to be implemented anymore.

Change-Id: I3c48c199292c3661b0efb3a6df36aa281438d188
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:14:00 +00:00
Thomas Hartmann
7cadba0e08 QmlDesigner: Cleanup NodeInstanceView
Those notifiers do not have to be implemented anymore.

Change-Id: I3c47c199292c3661e0efb3a6df36aa281438d178
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-15 09:13:56 +00:00