feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
49,268 Commits 108 Branches 368 Tags
8f74cc3b7c1cb1511e42419a0679515e97474aeb
Commit Graph

522 Commits

Author SHA1 Message Date
Thomas Hartmann
75d9ce0f96 QmlDesigner.NodeInstances: improve mockup for Window 
The window mockup now contains some support for the toolbar of
ApplicationWindow. The status bar is always invisble and just
a place holder.

I reduced the import for QtQuick 2 to support Qt 5.1.

Change-Id: Ic2241bf3fdd0d2967f988add06075a9e145a1cbc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-11 13:53:25 +02:00
Thomas Hartmann
bfdffd2a7d QmlDesigner.NodeInstances: Check expressions 
I do not see any reason to set an expression that contains a
code block.

Change-Id: I74960a6bac741db46d86e33299e8b1669e781e65
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-11 13:44:53 +02:00
Thomas Hartmann
03ac986413 QmlDesigner.NodeInstances: Adding more objects to the ignore list 
There is no real reason to ever instantiate those.

Change-Id: I1bb86b5f5794f10bf2cad124499df6ee8add6909
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-08 09:45:33 +02:00
Tim Jenssen
84bc03c025 QmlDesigner: fix Qt4 compile 
Change-Id: Iad9bd3eaff445b9329452d89da0c641e8c8f25df
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-05 22:27:08 +02:00
Tim Jenssen
e917559319 QmlDesigner: prioritize puppet processes a bit 
Change-Id: I97d846cb46851f8f3067d839aeb0b856298ed0c0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-08-05 16:59:27 +02:00
Tim Jenssen
b7dbbc6ef0 QmlDesigner: fix crash on mac 
Came from two deletions at the same time QCache::remove and
delete on sharedMemory.QmlDesigner:

Change-Id: I6a29cf160c8e81ecd955cf36999edc639fbbb63f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-08-05 16:30:47 +02:00
Tim Jenssen
d315a71c30 QmlDesigner: cleanup code 
Change-Id: Ibebef6313113ff0097586373795e6117b7112876
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-08-05 14:27:08 +02:00
Tim Jenssen
0370fa214a QmlDesigner: Use Q_GLOBAL_STATIC_WITH_ARGS for the global hash 
To be sure that the shared memories are removed at process exit.
And fix that createSharedMemory reuse possible already existing shared
memories now. ("take" -> "[]")

Change-Id: Idcc99ba42b862b862d5403ecf3b781a27fdf757f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-08-05 14:27:02 +02:00
Marco Bubke
80a39815f0 QmlDesigner: Limit native key to 31 letter 
OS X is only supporting a maximum of 31 letters for shared memory names.

Change-Id: I61351228decaa3fa7ec19a6035620ab932cf5386
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-04 15:38:13 +02:00
Christian Stenger
ea675821e3 QmlPuppet: Fix linking on MacOSX 
Change-Id: Ib38b0059c24b9bddb2aa79ba45347e00f8972c77
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-04 10:50:38 +02:00
Tim Jenssen
0cfab4ca43 QmlDesigner: using old QRegExp works on all Qts 
Change-Id: I9650efac738c76b8ace531416ac8e4664f637ffb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-01 11:21:41 +02:00
Tim Jenssen
186f82a730 QmlDesigner: SharedMemory key needs to be the same with all Qts 
Change-Id: I7b514e3d21f0874fec35331e7fd73c209e9b30d7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-01 11:17:30 +02:00
Tim Jenssen
2bfd14dbf8 QmlPuppet: Fix compile with Qt older than 5.2 
Change-Id: I0ef3c5e374b1b01c22b553b99dfbd8eb7783fa90
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-01 10:40:21 +02:00
Marco Bubke
0da08c227f QmlDesigner: Use a POSIX shared memory for unix 
QSharedMemory is using SVR4 shared memory for unix which is limited to
4 MB globally which is really hurting the performance for the designer.
POSIX shared memory is lifting some of this constraints but still has
some bugs on Max OS but generally works better.

Change-Id: I74c1ffd56495f408cd9340cd159190a1175a4086
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-31 16:48:27 +02:00
Tim Jenssen
5778a39317 QmlDesigner: read window mock from file 
Change-Id: Ic525b1d3ac18c42c6abb6a93195e220465dd017f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-30 13:44:01 +02:00
Marco Bubke
0ee609f8fc QmlDesigner: Fix reset width and height 
Task-number: QTBUG-38426
Change-Id: I28e9ed70042c118ff65801c4d07e5a67dc7c3db1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-30 12:34:58 +02:00
Marco Bubke
62645e33c8 QmlDesigner: Fix quotes for mac quick1 puppet 
Task-number: QTCREATORBUG-12746
Change-Id: If749457cd5f9336f7b1708cd05ca073925177a3b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-07-30 12:30:50 +02:00
Marco Bubke
8f3bb6421b QmlDesigner: Fix enumerations properties 
Task-number: QTCREATORBUG-12741
Change-Id: I1ef1909d585732a39bbf80b90512851a10f60600
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-29 19:29:08 +02:00
Marco Bubke
3146340211 QmlDesigner: Get whole values for value types too. 
Task-number: QTCREATORBUG-12130
Change-Id: Ic43826060d9ce38aded7fc3a68dff2ea6860bfc1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-29 17:54:39 +02:00
Tim Jenssen
38e61ea552 QmlDesigner: even read methods need a lock 
Change-Id: I7381d4c236be59ddd2015b83e9d5eb90e2cb2006
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-07-22 11:27:42 +02:00
Tim Jenssen
9898ac50e1 QmlDesigner: fix that an invalid root item refreshes the preview 
Change-Id: I8d917dfd92261a88472bd49577731f5bcf468d49
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-07-22 11:27:35 +02:00
Marco Bubke
fd732ac0cb QmlDesigner: Support enumerations for aliases 
Task-number: QTCREATORBUG-12229
Change-Id: I36632cdcf16a2d391b653be71f2df58cb8814a21
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-10 17:56:28 +02:00
Marco Bubke
6e60c2a0eb QmlDesigner: Make Enumeration::nameToString const 
Change-Id: I311bb1eb0d6511c1e6ef787d2f28eed0d777480c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-10 17:56:16 +02:00
Marco Bubke
b04304ee11 QmlDesigner: Slow down the preview timer 
The painting is slowing down the form editor.

Change-Id: I71afbefff353d23bd25fb9877ee70b896b73b378
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-07 16:09:49 +02:00
Marco Bubke
d74521d0ae QmlDesigner: Use Rectangle instead of Item for dummy Window 
Task-number: QTCREATORBUG-12484
Change-Id: I6d96367159dd813531046af4412bc10e5cb5df0f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-04 15:43:01 +02:00
Marco Bubke
5c551932b4 QmlDesigner: Always test if there is a instance for an id or object 
Change-Id: I90ff8861de8879e300932bd61afb29f8ec3b9fc4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-03 12:17:55 +02:00
Marco Bubke
9cee5d3b22 QmlDesigner: Fix implicitHeight in resetVertical 
Task-number: QTCREATORBUG-11542
Change-Id: Ia69a95abe42ad0c10b8d65663d252f15cf38cf02
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-01 09:33:36 +02:00
Marco Bubke
1526dd0aa6 QmlDesigner: Remove harmful updates 
From the quick1 times we always have done a update but it is not any more
useful and it is triggering a repaint which makes the form editor sluggish.

Change-Id: I8103d03c295aa73e14b4b4fcec15b01069c62754
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 19:39:22 +02:00
Marco Bubke
1014291c01 QmlDesigner: Fix rendering rendering of items 
The else clause was wrong. It should be that it is not a node instance but
it was that it was not a dirty node instance.

Change-Id: I657bbc03826edcb9a1ea46f9c3b44404b2d3f31a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 19:39:16 +02:00
Marco Bubke
05d5b9c3ec QmlDesigner: Always reset the items in the render loop 
To be sure the are not any more dirty. This can be no harm.

Change-Id: I861243f1f4435b0dbdc2a6373ebfdfef12fb2627
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 19:38:58 +02:00
Marco Bubke
a980ea98bb QmlDesigner: Add a special root item of the view too 
Change-Id: Ie7cc58d3793717fce979ccd554060b91bc0d7040
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 18:49:55 +02:00
Marco Bubke
a5c3c9af0e QmlDesigner: Do the dirty test only for non node instances 
The test should stop at the next node instance.

Change-Id: I99daf1215edea34b36434720c44ea7844c4bef34
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-24 18:49:32 +02:00
Orgad Shaneh
4494e74ae7 QmlDesigner: Fix "unused argument" compiler warnings 
Change-Id: Ibfdd61069183a80b322674376200d92d11c06a41
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-06-23 15:30:18 +02:00
Marco Bubke
59e4bc9112 QmlDesigner: Add PuppetAlive command 
The puppet can be dead but we don't now. Now the puppet is sending a alive
signal. If the signal is not arriving anymore we restart the puppets.

Task-number: QTCREATORBUG-12434
Change-Id: I90edab6a45f95950fd764adcb125068659d5354b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 15:00:12 +02:00
Marco Bubke
854a0f25a1 QmlDesigner: Fix recursive all item function 
Change-Id: I074201639a9fcac40d9c3ca4bb50be46edb88957
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-06-18 13:30:00 +02:00
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
8a42154f24 QmlPuppet: Remove duplicate condition 
Change-Id: I2a521aa08347d83b236d490e698081e552381ed7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-05-20 11:44:02 +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
edf23211e2 Revert "QmlDesigner: Hotfix for older puppets" 
It is a hotfix.

This reverts commit de7d2d7aa3.

Change-Id: Ib0165128183b5811fc548aee3b3a82fba376123c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-04-17 18:02:58 +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