Commit Graph

250 Commits

Author SHA1 Message Date
Tim Jenssen
dce26fc29d QmlDesigner: use engine argument like all similar methods
Change-Id: I1238cbd60e38ade3f54937ca8f901517c543a3ad
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-09 18:08:44 +02:00
Tim Jenssen
0ecc1114bd QmlDesigner: remove unnecessary spaces/lines
Change-Id: I867ab5afc82e67644b7004e97886b46250f5d3df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-09 18:08:09 +02:00
Tim Jenssen
80bc7f79bc QmlDesigner: remove commented connect
The connected SLOT is even not existing any more.

Change-Id: Iea352ca4929146c20b897e1a8fbb00a601364068
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-09 18:07:29 +02:00
Tim Jenssen
2bd550f3fd QmlDesigner: import only working imports
Change-Id: Ic7d74237eeb86e34925f1b048befa5da9420c278
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-26 15:13:39 +02:00
Eike Ziller
914adeab82 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
2014-09-16 15:17:21 +02:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:10:01 +02:00
Tim Jenssen
4ca49dc909 QmlDesigner: add more specifics
Fix: QTCREATORBUG-12798

Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-09 16:21:44 +02:00
Tim Jenssen
d6fbffbff0 QmlDesigner: clean up QWeakPointer use
Change-Id: I314519f7458d4b87e2056cca1ce35f8604f1f51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-05 15:16:46 +02:00
Thomas Hartmann
b6e6e0123c QmlDesigner.NodeInstances: Fixing enums for int properties
There is no easy way to convert an enum (e.g. Qt.Vertical) to the
integer value without the meta object/QMetaEnum.

For this reason we evluate the enum as an expression
if the target property is int.

Without this patch enums do not work at all for properties defined as int.
Change-Id: I9363a84eef1bf4a3ed2c40b35f7439e249e9bd98
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-21 13:59:15 +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
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
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
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
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
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
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
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