feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
20,713 Commits 108 Branches 368 Tags
9837dadbcb3d76bac27d1b00231faa443b03fb6c
Commit Graph

14 Commits

Author SHA1 Message Date
Marco Bubke
9837dadbcb QmlDesigner.NodeInstances: Refactor isManipulatable to isChangeable 
Change-Id: Icfc508e1549f4cfbcdda09b4611b2d66b4e2de1d
Reviewed-on: http://codereview.qt.nokia.com/4287
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-06 18:07:55 +02:00
Marco Bubke
65f5c42bc5 QmlDesigner.NodeInstances: Fix reparent bug 
Change-Id: I4a05ddc9e28e02aa9b9a8f602b3726fc53743245
Reviewed-on: http://codereview.qt.nokia.com/4101
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-05 15:17:14 +02:00
Marco Bubke
ed842542a5 QmlDesigner.NodeInstances: Fix crash for dot properties 
Change-Id: I5fcecd6fb1e50220053b2769e549f62203f33a06
Reviewed-on: http://codereview.qt.nokia.com/4075
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-01 19:53:04 +02:00
Marco Bubke
1e60fbfba4 QmlDesigner.NodeInstances: Add support for new list interface 
Change-Id: Icd20f2a921c94f8bac73f9f61b61a34561ee2d3f
Reviewed-on: http://codereview.qt.nokia.com/3973
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:01 +02:00
Marco Bubke
991e75d65b QmlDesigner.NodeInstances: Improve SceneGraph support 
Change-Id: Ia5111f972836a1123fe857511325a82aef855449
Reviewed-on: http://codereview.qt.nokia.com/3967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:04 +02:00
Marco Bubke
26fbb50dc2 QmlDesigner.NodeInstances: Show binding in text if invalid 
If a binding on a text property cannot be evaluated it will now will be
show as #binding.text#

Change-Id: Ib1d5f406724b262833215d30ec0966a75f9dc971
Reviewed-on: http://codereview.qt.nokia.com/2452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-02 10:22:34 +02:00
Marco Bubke
c6a7091c8a QmlDesigner.NodeInstances: Fix line feed handling 
Task-number: QTCREATORBUG-4161

Change-Id: I61d765bedffde4d1f15e763d92b771f22dbcd4a2
Reviewed-on: http://codereview.qt.nokia.com/1849
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-20 13:06:18 +02:00
Marco Bubke
d1b3b66d5a QmlDesigner: Fix positioner handling 
Change-Id: I519bbbfee939d4568a0de5bbe5c01912a08c6fb1
Reviewed-on: http://codereview.qt.nokia.com/1848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-20 13:06:12 +02:00
Marco Bubke
8a5fffb945 QmlDesigner.NodeInstances: Fix restore bindings for reset 
Task-number: QTCREATORBUG-5415

Change-Id: I1cbc8dda5eb1512db52a2767837b53eb136dc387
Reviewed-on: http://codereview.qt.nokia.com/1664
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 16:53:08 +02:00
Thomas Hartmann
d53f595879 QmlDesigner.instances: clean import paths from .1.0 
Plugin directories might contain the version number,
but they do not have to.

We try to map .1.0 to "" for components delivered with Creator.

Change-Id: Ie785cf29d4dd64a504501d2be501fd6aa733973b
Reviewed-on: http://codereview.qt.nokia.com/1659
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 14:35:39 +02:00
Marco Bubke
2ebb5137a0 QmlDesigner.NodeInstances: Wouraround invisible root items 
Task-number: QTCREATORBUG-5152

Change-Id: I40be95844598a3a3728d0c7fbe88a9fe7a155c53
Reviewed-on: http://codereview.qt.nokia.com/1532
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-12 16:11:07 +02:00
Thomas Hartmann
8bf08f0166 QmlDesigner.nodeInstances: stricter checking for component paths 
We only fix component path if it contains "/imports/".

Change-Id: I4624c460a7475c6b659baea011e2d37def4fdca2
Reviewed-on: http://codereview.qt.nokia.com/1457
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-11 18:17:42 +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