Commit Graph

756 Commits

Author SHA1 Message Date
Thomas Hartmann
08e4b339f1 QmlDesigner.instances: allow fallback to item
If we know from the (text editor) meta system that an object is an
(visible) item, we always create an item as fallback.

We might not be able to instaciate the original item.

Change-Id: I6851cd7a8de68d9d09b789927c204f0617017de7
Reviewed-on: http://codereview.qt.nokia.com/829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2011-06-28 13:36:48 +02:00
Marco Bubke
0fcc6afd8f QmlDesigner: Split between bounding rectangle and painted bounding rectangle
In qml the interactive bounding rectangle is always
QRectF(0, 0, width, height). The painted bounding rectangle can differ from
this logical one. This change is much more near to the qml description.

Change-Id: I139cb70512fa1ed003b28ca2ae512f4e33e915e5
Reviewed-on: http://codereview.qt.nokia.com/812
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-28 10:25:10 +02:00
Marco Bubke
52dcd28275 QmlDesigner.NodeInstances: Reduce repaints
Change-Id: I39e7eae1036ee79689ccd49bfe900fee93a3454b
Reviewed-on: http://codereview.qt.nokia.com/808
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
2011-06-27 21:34:42 +02:00
Thomas Hartmann
cf39ee315b QmlDesigner.nodeInstances: improving warnings if building qmlpuppet fails
Change-Id: I7dfecd8e0ad0016748ef4513cf0364e8dcd7d121
Reviewed-on: http://codereview.qt.nokia.com/715
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-24 16:19:01 +02:00
Oswald Buddenhagen
1d78e594d8 Merge branch '2.2'
Conflicts:
	qtcreator.pri
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
	src/libs/qmljs/qmljsdocument.cpp
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/libs/qmljs/qmljslink.cpp
	src/plugins/cppeditor/cppquickfixes.cpp
	src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
	src/plugins/qmldesigner/qmldesigner.pro
	src/plugins/qmldesigner/symbianplugin/symbian.metainfo
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617
2011-06-23 19:47:50 +02:00
Marco Bubke
8fe3302329 QmlDesigner.NodeInstances: Move qmlpuppet to share
Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7
Reviewed-on: http://codereview.qt.nokia.com/634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-06-22 18:24:36 +02:00