Commit Graph

122 Commits

Author SHA1 Message Date
Kai Koehne
a6cd9abcd1 QmlDesigner: Fix gcc compilation warnings
Fix warnings from gcc 4.8.

Change-Id: If4fc311ea021d1014141cb123f1d765577efd831
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-25 12:52:12 +02:00
Marco Bubke
893020ae5d QmlDesigner: We should test if untracked items are dirty too
Change-Id: I94db08fff3e7e38a9cc377d06a5aabc6d886b64e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 17:46:01 +02:00
Marco Bubke
cec82a13e1 QmlDesigner: Fix clipping render bug
Clipping is happen over the bounding rectangle, so should provide the
clipped bounding rectangle.

Change-Id: I602da312a7ca327def378a887a75782c61cc680d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 17:45:52 +02:00
Marco Bubke
ea5169a163 QmlDesigner: Improve naming of variables
Change-Id: I8429517b81308f4a6a15b90a1ac7486de49562d9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-24 17:45:44 +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
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
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
Marco Bubke
06cfc22fe2 QmlDesigner: Remove old function
Change-Id: I065a6febd74e13740117e0a5223fa71648a7c430
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-22 11:23:27 +02:00
Marco Bubke
2557e0f39d QmlDesigner: Remove override from non virtual function
Change-Id: I8d0b782df5e0819d7f20c2294aa4be9b017a6cb9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-18 13:59:22 +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
Thomas Hartmann
e311761b57 Fix compilation for Mac OS X
CONFIG += c++11
does not work with clang atm.

Change-Id: I7750b333296ccedf999d2610cca126530f737777
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-17 11:23:33 +02:00
Marco Bubke
ea8c98c2d8 QmlDesigner: Remove stupid code
Change-Id: Ie56c5e26a7ec077b794a4993679ab80a716740ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:26 +02:00
Marco Bubke
2b698e31ed QmlDesigner: Add override to qml2puppet
Change-Id: Ibdf07c4a35b40f3fc78300a1675270f8295bec42
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:20 +02:00
Marco Bubke
e13e6550f5 QmlDesigner: qml2puppet is using c++ support
Change-Id: Ie6ac96b713775db13a02cecdc74849ad97f017e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:52:15 +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
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
0de9237699 QmlDesigner: Add PropertyName usage in instances
Change-Id: Ia7eb8730c61347833c70a3d62787c10e2a3134ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-16 16:51:54 +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
7406761f8f QmlDesigner.Instances: disabling the cursor after completing
The cursor should be disabled after component complete.

Change-Id: I3ee089b23f43b42a478aaacc4073cbdfd0da2323
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-11 12:11:14 +02:00
Thomas Hartmann
f42f73492f QmlDesigner.Instances: function should be static
No reason the export the symbol.

Change-Id: I34a42f866333585774129021777265e8a7524555
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-11 12:10:58 +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
Kai Koehne
d1aa986735 Fix checks for qt modules
The fix in 823d48d218 had a typo
(Qt vs QT). Also fix other places where QT_CONFIG was used to
identify Qt modules.

Change-Id: Ie32b678b959f7b5573574ef87ae7ad92860e8323
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-26 16:41:54 +01: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
Thomas Hartmann
ab675bb143 QmlDesigner: fix memory usage of qml2puppet
In Qt Quick 2 the parent property is writable.
Therefore the InstanceSpy always collected the complete
object tree waisting memory.

Change-Id: I44f2d1ad90ef2bbea34a7cbd414f88cae37e0462
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-03-12 15:17:30 +01:00
Thomas Hartmann
18ad2973ba QmlDesigner: fixing .pro file for mac
The relative path is not correct on Mac for deployed packages.

Change-Id: I379f3d986df118495763811617ffe1a2cfe623ec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-03-06 15:41:04 +01:00
Thomas Hartmann
efb68b0938 QmlDesigner: fix compile for qml2puppet
Change-Id: I3fdb693d66eafc85357da138570d58586a57e592
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-07 12:45:02 +01:00
Sergio Ahumada
fb3b01d888 Replace com.nokia.qtcreator with org.qt-project.qtcreator
Task-number: QTCREATORBUG-8189
Change-Id: I1c882f55eed901620ef4944bf1789645b7cff34a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-07 12:40:37 +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
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-16 01:14:08 +01:00
Thomas Hartmann
d8d5c4302c QmlDesigner.qml2puppet: using QApplication
Using QApplication instead of QGuiApplication.

Change-Id: I270877b9dfa89055c816eaa6ca8cbf8b3933abb6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-01-14 15:52:30 +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
0b3eb65fc9 QmlDesigner.NodeInstances: Workaround for property cache
The property cache in the engine is causing a crash if entry is destroyed.

Change-Id: I8bb058b3ae7c8f0c65f1b8f07676ed128e4789d3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-12-05 11:29:57 +01:00
Marco Bubke
abb7bb7880 QmlDesigner.NodeInstances: Use new designer support interface
Change-Id: Idfca7ea37f29df3c60b4a0eacd2b9ef80bbf5754
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-22 12:54:08 +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
7ef1f9d124 QmlDesigner.NodeInstances: Deactivate componentComplete in VME
Change-Id: I18c80e0a6d3206ff863b0466d43375fdb64a6b80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 16:11:22 +01:00
Thomas Hartmann
960801b52c QmlDesigner.instances: fix for QmlPropertyCache
Setting the original parent to preserve data constructed from
the VME.

Change-Id: Ib3c31e129e2f25affee37c97f725c6bfe3fb0286
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:59:52 +01:00
Thomas Hartmann
bd67bd8d63 QmlDesigner: meta object fix
Change-Id: Ia5db0c5293eaf07d5141054f921a80987076532e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:59:25 +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
1600f55f62 QmlDesigner.NodeInstances: Disable text cursor
Change-Id: Ib27752624d658096903dc3b2660f2ee199d7869e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 15:23:20 +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
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
Marco Bubke
bd5881f5b2 QmlDesigner.NodeInstances: Disable animations
Change-Id: I714fbc9d1171e48bfad219ad37a03e5241851c0a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 14:08:12 +01:00
Marco Bubke
befb414748 QmlDesigner.NodeInstances: No animations for positioners
The population should be not animated.

Change-Id: I51313e40d9cd266027ac0838036806d15576b511
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-11-21 14:06:31 +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
Thomas Hartmann
2a624649af Support for QQmlVMEMetaObject and QmlPropertyCache
We have to derive NodeInstanceMetaObject from QQmlVMEMetaObject
to support e. g. alias properties.
The QmlEngine uses QQmlVMEMetaObject to resolve
alias properties.
Also we have to invalidate/recreate the
QmlPropertyCache if we add dynamic properties.

Change-Id: Id52dd8b380eadeb6f74b5171168f2f70c16be118
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-23 16:37:42 +02:00
Marco Bubke
1da50de19c QmlDesigner.NodeInstances: Improve matrix transformation
Compute the matrix to the instance parent instead of the item parent.

Change-Id: I48be1b2be4b2a0db44a6d464751d591df51507fd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-23 11:16:24 +02:00