feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,654 Commits 108 Branches 368 Tags
c73bcd32a82f674929583a17f13c9d2bc696a356
Commit Graph

528 Commits

Author SHA1 Message Date
Marco Bubke
668bfe69de QmlDesigner.NodeInstances: Fix workaround 
componentComplete after reparent was null.

Change-Id: Ic4705531a38f67e706bc58a27d423d4062f83304
Reviewed-on: http://codereview.qt.nokia.com/1425
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-11 16:30:53 +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
Marco Bubke
4cdfacff11 QmlDesigner.NodeInstances: Fix component complete 
Task-number: QTCREATORBUG-5338

Change-Id: Iaaaf2cd5440fa8d2f7baae8c42b9234d231a45aa
Reviewed-on: http://codereview.qt.nokia.com/1322
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-07 16:32:39 +02:00
Marco Bubke
25daed2f03 QmlDesigner: Fix wrong position for reparenting 
Task-number: QTCREATORBUG-3962

Change-Id: Id583e257aa1c1645cb53a8ae32f83717df9b0617
Reviewed-on: http://codereview.qt.nokia.com/926
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-07 15:00:23 +02:00
Marco Bubke
862bc044df QmlDesigner.NodeInstances: Workaround qml design bug 
Task-number: QTCREATORBUG-5005

Change-Id: Ia0f1f30a04818bc6ee55a0822eaf0d2b0183e50d
Reviewed-on: http://codereview.qt.nokia.com/1252
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-07 13:39:12 +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 Murach
a4c4d67772 corrected license headers 
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
 2011-07-06 17:56:15 +02:00
Marco Bubke
7d4194d97b QmlDesigner.NodeInstances: Fix no dummydata 
Task-number: QTCREATORBUG-5296

Change-Id: Ia640e03a4a70f15001ab7476713677c52b964cf8
Reviewed-on: http://codereview.qt.nokia.com/1236
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-06 15:45:16 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +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
Marco Bubke
a49b85eac5 QmlDesigner.NodeInstances: Return the implicit size if the size is invalid 
Task-number: QTCREATORBUG-5240

Change-Id: Ie8be3a2cc728805411a79c1f216ede566c641c17
Reviewed-on: http://codereview.qt.nokia.com/925
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 10:50:22 +02:00
Marco Bubke
bc6879cbc8 QmlDesigner.NodeInstances: Positioners are resizable again 
Task-number: QTCREATORBUG-5242

Change-Id: I6f481dc4e9705e0ebdc8f30761afc0c4fc7f2849
Reviewed-on: http://codereview.qt.nokia.com/915
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 10:50:00 +02:00
Thomas Hartmann
16975727b8 QmlDesigner.qmlPuppet: SetErrorMode only if breakpad is disabled 
Change-Id: Ibe0ded2855dc0fe63f0867d953f501c8a025210b
Reviewed-on: http://codereview.qt.nokia.com/912
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-29 17:09:23 +02:00
Marco Bubke
f7f85b797e QmlDesigner: Fix root item is resizable and movalbe 
Change-Id: I3e9e8d0ecd89040b01bcfabc8d6567411567e7e2
Reviewed-on: http://codereview.qt.nokia.com/910
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-29 16:32:40 +02:00
Thomas Hartmann
11d4cbc141 QmlDesigner.NodeInstances: Fix that scene tranform isn't updated 
This change has to go to 2.3

Change-Id: I5d3ebfbff2df8129e5f6678e877c641e0ea926cb
Reviewed-on: http://codereview.qt.nokia.com/887
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-29 12:01:19 +02:00
Marco Bubke
6c2a84a736 QmlDesigner.NodeInstances: Fix repaint bug 
The dirtySceneTransform flag isn't reset by resetDirtyItem(). So we do it now
manually.

Change-Id: I2a908c18b2e05e9b6f40dc2994e765c37197a6d5
Reviewed-on: http://codereview.qt.nokia.com/848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 17:40:36 +02:00
Marco Bubke
ddb602536c QmlDesigner: Fix painted bounding rectangle for step childs 
We used only the bounding rectangle of the item under our control. But child
items which are created in a component can be out side of the bounding
rectangle. To fix compute a combined bounding rectangle of the item and all
stepchildren. Stepchildren described the child not create directly by us.

Change-Id: I7f25f112aa5eb2f80cfccec5d358221ab5e35d9b
Reviewed-on: http://codereview.qt.nokia.com/839
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 16:26:26 +02:00
Marco Bubke
2d4b5fcb65 QmlDesigner: Fix slowness for many items 
The information change notifier provided no hint which infotmation changed.
So the property editor has updated the anchors for all information changes.
Now there is a hint and the update is only happen for a anchor change.

Change-Id: I3b6d7546f43bce4c08757662e7af32604a8db56f
Reviewed-on: http://codereview.qt.nokia.com/811
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 13:47:56 +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
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