feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,082 Commits 108 Branches 368 Tags
2bd550f3fdc6c89774d5221aabf9bd5e0f79244c
Commit Graph

27 Commits

Author SHA1 Message Date
Tim Jenssen
2bd550f3fd QmlDesigner: import only working imports 
Change-Id: Ic7d74237eeb86e34925f1b048befa5da9420c278
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-09-26 15:13:39 +02:00
Marco Bubke
37b1dc871f QmlDesigner: Merge GraphicalNodeInstance back in QuickItemNodeInstance 
Change-Id: I2f5412887a66186d215e56101a63bacfda4f8e0a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-17 18:02:06 +02:00
Marco Bubke
c7699c1121 QmlDesigner: Remove QuickWindowNodeInstance 
Change-Id: I164b38286a4a4b1ff642c1cfdb8cd19477ad9fa1
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-17 18:01:42 +02:00
Marco Bubke
9818f714f4 QmlDesigner: Use the root NodeInstance for item collection 
Change-Id: I0ed67997c371af8acb3db480446ea5d577380804
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-17 18:01:02 +02:00
Marco Bubke
3483365f01 QmlDesigner: Add root item getter to ServerNodeInstance 
Change-Id: I9f31390b478d8638038998682fb606dea5d1c81a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-16 17:16:03 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Marco Bubke
90ce3aec8b QmlDesigner: Test mode for qml puppet streams 
Change-Id: I93128c60892900d6b4728569b84efb0ed835b51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-08 11:28:38 +02:00
Marco Bubke
30d3e7e51d QmlDesigner: Fix preview rendering 
We excluded item which had a node instance. For the preview all item should
be marked dirty.

Change-Id: I0cbad89707d7d94f65ac0d055488e124da40e7b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-06-18 15:09:26 +02:00
Marco Bubke
b97422b710 QmlDesigner: Add container item support in node instances 
Change-Id: I30e0d11346b8c63188d052b46656e7ede179e55d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-05-30 14:11:57 +02:00
Marco Bubke
7976456002 QmlDesigner: Add content item hack 
There is no stand content item interface, so try to work around to enable
snapping and anchoring.

Change-Id: Ib2eaf0d6c35e3ba289dd7d55b2ba4c064ad40748
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-05-22 14:45:43 +02:00
Marco Bubke
457566974d QmlDesigner.Instances: adding LayoutNodeInstance 
This class wraps a QQuickLayout.

Change-Id: Ib661ccb5bb5deb1acb87b9a4bef8da95cb4e40eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-22 17:39:04 +02:00
Marco Bubke
ff4457bb46 QmlDesigner: Prepare for other layout items 
Change-Id: I831e68877eb3d785b4bbb99db002ab8e42158d75
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-22 17:03:37 +02:00
Marco Bubke
40b62e1cfa QmlDesigner: Add GraphicalNodeInstance as abstraction for item and window 
Change-Id: Icaba711464f672a3bfbb9d83a449d47e72ba11ff
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-22 17:03:23 +02:00
Thomas Hartmann
58e280de2c QmlDesigner:Instances: Adding instance for QQuickWindow 
This allows QuickWindowNodeInstance to return the content item
instead.

The function parentObject() in ObjectNodeInstance now knows
QQuickRootItem, because the parent of the root item should
is the windows (which is just a QObject but treated as item from us).

Change-Id: Ibaa7ccc8dd9346689cc4443ce0b594056feaa0cf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-18 12:20:41 +02:00
Marco Bubke
de822ec5ca QmlDesigner: Remove old paint function in instances 
Change-Id: I5da0c624b467448dc6f16a88fa3ad3682f423c20
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-16 16:52:11 +02:00
Marco Bubke
359ef53280 QmlDesigner: Move implementation code in the node instances 
updateDirtyNodeRecursive and renderPreviewImage belongs to quick image and
not in the node instance server.

Change-Id: I629b89c748036c0614e78bcfa0c837cb16ca6374
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-15 13:53:53 +02:00
Thomas Hartmann
d204ee0b43 QmlDesigner: Type of the propertyname is now PropertyName 
And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.

Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit ee4bf638ca)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-25 13:35:11 +01:00
Robert Loehning
a040424d2a Incremented year in copyright info 
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-01 09:19:26 +01:00
Thomas Hartmann
091d1116a2 compile fix for qml2puppet 
Change-Id: Iad3c36e66e70c4ba1c885ffc10c4ea3f888aa820
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 15:27:04 +01:00
Marco Bubke
1fdd172772 QmlDesigner.NodeInstances: Add debug output 
Change-Id: I97ae422fce73ef3df62a66ef4bb925454176f891
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 14:12:40 +01:00
Thomas Hartmann
0fd35fcc2e QmlDesigner.puppet: licence header fix 
Task-number: QTCREATORBUG-8189

Change-Id: Ib1862dee47b3e340492c9321b9db92a7fe2b4786
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-06 15:43:07 +01:00
Marco Bubke
174eb7c270 QmlDesigner.NodeInstances: Fix crash for instance without object 
Change-Id: Ia08cdb194e8f67a71cdbddf162cc7f17daa517f8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-15 17:53:58 +02:00
Marco Bubke
fb276230fe QmlDesigner.NodeInstances: Recover positioner support 
Change-Id: Ib5e891a8563bfced2af93e4a516ef8f196e8ff1e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-04 19:19:02 +02:00
Marco Bubke
a299252ae5 QmlDesigner.NodeInstances: Remove Qt 5 defines 
Change-Id: Ie835af0e32800887d6cc2f6eebcd9dd79b3100a5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-27 16:30:23 +02:00
Marco Bubke
f6b80018db QmlDesigner.NodeInstances: Cache qml meta types 
Change-Id: Ied18ca8b31e3a17ee9e37aed030377148d272917
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-27 16:30:07 +02:00
Marco Bubke
2fc24f27d1 QmlDesigner.NodeInstances: Rename SG to Quick 
Change-Id: I2180704df244a715a078385a7ecbf852f41ca68f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-26 18:22:19 +02:00
Marco Bubke
770ab68c45 QmlDesigner.Instances: Refactor the qml2 puppet 
Change-Id: Iaa7a744ecf13e011addc573a381ea523d2d50a55
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-24 11:46:20 +02:00