feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
63,624 Commits 108 Branches 368 Tags
7a274cc4aa929ef147a2da9918c29253c26f641d
Commit Graph

756 Commits

Author SHA1 Message Date
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
Eike Ziller
9bbafdb506 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/share.qbs

Change-Id: I2ab6080a8cc5315191b33c6df21a835df888a291
 2012-10-18 13:39:47 +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
Friedemann Kleint
2f3730ca47 Adapt .pro, .qbs files and wizard templates to QtQuick1-renaming. 
QtQuick1 is now (again) called QtDeclarative.

Change-Id: Ic75f1a47e972cac470730b53e102e9ab71548c47
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
 2012-10-18 11:47:47 +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
Thomas Hartmann
ad94d4f09c QmlDesigner: fix warning 
Change-Id: I2addb29b617fc682aa766de9e080323133185093
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-02 17:13:22 +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
b21e4fbeb7 QmlDesigner.NodeInstances: Fix merge 
Change-Id: Ib1f4580470ecbec25e6939de82e2f27ec14df5d2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-01 17:05:26 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
 2012-09-27 20:38:57 +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
Thomas Hartmann
7da5ba30ec QmlDesigner: remove hard webkit dependency in qmlpuppet and Qt 5 
Change-Id: Ie198a0e3d8342fb62ff51ec2475134cdf4f9dcea
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit ad535b5b62)
 2012-09-27 09:50:39 +02:00
Thomas Hartmann
7b5d701f31 QmlDesigner: compile fix qmlpuppet with Qt 5 
This patch allows compiling the qml(1)puppet with Qt 5.
Some minor fixes for private headers, cleaning up some old code
and QUrl::UrlFormattingOption got renamed.

Change-Id: I732f9f9ef0b831d09134b1d2c013efda55e36e11
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit fee6b56a7c)
 2012-09-27 09:50:22 +02:00
Thomas Hartmann
4fe44819e6 QmlDesigner: fix for qmlpuppet and Qt 5 
Change-Id: Ie199a0e3d8342fb62ff51ec2475134cdf4f9dcee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 362b8d989d)
 2012-09-27 09:49:54 +02:00
Marco Bubke
1bd4795524 QmlDesigner.NodeInstances: Fix type registration 
Change-Id: I571812c88b323e339f5b4c068f8027d9217da64c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 9e7a8e4118)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-27 09:49:45 +02:00
Thomas Hartmann
ac186ff7ae QmlDesigner: final compile fixes for 2.6 on Qt 5 
Change-Id: Iba13f1b03a641f913d69822ddd623d6bfe38825f
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-27 09:49:41 +02:00
Thomas Hartmann
1bfd2a0c1f QmlDesigner.qmlPuppet: set QDataStream version 
We already did some refactoring on this part in master.

Change-Id: Ia878afa3aa773d2496343e052ababf30da9351d7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-27 09:49:37 +02:00
Marco Bubke
da7c6fb8a3 QmlDesigner.Instances: Fix type registration 
Change-Id: I85378c0a2884a7c8886482f38bad24210ef33d69
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit d8d862f261)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-27 09:49:32 +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
Thomas Hartmann
ad535b5b62 QmlDesigner: remove hard webkit dependency in qmlpuppet and Qt 5 
Change-Id: Ie198a0e3d8342fb62ff51ec2475134cdf4f9dcea
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-26 15:09:28 +02:00
Thomas Hartmann
362b8d989d QmlDesigner: fix for qmlpuppet and Qt 5 
Change-Id: Ie199a0e3d8342fb62ff51ec2475134cdf4f9dcee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-26 15:09:07 +02:00
Eike Ziller
1801688b6e Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2012-09-26 10:25:59 +02:00
Thomas Hartmann
fee6b56a7c QmlDesigner: compile fix qmlpuppet with Qt 5 
This patch allows compiling the qml(1)puppet with Qt 5.
Some minor fixes for private headers, cleaning up some old code
and QUrl::UrlFormattingOption got renamed.

Change-Id: I732f9f9ef0b831d09134b1d2c013efda55e36e11
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-26 10:10:14 +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
9e7a8e4118 QmlDesigner.NodeInstances: Fix type registration 
Change-Id: I571812c88b323e339f5b4c068f8027d9217da64c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-25 16:18:25 +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