Commit Graph

57 Commits

Author SHA1 Message Date
Marco Bubke
3146340211 QmlDesigner: Get whole values for value types too.
Task-number: QTCREATORBUG-12130
Change-Id: Ic43826060d9ce38aded7fc3a68dff2ea6860bfc1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 17:54:39 +02:00
Marco Bubke
fd732ac0cb QmlDesigner: Support enumerations for aliases
Task-number: QTCREATORBUG-12229
Change-Id: I36632cdcf16a2d391b653be71f2df58cb8814a21
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-10 17:56:28 +02:00
Marco Bubke
d74521d0ae QmlDesigner: Use Rectangle instead of Item for dummy Window
Task-number: QTCREATORBUG-12484
Change-Id: I6d96367159dd813531046af4412bc10e5cb5df0f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 15:43:01 +02:00
Thomas Hartmann
f3270472ee QmlDesigner.NodeInstances: blacklist QtMultimedia/Audio
Change-Id: I7d16ae74ea848e848ac6dc2d8c8bb9c468681889
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-12 18:07:03 +02:00
Orgad Shaneh
41fe19cdc7 QmlPuppet: Remove redundant null validations
Change-Id: I909119533646e0b29724212f764eb2685b683044
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-06 15:41:25 +02:00
Marco Bubke
e9096120ad QmlDesigner: Fix ignored properties for reparenting
We reparented into ignored properties. Now there is a more general mechanism
to prevent this.

Task-number: QTCREATORBUG-11970
Change-Id: Icbd5877dc13c65963079eb3ab67e48bb92056b53
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-04-17 18:02:28 +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
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
d59f5c1955 QmlDesigner: Don't instance MediaPlayer
Task-number: QTCREATORBUG-11323
Change-Id: I37629f9d6cdcb1ff12bc86ed9296e8d5af744ac4
Hotfix: 3.1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-20 18:28:02 +01:00
Marco Bubke
f01fe61fa4 QmlDesigner: Hotfix for all Windows
Now all windows are exchanged with items.

Change-Id: Ieecd4410c92a1e4f63b1035843a8534e92199b98
Hotfix: 3.1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 16:14:39 +01:00
Marco Bubke
065253a259 QmlDesigner: Ugly hack for the Window bug
Window is not working so we exchange it with an item. We need a better
approach for it in the next release. Revert this patch in master.

Hotfix: 3.1

Task-number: QTCREATORBUG-11601
Change-Id: I047dd558f8813cc8b3b6c8bad3394c3cf30c8d8e
Signed-off-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-12 11:20:04 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01: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
07222ba46a QmlDesigner: Refactor enumeration handling
Change-Id: I0e163147a0303741af52127ece6f6afd0d2aa658
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-12-16 12:55:06 +01:00
Marco Bubke
765242637a QmlDesigner: Fix composite hack in the ObjectNodeInstance
There was no check for the else branch that the type pointer is null.

Change-Id: I0c40eb86f324033dc7878465bd5f603d9b96df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-18 12:41:43 +01:00
Tobias Hunger
d8c51d9a2a QmlPuppet: Fix build failure for Qt with versions >=5.0 and <=5.2
QQmlType::isComposite and QQmlType::sourceUrl are both unavailable
when used in objectnodeinstance.cpp

Change-Id: I21f66b00348c0535b4779206bd63e363f4b2c225
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-14 13:12:59 +01:00
Thomas Hartmann
262a1e262d QmlDesigner.Qml2Puppet: fixes for composite types
Composites types need their own code path.

Change-Id: Ia1b14bf4f8519f786c08b94f168ec369d79defc0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-29 14:30:05 +01:00
Marco Bubke
a2c0b91ec5 QmlDesigner: Disable componentComplete for primitive creation
Control are now in a qrc file and the component are registered as Qml
types. We are using the primitive creation path in this case so we have
to disable the componentComplete call.

Change-Id: I52936b92d936acbfc21ba800ffca9123fcece864
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-24 09:48:04 +02:00
Marco Bubke
5f61d91648 QmlDesigner: Fix movement of items
Change-Id: I22440c949f634b60ec90803aa6b61bbcf819ea48
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-30 13:53:26 +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
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
d0afdfcc2b QmlDesigner: Remove unused function in ObjectNodeInstance
Change-Id: I4286439082f25fa1eeaf4b90ae3d00aedd80cd51
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-11 16:44:46 +02:00
Marco Bubke
65b99d1d8a QmlDesigner: Remove recursive NodeInstanceMetaObject creation
Change-Id: I3e5f46413767f5d1649a0c526f69f434e897b597
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-06 18:01:32 +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
4f28228293 QmlDesigner: Fix anchoring for application window
We don't tested that target anchor object are node instances. Now we
search for the parent object recursively.

Change-Id: I2e03e714f858a285309b02f5e88c757f0dcfe7e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-21 17:13:48 +02:00
Marco Bubke
f68bd231c8 Revert "QmlDesigner: Remove NodeInstancesSignalSpy"
This is fixing some anchor movement bugs.

This reverts commit ae409f8bdf.

Change-Id: Ibe9b8b2601e2bcd1c249b5feda06fb3a29482f4b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-21 13:08:10 +02:00
Thomas Hartmann
9763e9e325 QmlDesigner.Instances: always set the QObject parent.
We follow the QmlEngine/VME and always set the QObject
parent before reparenting into list properties.

Also we set the QObject parent for all objects.

See qqmlvme.cpp line 622
QQml_setParent_noEvent(o, parent);

Change-Id: If889e6cc07e99ea443b80de13c4be9dce6c2ceee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-30 13:08:22 +02:00
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
2013-04-30 11:43:33 +02:00
Marco Bubke
a58810ce9e QmlDesigner: Do componentComplete for QObjects with QmlParserStatus
Change-Id: If7ea6c55f4540a8bde113076288c0e9c6dd1210f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 12:45:35 +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
Thomas Hartmann
fd9d39c12a QmlDesigner.Instances: properly disable component complete for 5.1
This is only available in Qt 5.1

Change-Id: I76b7916b4ce64c440c175e77edc2b0a3ef015166
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-22 18:19:24 +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
Eike Ziller
55de6a9fb9 Merge remote-tracking branch 'origin/2.7' into HEAD
Conflicts:
	src/plugins/coreplugin/generalsettings.cpp

Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646
2013-04-18 12:54:37 +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
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
2013-04-18 09:22:19 +02:00
Marco Bubke
5d3c1a2a2b QmlDesigner: Remove old functions in instances
Change-Id: If886ca208de775472c4e97e986c2f4df81615959
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:00 +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
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
2013-04-11 18:27:52 +02:00
Thomas Hartmann
8a9fc63555 QmlDesigner.Instances: blacklist certain properties
For those properties the QQmlProperty constructor does crash.

Change-Id: Ia78583e080ced936d98517ce0d3244d3040f8ceb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-11 12:10:23 +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
Marco Bubke
ae409f8bdf QmlDesigner: Remove NodeInstancesSignalSpy
Not anymore needed.

Change-Id: Ia1f4d20138b43184b78fd4f39c391af524072dd2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-03-18 16:45:39 +01:00
Marco Bubke
29bef4c280 QmlDesigner: Fix byte padding
Change-Id: I6c7562883e9ade627fad4cdf553765e164ceaf81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-03-05 12:47: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
Orgad Shaneh
6e7b51f941 Qml2Puppet: Fix compilation with qtdeclarative master
e0cb13a5 - Move no-Gui related QML types from QtQuick into QtQml
55f6a109 - Renamed QQuickItem::pos property to position

Fix some warnings

Change-Id: Iec9fe3f543f900a177d55c5de3a636bb296cbc49
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-12-10 11:27:46 +01:00
Marco Bubke
1b23a4a410 QmlDesigner.NodeInstances: Fix color reset value
There is the color property with the r, g, b, a sub properties.
Before this change we only saved the default of the sub properties.

Change-Id: I11d4b0ed83cf8469836099a4f65942d7e8c8d8a6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-22 12:16:07 +01:00
Marco Bubke
7ebc7bfb80 QmlDesigner.NodeInstances: Remove unused functions
Change-Id: I597144577c74090c2f8e58a2f3246acc922a43a0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 14:09:45 +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