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

287 Commits

Author SHA1 Message Date
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
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
d8d862f261 QmlDesigner.Instances: Fix type registration 
Change-Id: I85378c0a2884a7c8886482f38bad24210ef33d69
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-24 11:46:28 +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
Christian Kandeler
6d06d47a6e Do not use qMemSet and qMemCopy. 
They are deprecated in Qt 5. Call std::memset and std::memcpy instead.

Change-Id: I53c22283208b4d6fdfcba870c3b141f3c02001bd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-09-21 15:40:27 +02:00
Marco Bubke
f1962c9bd5 QmlDesigner.Instances: Divide qmlpuppet and qml2puppet 
Change-Id: I06be890d22a29790dbd91a0f167b63f055369315
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-19 16:29:53 +02:00
Marco Bubke
c12cefbb51 QmlDesigner.NodeInstance: Add environment variable to disable shared memory 
Change-Id: I4146186d57322e8dd06b5c3baf538c98119ff201
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-09-12 17:23:00 +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
Marco Bubke
505c90dbf7 QmlDesigner.NodeInstances: Improve shared memory for pixmap container 
Change-Id: I69e815d9f08404931823d9ae5abd0919bd4206b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-11 15:41:32 +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
Marco Bubke
93e329e1eb QmlDesigner.NodeInstances: Use SharedMemory for image transfer if available 
Sending images over the local socket is slow, but the Mac has a 4MB limit
shared memory. So we now use what we get and than fallback to the local
socket.

Change-Id: Idf40ee1603572c9e45bb1ed3e1abc7caf19e6fca
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2012-08-30 17:24:47 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug 
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-06 14:55:08 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Tobias Hunger
a2e51f97a2 Remove unused member variable 
Change-Id: Ia5e6fd8a8bf405a3b48ea4e53762623db37378dd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-06-29 13:57:20 +02:00