feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
25,878 Commits 108 Branches 368 Tags
fe97c7f4adf73566e5d62c941df5da41ac49e210
Commit Graph

44 Commits

Author SHA1 Message Date
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
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
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
Morten Johan Sorvig
b0cd54c1ec Replace Q_WS_MAC with Q_OS_MAC. 
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.

This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)

Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-26 11:06:12 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Marco Bubke
ed842542a5 QmlDesigner.NodeInstances: Fix crash for dot properties 
Change-Id: I5fcecd6fb1e50220053b2769e549f62203f33a06
Reviewed-on: http://codereview.qt.nokia.com/4075
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-01 19:53:04 +02:00
Marco Bubke
7fa9e52d70 QmlDesigner.NodeInstances: Create effect items only in the render process 
Change-Id: I0506bf898582ba8e26a22f51737eae4d82f06c63
Reviewed-on: http://codereview.qt.nokia.com/4004
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:50:04 +02:00
Marco Bubke
d9b10dca48 QmlDesigner.NodeInstances: Fix header 
Change-Id: Ib272d772f6e8838b71c6ede8222acae4313ecae2
Reviewed-on: http://codereview.qt.nokia.com/4009
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:52 +02:00
Marco Bubke
3937a20f18 QmlDesigner.NodeInstances: Fix frame dropping for last frame 
Change-Id: Id70b1bc0af09293628fe2242f4bebeb30c1ae230
Reviewed-on: http://codereview.qt.nokia.com/4007
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:39 +02:00
Marco Bubke
c13624fb2f QmlDesigner.NodeInstances: Preview images for Qml2 
Change-Id: I00ba96458ab8cb2e9d9766e1ecfeaea15bf2e040
Reviewed-on: http://codereview.qt.nokia.com/4006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:32 +02:00
Marco Bubke
432a36283f QmlDesigner.NodeInstances: Use v8 private headers 
Change-Id: I4c0d8e08a22ee0c5b2602cc7d877071010fd9f88
Reviewed-on: http://codereview.qt.nokia.com/3976
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:18 +02:00
Marco Bubke
abc3a9b716 QmlDesigner.NodeInstances: Provide bounding rectangle for render image 
Change-Id: If1d8e51109eec5e281a1cecdaff7c081a5e6d95d
Reviewed-on: http://codereview.qt.nokia.com/3975
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:12 +02:00
Marco Bubke
bb0900d668 QmlDesigner.NodeInstances: Refactoring dirty to isDirty 
Change-Id: I6344632a8570ad09e38c7d3dc093c42d758bf15a
Reviewed-on: http://codereview.qt.nokia.com/3974
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:06 +02:00
Marco Bubke
9250b611c8 QmlDesigner.NodeInstances: Fix image rendering 
Call DesignerSupport::updateDirtyNode() recursively for every item which is
not under our control.

Change-Id: Ie6c784965d1557ece81176fc405864f1328733f7
Reviewed-on: http://codereview.qt.nokia.com/3972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:55 +02:00
Marco Bubke
50d1087a94 QmlDesinger.NodeInstances: Fix bounding rectangle calculation 
Change-Id: Ia0633416e50da68377a781050e301e5721540d6b
Reviewed-on: http://codereview.qt.nokia.com/3971
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:49 +02:00
Marco Bubke
1e1e4b4f70 QmlDesigner.NodeInstances: Fix function call to parent class 
Change-Id: I4842b91c53b3d9f0b0bc6a950858ce482b173d1b
Reviewed-on: http://codereview.qt.nokia.com/3970
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:42 +02:00
Marco Bubke
b8592f1b98 QmlDesigner.NodeInstances: Remove unused code 
Change-Id: Ibf585ef6f821f73be16888fea550bfe0e0b1bcd6
Reviewed-on: http://codereview.qt.nokia.com/3969
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:36 +02:00
Marco Bubke
ebf7c68705 QmlDesigner.NodeInstances: Remove Qt5 guards 
Change-Id: Ia740b2818dcc287ff82991ae317bcf644c4c0c2a
Reviewed-on: http://codereview.qt.nokia.com/3968
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:23 +02:00
Marco Bubke
991e75d65b QmlDesigner.NodeInstances: Improve SceneGraph support 
Change-Id: Ia5111f972836a1123fe857511325a82aef855449
Reviewed-on: http://codereview.qt.nokia.com/3967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:04 +02:00
Marco Bubke
754b993c36 QmlDesigner.NodeInstances: Add version to puppet 
Change-Id: Id101295520418975a4f569f57709875d7213e9bf
Reviewed-on: http://codereview.qt.nokia.com/2304
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-28 10:14:53 +02:00
Marco Bubke
765ba3b4b9 QmlDesigner: Prevent item hoping for reparenting 
Because of the asynchronous nature of the formeditor the item can be between
to states. This looks like the item is hoping around. To prevent this a token
is sent to the instances and back. For the time frame the painting is disabled.

Change-Id: If7e937cba8171248464ad350bb14438c020b25f9
Reviewed-on: http://codereview.qt.nokia.com/1189
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-06 18:19:28 +02:00
Thomas Murach
a4c4d67772 corrected license headers 
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
 2011-07-06 17:56:15 +02:00
Marco Bubke
7d4194d97b QmlDesigner.NodeInstances: Fix no dummydata 
Task-number: QTCREATORBUG-5296

Change-Id: Ia640e03a4a70f15001ab7476713677c52b964cf8
Reviewed-on: http://codereview.qt.nokia.com/1236
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
 2011-07-06 15:45:16 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com 
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-06 11:14:01 +02:00
Marco Bubke
a49b85eac5 QmlDesigner.NodeInstances: Return the implicit size if the size is invalid 
Task-number: QTCREATORBUG-5240

Change-Id: Ie8be3a2cc728805411a79c1f216ede566c641c17
Reviewed-on: http://codereview.qt.nokia.com/925
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-30 10:50:22 +02:00
Marco Bubke
ddb602536c QmlDesigner: Fix painted bounding rectangle for step childs 
We used only the bounding rectangle of the item under our control. But child
items which are created in a component can be out side of the bounding
rectangle. To fix compute a combined bounding rectangle of the item and all
stepchildren. Stepchildren described the child not create directly by us.

Change-Id: I7f25f112aa5eb2f80cfccec5d358221ab5e35d9b
Reviewed-on: http://codereview.qt.nokia.com/839
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-28 16:26:26 +02:00
Marco Bubke
8fe3302329 QmlDesigner.NodeInstances: Move qmlpuppet to share 
Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7
Reviewed-on: http://codereview.qt.nokia.com/634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-22 18:24:36 +02:00