feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
43,983 Commits 108 Branches 368 Tags
750664dac6829b5deb487e58148314c0d8d2b219
Commit Graph

321 Commits

Author SHA1 Message Date
Marco Bubke
6cee8a42ff QmlDesigner: Add test if the instance exists 
Change-Id: I03f7e32aa0eda1f493c24ba174c706f4b8b0442c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 13:08:41 +02:00
Marco Bubke
029cd279c3 QmlDesigner: Don't try to access invalid node instances 
Task-number: QTCREATORBUG-12444
Change-Id: I021e9669137de51c8feb0d7227d6d4c65a4d710c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 13:08:34 +02:00
Marco Bubke
87e518ab53 QmlDesigner: Improve NodeInstanceServer::hasInstance 
Test if instance is valid.

Change-Id: I748f3f95a2ad0669899e8029fdde4de0658ad11b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 13:08:26 +02:00
Thomas Hartmann
f3270472ee QmlDesigner.NodeInstances: blacklist QtMultimedia/Audio 
Change-Id: I7d16ae74ea848e848ac6dc2d8c8bb9c468681889
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-12 18:07:03 +02:00
Orgad Shaneh
93c94d65a8 QmlPuppet: Pass const strings by reference 
Change-Id: I6bf60d6484f13817dcbe36a4bfc099f3edf7559c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-21 13:29:31 +02:00
Orgad Shaneh
82aa1380f2 Cleanup whitespace 
Mostly trailing whitespace

Change-Id: Ic324d20e8159c9d255895248ce04f25c692daf46
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-05-16 14:27:13 +02:00
Marco Bubke
75fa87eebb QmlDesigner: Fix drag and drop 
Task-number: QTCREATORBUG-12227
Change-Id: I02c3bd81ab2b6585d35bab60550788f461e77732
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-14 11:36:32 +02:00
Marco Bubke
0f55582835 QmlDesigner: Fix wrong order after dropping a item in the navigator 
The component complete command is reparenting a item so it is appended. To
get the right order the ChildrenChangedCommand should be sent after
ComponentCompletedCommand.

Change-Id: Id4c1025fc7b4d7f25a7db7511029013c24441dd3
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-08 17:42:07 +02:00
Orgad Shaneh
41fe19cdc7 QmlPuppet: Remove redundant null validations 
Change-Id: I909119533646e0b29724212f764eb2685b683044
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-06 15:41:25 +02:00
Marco Bubke
e9096120ad QmlDesigner: Fix ignored properties for reparenting 
We reparented into ignored properties. Now there is a more general mechanism
to prevent this.

Task-number: QTCREATORBUG-11970
Change-Id: Icbd5877dc13c65963079eb3ab67e48bb92056b53
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-17 18:02:28 +02:00
Marco Bubke
37b1dc871f QmlDesigner: Merge GraphicalNodeInstance back in QuickItemNodeInstance 
Change-Id: I2f5412887a66186d215e56101a63bacfda4f8e0a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-17 18:02:06 +02:00
Marco Bubke
c7699c1121 QmlDesigner: Remove QuickWindowNodeInstance 
Change-Id: I164b38286a4a4b1ff642c1cfdb8cd19477ad9fa1
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-17 18:01:42 +02:00
Marco Bubke
a0a36db59b QmlDesigner: Set root NodeInstance as root item in the view 
Change-Id: I305bc7bd0c369cd9dfcd68d7d79952c6a669b62c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-17 18:01:18 +02:00
Marco Bubke
9818f714f4 QmlDesigner: Use the root NodeInstance for item collection 
Change-Id: I0ed67997c371af8acb3db480446ea5d577380804
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-17 18:01:02 +02:00
Marco Bubke
3483365f01 QmlDesigner: Add root item getter to ServerNodeInstance 
Change-Id: I9f31390b478d8638038998682fb606dea5d1c81a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-16 17:16:03 +02:00
Marco Bubke
38220ba4bb QmlDesigner: On demand compilation of the puppet 
Before we had to provide the puppet in the packaging. Now we compile the
puppet on demand so we can be sure it is always there in the right version
and working.

Task-number: QTCREATORBUG-11763
Change-Id: I8556ef677ed27fbcc8a7775dced60230104e3237
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-04-09 16:01:05 +02:00
Eike Ziller
48b8947dc2 qml(2)puppet: Avoid ugly logic with generating Info.plist file 
The Info.plist was generated for putting the Qt Creator version into it.
Since that is not very useful nor necessary information, we can just
avoid the whole generation, and make the logic much simpler.

Change-Id: I71a12dc7e53970e3ef136e8abc78077dfba3326e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-07 13:49:27 +02:00
Marco Bubke
46c083c2eb QmlDesigner: Don't set anchors for the root item 
Task-number: QTCREATORBUG-11800
Change-Id: I6d23b23f250ccef76c7b9182071770a4f4f490f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-03-25 15:46:19 +01:00
Marco Bubke
d59f5c1955 QmlDesigner: Don't instance MediaPlayer 
Task-number: QTCREATORBUG-11323
Change-Id: I37629f9d6cdcb1ff12bc86ed9296e8d5af744ac4
Hotfix: 3.1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-03-20 18:28:02 +01:00
Thomas Hartmann
8d563e7b8d QmlDesigner: Revert bumping the puppet version 
Since Qt Creator 3.1 will be released before Qt 5.3,
bumping the version number and enforcing to rebuild the puppet
creates a huge hurdle for end users.

Change-Id: Ic85a2ed315cf67b7d47bdfa492e6c5d2adf719d9
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-03-17 15:23:20 +01:00
Kai Koehne
e2ac45bf7e Remove script-private dependency from qml2puppet 
Change-Id: If040844310105970f645f413cfc005abdb95994c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-03-17 13:09:12 +01:00
Marco Bubke
f01fe61fa4 QmlDesigner: Hotfix for all Windows 
Now all windows are exchanged with items.

Change-Id: Ieecd4410c92a1e4f63b1035843a8534e92199b98
Hotfix: 3.1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-03-12 16:14:39 +01:00
Thomas Hartmann
541b5141f2 QmlDesigner: Bump version of qml2puppet for Qt Creator 3.1 
Change-Id: I57aae18fec28f01425cc13285504f57aef3afd25
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-03-12 11:21:43 +01:00
Marco Bubke
065253a259 QmlDesigner: Ugly hack for the Window bug 
Window is not working so we exchange it with an item. We need a better
approach for it in the next release. Revert this patch in master.

Hotfix: 3.1

Task-number: QTCREATORBUG-11601
Change-Id: I047dd558f8813cc8b3b6c8bad3394c3cf30c8d8e
Signed-off-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-03-12 11:20:04 +01:00
Eike Ziller
b03a981a41 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
 2014-02-11 09:14:22 +01:00
Thomas Hartmann
f206d8bae5 QmlDesigner.QmlPuppet: Adding CONFIG += console 
This is required for the version check,

Change-Id: I9845260b029e8e01eb71e92c78d40f2a842a5f46
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-01-22 13:44:16 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Eike Ziller
e035ae6df1 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/stdtypes.py
	src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp

Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
 2013-12-18 11:02:16 +01:00
Thiago Macieira
9dd60b34f8 Fix use of variable before initialization 
That's what you get for shadowing a variable... The "childItem" variable
on the second part of the foreach refers to one declared on the first
part, which is uninitialized.

Found by ICC 14.0:
graphicalnodeinstance.cpp(300): warning #592: variable "childItem" is used before its value is set

Change-Id: I9079a428eda90f4bb06f9ccd1adf836fee119133
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-12-16 21:47:21 +01:00
Marco Bubke
07222ba46a QmlDesigner: Refactor enumeration handling 
Change-Id: I0e163147a0303741af52127ece6f6afd0d2aa658
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-12-16 12:55:06 +01:00
Marco Bubke
2f040fc6ad QmlDesigner: Change version number of the puppet to 2 
Change-Id: I0aafaf76a6d4d6edfd4c3ccc73b702edbbfaa385
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-18 12:42:04 +01:00
Marco Bubke
765242637a QmlDesigner: Fix composite hack in the ObjectNodeInstance 
There was no check for the else branch that the type pointer is null.

Change-Id: I0c40eb86f324033dc7878465bd5f603d9b96df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-18 12:41:43 +01:00
Tobias Hunger
d8c51d9a2a QmlPuppet: Fix build failure for Qt with versions >=5.0 and <=5.2 
QQmlType::isComposite and QQmlType::sourceUrl are both unavailable
when used in objectnodeinstance.cpp

Change-Id: I21f66b00348c0535b4779206bd63e363f4b2c225
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-14 13:12:59 +01:00
Marco Bubke
0071c80a93 QmlDesigner: Fix non updating of scene matrix if parent transform changed 
Task-number: QTCREATORBUG-10644
Change-Id: Ib112352e539fde4eefb8c029080c688bed8a0ebd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-11-07 16:35:11 +01:00
Thomas Hartmann
262a1e262d QmlDesigner.Qml2Puppet: fixes for composite types 
Composites types need their own code path.

Change-Id: Ia1b14bf4f8519f786c08b94f168ec369d79defc0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-29 14:30:05 +01:00
Marco Bubke
a2c0b91ec5 QmlDesigner: Disable componentComplete for primitive creation 
Control are now in a qrc file and the component are registered as Qml
types. We are using the primitive creation path in this case so we have
to disable the componentComplete call.

Change-Id: I52936b92d936acbfc21ba800ffca9123fcece864
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-24 09:48:04 +02:00
Christian Kandeler
bdc26d9379 Do not set the QT_CREATOR macro for the QML puppet. 
It's not Qt Creator. And otherwise the build breaks with a namespaced
Qt.

Change-Id: Ib30ef86fbc59a02f6fd60d2f0b0b8f4ab452ef6d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-10-23 16:55:37 +02:00
Marco Bubke
5f61d91648 QmlDesigner: Fix movement of items 
Change-Id: I22440c949f634b60ec90803aa6b61bbcf819ea48
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-30 13:53:26 +02:00
Marco Bubke
8336a1b7ec QmlDesigner: Remove qDebugs 
Change-Id: Iab635145cb2cde87c8d229983e1436910e90f0e4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:42 +02:00
Marco Bubke
bd9cf4bc87 QmlDesigner: Don't move items in a layout 
Change-Id: I9050b11d50d39726e2a19cabb7709020738a5c95
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:36 +02:00
Marco Bubke
820223a8f5 QmlDesigner: Re factor inline methods in NodeInstanceMetaObject 
Change-Id: I9130b166a077fd0add21b65cab8fa7eee829386d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:22 +02:00
Marco Bubke
2507a24ba9 QmlDesigner: Use QQuickView::setContent to set root component 
Change-Id: I8d5700c71fd4e46f0463bf02195506251f71a853
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:11 +02:00
Marco Bubke
a25f30d6c4 QmlDesigner: Remove unneeded QtQuick import 
Change-Id: Iab41ff8f1c197238c3cf78c6f99d78ee349b2137
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:39:59 +02:00
Marco Bubke
b00a7f0311 QmlDesigner: Fix attached properties call 
Accessible.role for example was not found.

Change-Id: Ibd2f47d43705d5d450e572cbb9c786c75f7912b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-10 16:03:52 +02:00
Nikolai Kosjar
69fc3cf03f Kill ";;" at end of statement 
Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-09-04 09:19:10 +02:00
Marco Bubke
7be0100298 QmlDesigner: V8 is not anymore present in 5.2 
Change-Id: Ie154a02719f4706b9edc872767b137fe6f9977bc
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-08-22 12:27:07 +02:00
Marco Bubke
04f29127a1 QmlDesigner: Fix transformation bug for tab widgets 
Change-Id: Idc33ddf04f0b6fc317aeb5ed72fd7164ba174ab4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-08-15 15:51:02 +02:00
Marco Bubke
0dd5f68152 QmlDesigner: Rename actualState in currentState 
Change-Id: I49f80126a3fc0184a3b18352ed2adc24e50040c7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-31 16:37:29 +02:00
Marco Bubke
44bbfa3bc4 QmlDesigner: Better argument checking for the qml2puppet 
Change-Id: Ib4c83d9bb30705c23b9966696ebc7015501da154
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 14:19:42 +02:00