feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,476 Commits 108 Branches 368 Tags
eecc27e75776bd9219f29c5cd1cb4119c3354d01
Commit Graph

21 Commits

Author SHA1 Message Date
Marco Bubke
2507a24ba9 QmlDesigner: Use QQuickView::setContent to set root component 
Change-Id: I8d5700c71fd4e46f0463bf02195506251f71a853
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:11 +02:00
Marco Bubke
a25f30d6c4 QmlDesigner: Remove unneeded QtQuick import 
Change-Id: Iab41ff8f1c197238c3cf78c6f99d78ee349b2137
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:39:59 +02:00
Marco Bubke
89db22a1c8 QmlDesigner: Better componentComplete 
Change-Id: I2bfdbeabd4d08474d50434d7e13c32b780e783ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-06-18 15:10:43 +02:00
Marco Bubke
af54a661a4 QmlDesigner: Remove refresh bindings for componentComplete 
changeId is triggering it anyway and it is really expensive.

Change-Id: I37743ed619d9e901b28c69f4c324852ba7e6608c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-06-06 17:20:53 +02:00
Marco Bubke
9d967d4be0 QmlDesigner: Remove refreshBindings for instance creation 
Refresh bindings is very expensive and called anyway at reparenting.

Change-Id: I232afefee22484e3994ade31457f61ea6ee1293e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-06-06 16:33:34 +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
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
 2013-04-23 11:13:25 +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
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
Friedemann Kleint
7043a7e01b Fix Krazy warnings about duplicate includes. 
Change-Id: Ied32236a84d20225b1ca4a192f3a346fbfbd09b4
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-20 15:04:10 +01:00
Thomas Hartmann
ee4bf638ca 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>
 2013-03-05 12:34:39 +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
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
350d5d9b28 QmlDesigner.NodeInstances: Workaround for Quick 2 
Change-Id: I91c0d841cdff3f502294b5245e1b35407e5fa441
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-10 16:25:56 +02:00
Marco Bubke
f252d77e9a QmlDesigner.NodeInstances: Fix warning 
Change-Id: Iddb38f814fe21c579b1589601879dbc90f690874
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-25 16:18:30 +02:00
Marco Bubke
208b2c8802 QmlDesigner.NodeInstances: Last sended value is UserType 
Lets see, which value will not work.

Change-Id: I7007528223ab6d020c73b2a5aad76e9ad0472a27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-25 15:00:28 +02:00
Marco Bubke
b9bbadcc7a White space fix 
Change-Id: Id5c5af2ae6821e4d84895cbcdcea4c6fec2973eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-25 14:03:55 +02:00
Marco Bubke
a0f17e00e4 QmlDesigner.NodeInstances: Fix supported type because of qvariant changes 
Change-Id: Iec63a16218420e546e612909380dcd4f5bdb4a30
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-25 14:03:49 +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