Commit Graph

177 Commits

Author SHA1 Message Date
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
Marco Bubke
6994079f96 QmlDesigner.NodeInstance: Better content check
Fix rendering bug for repeaters.

Change-Id: I1c56bb63ff91cd8f58e349b0f8b038d1dd7d40e9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-23 10:44:51 +02:00
Marco Bubke
ac4df34db7 QmlDesigner.NodeInstances: Polish items for data collection
Change-Id: I3ca322ae72b546b0a55162f376a2895642c7a187
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-19 12:20:19 +02:00
Marco Bubke
e6fe6c0f1f QmlDesigner.NodeInstances: Fix compile
QQuickView::rootItem() changed to QQuickView::rootObject()

Change-Id: I6aff12f616a5e9a968d3a646bc635c4976750ed4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-19 09:49:22 +02:00
Marco Bubke
ce911e04c5 QmlDesigner.NodeInstances: Compile Fix
Change-Id: I1eef61360841c774d6b79887ee312f8d4bf50f8e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-18 12:59:22 +02: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
19c561c505 QmlDesigner.NodeInstances: Don't send empty image for preview
Change-Id: I0bb327edd702d395023f433e5225a85ecec02d4a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-15 16:32:21 +02:00
Marco Bubke
dffb1cde67 QmlDesigner.NodeInstances: Don't create preview for non root item
Change-Id: I4456cff66c2e532a787f176bd6d62bbda80fb4f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-15 16:32:02 +02:00
Marco Bubke
139f564599 QmlDesigner.NodeInstances: Fix node updating
Change-Id: I2aebcaf618251b85764712be7dd5dc3c863c3ba9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-15 16:31:47 +02:00
Thomas Hartmann
c76ddfc489 QmlDesigner.Instances: crash fix
During destruction both new parent and old parent are invalid.
The intPositioner flag is not updated (isInPositioner()) and we crash.
The check for parentInstance() avoids this.

Change-Id: I5224c58bb461956f7ce2c47349650913975aa836
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-15 14:35:27 +02:00
Thomas Hartmann
16c5a1493d QmlDesigner.instances: crash fix
NodeInstanceServer::clearScene() deletes the objects.
The m_designerSupport hold pointers to all objects for cleanup
in destructor.

Change-Id: I5ad4361d0c1de6f9eb9fb0d5cd80cf66717ce7fd
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-12 10:33:59 +02:00
Marco Bubke
f0d4199dfa QmlDesigner.NodeInstances: Fix rendering code path
Change-Id: I2a479e85d7ea6f5803d78d3e2ce86849c882c5a3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-11 17:58:11 +02:00
Marco Bubke
05c1e7925d QmlDesigner.NodeInstances: Fix rendering of child items of components
Change-Id: I96d888bb97e334ff9a2a8fa3e8c2bcb931b247c1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-11 17:55:44 +02:00
Marco Bubke
8542c063ec QmlDesigner.NodeInstances: Create a component with a file path
We used a url but anyway this is not necessary anymore.

Change-Id: Ia616fca573f941dd638141a05c0c36640fed90e9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-11 17:55:30 +02:00
Marco Bubke
42aad1fd75 QmlDesigner.NodeInstances: Fix compiling
Change-Id: Ica08aaadca52bb416346d871bc9555fb450654f6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-11 17:55:20 +02: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
baa75926c2 QmlDesigner.NodeInstances: Quick Window Manager Support
Change-Id: I94239275ebd55bafbd7bc9650409c24471214546
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-09 14:29:26 +02:00
Marco Bubke
ca58138102 QmlDesigner.NodeInstances: More pointer fixes
Change-Id: Ibffe642952bc135420d123dc1d271f4e2b764749
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-09 14:29:02 +02:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
2012-10-09 11:50:17 +02:00
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 11:10:50 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Thomas Hartmann
76759f2400 QmlDesigner: fix qml2puppet .pro file
Change-Id: I697a5e8d11b0aef926dd79a5e45a63ffdc567353
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-05 12:57:17 +02:00
Marco Bubke
a19495ba20 QmlDesigner.NodeInsatnces: Update positioner if binding is changing
Only if the expression of the binding is changing.

Change-Id: Ief702082dff0ac473c8ade6f3fc0f0cf36e017f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-04 19:20:06 +02:00
Marco Bubke
3982bc22d7 QmlDesigner.NodeInstances: QWeakPointer -> QPointer
In Qt5 QPointer should be used instead of QWeakPointer fo QObject tracking.

Change-Id: Ic9cdfaea77574bcf866716ded62bbf2d350d02f8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-04 19:19:49 +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
Thomas Hartmann
b9e550f702 QmlDesigner: create stub project to build qml2puppet
This allows building qml2puppet as part of Qt Creator,
if Qt Creator is based on Qt 5.

For the moment it has to be build manually.

Change-Id: Ide3490fe09c1543d1e09506403f6de1c0bc3819c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-04 17:01:00 +02:00
Marco Bubke
18d34fef04 QmlDesigner.NodeInstances: Share NodeInstanceClientProxy between puppets
Change-Id: I49ffa49e45d12950150bedfa8452de4c89674ef8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-01 17:10:28 +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
fe97c7f4ad QmlDesigner.NodeInstances: Diable caching for NodeInstanceMetaObject
Change-Id: I56a74c4000418f1e41866f4b084ea483587a6f0e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-27 16:30:14 +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
4d76f0db17 QmlDesigner.NodeInstances: Remove QGraphicsObject for qml2
Change-Id: Ifcc81fa1dd01ab1f2c6d826e8ff438a8df577063
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-27 16:29:58 +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
Eike Ziller
a55d47544a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
2012-09-26 10:01:04 +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
b55f9a84b3 QmlDesigner.NodeInstances: Use windowTransform instead of canvasTransform
Change-Id: I157c5346bbc69a10166a74df5a5a4f8bdfadd9fd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-25 15:00:33 +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
d7bd46dbe6 QmlDesigner.NodeInstances: Add end puppet command
Change-Id: Ice3c6ce1bb0d16d4ffbc33557b12fa147ac6058c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-25 14:03:33 +02:00
Daniel Molkentin
745cb4b7ec Introduce $$QTC_PREFIX
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...

This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.

Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install

Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-09-25 10:14:51 +02:00
Marco Bubke
f6f59c08d5 QmlDesigner.NodeInstances: Use the 4.8 QDataStream
The 4.8 Version of QDataStream is the lowest common denominator.        temporaryOutDataStream.setVersion(QDataStream::Qt_4_8);

Change-Id: I4aa681473b6349bd3e859f49d7233ff4a6d2911b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-24 11:46:34 +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
Marco Bubke
ce9b7bf123 QmlDesigner.NodeInstances: Shared memory for value changes
Change-Id: I3c3455f411f18322a062f144e98461691d12ada8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-09-11 15:41:41 +02:00
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.

This reverts commit c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:40 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.

QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.

Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-05 16:37:42 +02:00