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 |
|