feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
56,113 Commits 108 Branches 368 Tags
aaec887b155d46d5b51ec33a5a216199cc2ab560
Commit Graph

81 Commits

Author SHA1 Message Date
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
Eike Ziller
99ba300ae3 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
 2011-08-10 16:03:57 +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
Oswald Buddenhagen
65c0eb5165 Merge branch '2.3' 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
 2011-07-29 17:57:59 +02:00
Marco Bubke
776f19025e QmlDesigner.NodeInstances: Add a default dummy context 
Task-number: QTCREATORBUG-5631

Change-Id: Id1ba102d6992b8a56b105c061be89677e13e9a8b
Reviewed-on: http://codereview.qt.nokia.com/2300
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 20:14:24 +02:00
Marco Bubke
2125638107 QmlDesigner.NodeInstances: Move context object to a context directory 
filename_contextdummy.qml -> context/filename.qml

Task-number: QTCREATORBUG-5630
Change-Id: I76ae5432ff3052d17a3cec17d85b5cbb6d1ddc61
Reviewed-on: http://codereview.qt.nokia.com/2295
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 20:14:14 +02:00
Marco Bubke
e4286b7dc2 QmlDesigner.NodeInstance: Reset items if the aux size is invalid 
Change-Id: Ic5c8aa1a622b6e7d446bb1416038571b0b591f54
Reviewed-on: http://codereview.qt.nokia.com/2284
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 15:18:36 +02:00
Oswald Buddenhagen
ae8ac2eb2f Merge branch '2.3' 
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
 2011-07-25 13:57:13 +02:00
Marco Bubke
f9a3fd338c QmlDesigner.NodeInstances: Reparent after value setting 
Change-Id: I06ac27d5043ab7f102972f0c054fc55fc77f6b15
Reviewed-on: http://codereview.qt.nokia.com/1994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 18:59:40 +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
Thomas Hartmann
95bf007e2b remove qDebug 
Change-Id: Ia83708b48f7565d8d272a797c7e18cb0931dddb0
Reviewed-on: http://codereview.qt.nokia.com/1747
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-18 13:19:59 +02:00
Eike Ziller
e5ca4b3462 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
 2011-07-15 14:29:07 +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
hjk
82bbac7f90 Remove unneeded defines. 
Mostly Q_DISABLE_COPY that were covered by the un-copy-ability of the
respective base classes. Includes a few "stylistic" whitespace changes.

Change-Id: I31ca0e7bada5ed0f34776976efe22ddc444a5bf2
Reviewed-on: http://codereview.qt.nokia.com/1609
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-14 12:15:38 +02:00
Marco Bubke
b8a79174c1 QmlDesigner: Fix for code style 
Change-Id: Ib44d54414d38409ec0647c922fb81a10b5c30046
Reviewed-on: http://codereview.qt.nokia.com/1523
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-12 17:54:15 +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
Marco Bubke
c02f1fb78a QmlDesigner: Fix license header 
Change-Id: I4a8e1abd5a5b2431f654bb64421c872655b3ce40
Reviewed-on: http://codereview.qt.nokia.com/1458
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-12 13:58:57 +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
Marco Bubke
b7d453b0c8 QmlDesinger: Fix AnchorChanges are not exported 
This reverts commit 6f161c99f7.

Task-number: QTCREATORBUG-5026
Change-Id: I51cb29887a35f8a9d0aee7d9b974aa037dc446bd
Reviewed-on: http://codereview.qt.nokia.com/1443
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-11 16:41:40 +02:00
Robert Loehning
6f161c99f7 Revert "QmlDesigner.NodeInstance: Add instance wrapper for anchor changes" 
This reverts commit 94bc93d101.

Patch caused build error on Windows.
Task-number: QTCREATORBUG-5372

Change-Id: If3d63eca0c9dbc0f621c32cf21ffa983ce0987f4
Reviewed-on: http://codereview.qt.nokia.com/1387
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-08 16:16:44 +02:00
Marco Bubke
94bc93d101 QmlDesigner.NodeInstance: Add instance wrapper for anchor changes 
Task-number: QTCREATORBUG-5026

Change-Id: I56116fc3f1823e41bfd8e50781d2b4e8fccbfe04
Reviewed-on: http://codereview.qt.nokia.com/1329
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-07 20:07:52 +02:00
Marco Bubke
39e55c91e7 QmlDesigner.NodeInstances: Remove dead code 
Change-Id: I181f365d40b9fcd6b09989ed54decd9720e1c27d
Reviewed-on: http://codereview.qt.nokia.com/1330
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-07 19:22:35 +02:00
Oswald Buddenhagen
1f3896e8af Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	share/qtcreator/dumper/bridge.py
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/remotelinux/remotelinuxapplicationrunner.cpp

Change-Id: I444f797723d5879ea08c5c0e1f31158d271d4f41
 2011-07-07 12:26:59 +02:00
hjk
402db14943 qmlpuppet: remove unneeded declarations 
Change-Id: I488548fa84e743e0ed80dd68739d3d80a1cea92b
Reviewed-on: http://codereview.qt.nokia.com/1297
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-07 11:57:55 +02:00
Marco Bubke
765ba3b4b9 QmlDesigner: Prevent item hoping for reparenting 
Because of the asynchronous nature of the formeditor the item can be between
to states. This looks like the item is hoping around. To prevent this a token
is sent to the instances and back. For the time frame the painting is disabled.

Change-Id: If7e937cba8171248464ad350bb14438c020b25f9
Reviewed-on: http://codereview.qt.nokia.com/1189
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-06 18:19:28 +02:00
Thomas Hartmann
3cfa376243 QmlDesigner: Fix wrong position for reparenting 
Change-Id: Ie9d9a739e559d5cfc06849ff3e5c086e9ab2224c
DoneBy: Marco Bubke
Task-number: QTCREATORBUG-3962
Reviewed-on: http://codereview.qt.nokia.com/958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 17:36:09 +02:00
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
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