Commit Graph

8660 Commits

Author SHA1 Message Date
hjk
2cb48a1431 Debugger: List installed dumpers properly in LLDB bridge
Change-Id: Id38cf5e8664b7584886d14be9a090bc7b7172410
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-23 17:31:21 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
2013-04-23 11:13:25 +02:00
Tobias Nätterlund
874328fe9b QNX: Corrected path to qml files for pure QNX devices
For pure QNX (non-BlackBerry) devices, the path to the QML
files are decided by the user. Only adjust the path for BlackBerry
devices.

Change-Id: I909ed0a06bc6985a5a353aab61bda395afcfb7aa
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
2013-04-23 10:38:19 +02:00
Tobias Nätterlund
53fb29bdda QtQuick2ApplicationViewer: properly resolve install paths
This is a port of commit 2982545d to also apply it to
the qtquick2applicationviewer.cpp template.

Change-Id: Ia9d964d9fc98ea957c52aea783c6148449552755
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-23 09:19:46 +02:00
Thomas Hartmann
fd9d39c12a QmlDesigner.Instances: properly disable component complete for 5.1
This is only available in Qt 5.1

Change-Id: I76b7916b4ce64c440c175e77edc2b0a3ef015166
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-22 18:19:24 +02:00
Marco Bubke
457566974d QmlDesigner.Instances: adding LayoutNodeInstance
This class wraps a QQuickLayout.

Change-Id: Ib661ccb5bb5deb1acb87b9a4bef8da95cb4e40eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-22 17:39:04 +02:00
Marco Bubke
ff4457bb46 QmlDesigner: Prepare for other layout items
Change-Id: I831e68877eb3d785b4bbb99db002ab8e42158d75
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-22 17:03:37 +02:00
Marco Bubke
40b62e1cfa QmlDesigner: Add GraphicalNodeInstance as abstraction for item and window
Change-Id: Icaba711464f672a3bfbb9d83a449d47e72ba11ff
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-22 17:03:23 +02:00
Eike Ziller
e3fd25256d Qbs build files: Install files to correct location
First step in fixing the Mac build

Change-Id: I86659b9b46c01fc17fd93b8ffc3b378d2b580c36
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-22 16:58:09 +02:00
Thomas Hartmann
7076272bf5 QmlDesigner.Instances: fix delemiting of type names
Import are delemited with a "." and there is a "/" between
import and type.

e.g.: QtQuick.Layout/QQuickLayout

Change-Id: I7750b333296cceef99992610cca126530f777777
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-22 13:21:32 +02:00
Marco Bubke
06cfc22fe2 QmlDesigner: Remove old function
Change-Id: I065a6febd74e13740117e0a5223fa71648a7c430
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-22 11:23:27 +02:00
hjk
aacd884287 Debugger: Mac/LLDB run fix
"settings set interpreter.prompt-on-quit off" does not
exist on Mac

Change-Id: Ib4575be58a669193813036c4c8f4f48cc3d358e8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-19 14:12:29 +02:00
Eike Ziller
0d5c886af3 Adapt the Qt Creator plugin project template to recent changes
Change-Id: Id5cc8642547a3698d2e11b956f0c1cfe3e8bea1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 13:30:04 +02:00
Oswald Buddenhagen
d77883c16a Merge remote-tracking branch 'origin/2.7' 2013-04-18 15:18:34 +02:00
Marco Bubke
2557e0f39d QmlDesigner: Remove override from non virtual function
Change-Id: I8d0b782df5e0819d7f20c2294aa4be9b017a6cb9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-18 13:59:22 +02:00
Eike Ziller
55de6a9fb9 Merge remote-tracking branch 'origin/2.7' into HEAD
Conflicts:
	src/plugins/coreplugin/generalsettings.cpp

Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646
2013-04-18 12:54:37 +02:00
Thomas Hartmann
58e280de2c QmlDesigner:Instances: Adding instance for QQuickWindow
This allows QuickWindowNodeInstance to return the content item
instead.

The function parentObject() in ObjectNodeInstance now knows
QQuickRootItem, because the parent of the root item should
is the windows (which is just a QObject but treated as item from us).

Change-Id: Ibaa7ccc8dd9346689cc4443ce0b594056feaa0cf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-18 12:20:41 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
2013-04-18 09:22:19 +02:00
Thomas Hartmann
e311761b57 Fix compilation for Mac OS X
CONFIG += c++11
does not work with clang atm.

Change-Id: I7750b333296ccedf999d2610cca126530f737777
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-17 11:23:33 +02:00
Marco Bubke
ea8c98c2d8 QmlDesigner: Remove stupid code
Change-Id: Ie56c5e26a7ec077b794a4993679ab80a716740ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:26 +02:00
Marco Bubke
2b698e31ed QmlDesigner: Add override to qml2puppet
Change-Id: Ibdf07c4a35b40f3fc78300a1675270f8295bec42
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:20 +02:00
Marco Bubke
e13e6550f5 QmlDesigner: qml2puppet is using c++ support
Change-Id: Ie6ac96b713775db13a02cecdc74849ad97f017e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:15 +02:00
Marco Bubke
de822ec5ca QmlDesigner: Remove old paint function in instances
Change-Id: I5da0c624b467448dc6f16a88fa3ad3682f423c20
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:11 +02:00
Marco Bubke
e7206d5b04 QmlDesigner: Fix reparent function in qmlpuppet
Change-Id: I7f30f23c5f2af24f3715bae2b1f4b7be044b0da7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:06 +02:00
Marco Bubke
5d3c1a2a2b QmlDesigner: Remove old functions in instances
Change-Id: If886ca208de775472c4e97e986c2f4df81615959
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:00 +02:00
Marco Bubke
0de9237699 QmlDesigner: Add PropertyName usage in instances
Change-Id: Ia7eb8730c61347833c70a3d62787c10e2a3134ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:51:54 +02:00
Fawzi Mohamed
a019c4c7a1 qmljs: update qt-creator builtins.qmltypes, and use them for qt<-4.8.5
qmlplugindump of qt <= 4.8.5 does not output exportMetaObjectRevisions
so do not use its output for the builtins.

Task-number: QTCREATORBUG-9076
Change-Id: I82bdd325ef15f800c70c830ead4867787f6b7b0a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-16 09:57:32 +02:00
Friedemann Kleint
a0696ada0d Fix texts in QtQuick-Extension plugins.
The text needs to be one line for the translation transformation
to work.

Change-Id: Ia1c4ab02a0774bebbc6b0f59f2a9682d0a751e6a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-16 09:28:04 +02:00
Marco Bubke
359ef53280 QmlDesigner: Move implementation code in the node instances
updateDirtyNodeRecursive and renderPreviewImage belongs to quick image and
not in the node instance server.

Change-Id: I629b89c748036c0614e78bcfa0c837cb16ca6374
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-15 13:53:53 +02:00
hjk
2e9b8406da Debugger: Claim a few more capabilities for LLDB engine
This will need further fine tuning.

Change-Id: Ia8926a73adfdf3de313cd379c4d6452b0af56ca0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 17:46:23 +02:00
hjk
2efdca1e12 Debugger: Use 'thread step-out' instead of LLDB function call
Seems not to be implemented or working on LLDB/Linux right now

Change-Id: I04a98d038eb2d7a7a5fbe1d713351d392aff8047
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 15:29:11 +02:00
hjk
4269ce4e38 Debugger: Progress on LLDB state handling
Change-Id: Iadf9c7026a3da0adeec8340729a303bbbee57c24
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 14:56:48 +02:00
Eike Ziller
e3fde349ad Merge branch 'master' of ssh://codereview.qt-project.org:29418/qt-creator/qt-creator 2013-04-11 18:28:07 +02:00
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
2013-04-11 18:27:52 +02:00
hjk
5b98167ebd Debugger: Remove common bridge.py
The engines know what they want, no need to guess again.

Change-Id: Ie21b0e08eff8b81b217a08d4c47c35c35ae831d7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-11 18:17:21 +02:00
hjk
4284693cd2 Debugger: Fix regression introduced in 1d580bcf9f
Change-Id: Ia4a88aaae1e3b3e1a9c7ec3cd5b8a52d36edac4f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-11 18:00:51 +02:00
hjk
13090b21d1 Debugger: Simplify LLDB backend message passing
Change-Id: I3a95d6a21d1da1f0c3df743e6743d3d8e558e967
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-11 17:46:15 +02:00
Thomas Hartmann
7406761f8f QmlDesigner.Instances: disabling the cursor after completing
The cursor should be disabled after component complete.

Change-Id: I3ee089b23f43b42a478aaacc4073cbdfd0da2323
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-11 12:11:14 +02:00
Thomas Hartmann
f42f73492f QmlDesigner.Instances: function should be static
No reason the export the symbol.

Change-Id: I34a42f866333585774129021777265e8a7524555
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-11 12:10:58 +02:00
Thomas Hartmann
8a9fc63555 QmlDesigner.Instances: blacklist certain properties
For those properties the QQmlProperty constructor does crash.

Change-Id: Ia78583e080ced936d98517ce0d3244d3040f8ceb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-11 12:10:23 +02:00
Friedemann Kleint
8ba344a556 Code snippet wizard: Add newlines to template code.
Change-Id: Iaf673ed279103acdae15e868651ffb65397a4221
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-11 11:51:12 +02:00
hjk
2f147b4055 Debugger: Report process state and location from LLDB bridge
Change-Id: I1e65b2f75ff4ebde17f7d8506193cb47474335f6
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-10 17:52:43 +02:00
hjk
5211599988 Debugger: Centralize LLDB response handling
Most logic is now moved to the python side, so response
structure can be uniform

Change-Id: Ic06760e33415ca4e05b6a4b3629028c01f304238
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-10 17:52:34 +02:00
hjk
17e8631dfb Debugger: Reorganize python dumper loading
- Split off GDB and LLDB specific parts into separate files,
- Trigger loading of dumpers.py and qttypes.py from bridge.py
- Read start up script at startup, not as part of dumper loading

Change-Id: I7941ee535121fa0f43a466e5bb75a18c9bb19764
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-10 15:58:12 +02:00
hjk
87f2d83ec2 Debugger: Add basic breakpoint handling and stepping to LLDB backend
Change-Id: Ib700afa63739e6d26bdd97225265559d7112eadb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-10 15:58:02 +02:00
Eike Ziller
65654e4a50 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
2013-04-08 13:26:37 +02:00
hjk
2d2a89941c Debugger: Populate parts of Modules view with LLDB backend
Shared objects seem to get reported twice by LLDB.  Ignore that for now.

Change-Id: I1d49200a54f10ea8a2768e4dd623541a3d4f80e7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-08 12:49:05 +02:00
hjk
1d808ea8bc Debugger: Populate stack view with LLDB backend
Change-Id: I9808829559da65cd152d2455737f6c7f394da6b3
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-08 12:48:52 +02:00
hjk
7107fd1591 Debugger: Pass output from plain gdb pretty printers hex-encoded
This takes care of "unusual" contents.

Change-Id: I5e9ce2066281d169e88a58e85e6d4dd590760e2a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-08 12:27:59 +02:00
hjk
1d580bcf9f Debugger: Remove workaround for GDB < 7.2 missing frame.block
This practically means that the >= 7.2 requirement is now a hard
requirement.

Change-Id: I6c3abbc625443ded182d2da101e04d96e3bed26d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-08 10:56:37 +02:00