Yoann Lopes [Wed, 1 Jun 2011 09:37:27 +0000 (11:37 +0200)]
Fix Text's underline, overline and strikeout properties for plain text.
Yoann Lopes [Tue, 31 May 2011 12:37:39 +0000 (14:37 +0200)]
Avoid recursive updates in QSGText.
Alan Alpert [Tue, 31 May 2011 00:28:59 +0000 (10:28 +1000)]
Export more VisualModel symbols
Charles Yin [Mon, 30 May 2011 13:30:05 +0000 (23:30 +1000)]
fix shadow build error
Change-Id: I68c8edac98389c487c1ac09bb74d43fdeb85cdc3
Kim Motoyoshi Kalland [Mon, 30 May 2011 11:41:10 +0000 (13:41 +0200)]
Compile fix.
Kim Motoyoshi Kalland [Mon, 30 May 2011 10:46:18 +0000 (12:46 +0200)]
Compile.
Christian Kamm [Mon, 30 May 2011 08:20:29 +0000 (10:20 +0200)]
qmlplugindump: Bump QtQuick.tooling version to 1.1.
Mirrors a change to qmlplugindump in
qtcreator/
715cee76a9e46efb7f8245004aaa8a1c47b1618d
Reviewed-by: Kai Koehne
(cherry picked from commit
10f16bc55b9e5535bc3353260f97a32e18d70cf1)
Christian Kamm [Mon, 30 May 2011 07:24:20 +0000 (09:24 +0200)]
qmlplugindump: Dump revision property.
Mirrors a change to qmldump in
qt-creator/
6e3274240077fc356a37d3de735b3b2da9654d2e
Reviewed-by: Roberto Raggi
(cherry picked from commit
b0392d398e2f28682cdce6e85546d38a838440f7)
Martin Jones [Mon, 30 May 2011 06:35:52 +0000 (16:35 +1000)]
Update SG items with recent GV item changes.
Change-Id: Ib9cadea91ab3717bee0caf2071102a100e81969d
Martin Jones [Mon, 30 May 2011 05:26:06 +0000 (15:26 +1000)]
ListView segmentation fault when setting highlight to null
Setting view highlight to null due to focus change caused a crash
since graphicsview accessed the highlight item after it had been
deleted. Remove highlight item from scene and deleteLater(),
as is done for delegates.
Change-Id: I5bfd59095aca90d3adca805bc4f61c92c192ee1b
Task-number: QTBUG-19509
Reviewed-by: Bea Lam
(cherry picked from commit
b9d5cb9334e7d9da71af169802a01f8d344151a7)
Caio Marcelo de Oliveira Filho [Fri, 13 May 2011 07:01:28 +0000 (17:01 +1000)]
QDeclarativeMouseArea: block context menu events
If the MouseArea accepts the same button used to trigger a context
menu event, it should not let the event to be delivered to item
behind.
This is important for items that do implement contextMenuEvent(), like
QDeclarativeWebView. When there's a mouse area on top of this item and
that accepts the right click (in Linux), the event was still being
delivered and the WebView menu was incorrectly appearing.
QtWebKit bug https://bugs.webkit.org/show_bug.cgi?id=56526 documents this
problem.
Change-Id: I386fac6c96f47b8616e2eeb7e5f97043ba418980
Merge-request: 1185
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherry picked from commit
80db0a1e59658f9e445219fc48d9236a79edca72)
Martin Jones [Fri, 13 May 2011 05:28:30 +0000 (15:28 +1000)]
ListViews loses items if all visible items are removed.
Occurs when at end of list and all visible items are removed in
multiple steps, without entering the event loop.
We were not updating visibleIndex if there were no visible items
when handling itemsRemoved().
Also avoid skipping items in refill if there are no valid visible
items for reference.
Change-Id: I2ff58fb191f6b053f33d5446220d597eb15b66d4
Task-number: QTBUG-19198
Reviewed-by: Bea Lam
(cherry picked from commit
576d577438f1193bbc934e904b809d5b23b8d54e)
Martin Jones [Thu, 5 May 2011 04:18:28 +0000 (14:18 +1000)]
Views do not notify count changes properly
The views don't have a valid count until both a model and a delegate
are provided. But, countChanged() is not called when a delegate is
set after the model, so bindings to count were not evaluated. Also
test that count is updated for insertion/removal
Change-Id: Ic82039a624c02f0bdb2862ac7a6e215df75bb314
Task-number: QTBUG-19037
Reviewed-by: Bea Lam
(cherry picked from commit
4fbcb6a531bf424a8dbbbd0ca2947d9e15118885)
Martin Jones [Thu, 5 May 2011 03:24:32 +0000 (13:24 +1000)]
Uninitialized memory is compared.
Memory is allocated and used without first clearing it. At
the least this annoys valgrind, but also has potential for real
problems.
Change-Id: Icf3fd39f44ee0481dd732510e7f8b3ad6cef477d
Task-number: QTBUG-15187
Reviewed-by: Aaron Kennedy
(cherry picked from commit
95aa4e4f9b82c3652ffc93310b190db869d491df)
Girish Ramakrishnan [Wed, 27 Apr 2011 05:53:43 +0000 (15:53 +1000)]
Clear the root index when the model is reset.
Task-number: QTBUG-18839
Change-Id: I46608d7481d820fa74a9be60df1e018e70a761c6
Merge-request: 2598
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherry picked from commit
f6b7ce204ee88be0fedb4cfcff382f208fa4ed33)
Charles Yin [Mon, 30 May 2011 05:24:49 +0000 (15:24 +1000)]
fix qmltest unit test failures
Change-Id: I489d1559411f5804f11f4601e34011bc38742b02
Charles Yin [Mon, 30 May 2011 03:50:46 +0000 (13:50 +1000)]
copy other .qml .js files during build time
Change-Id: I08db54c7cd5d2ae7bbad28440cc36f6332a190c9
Alan Alpert [Mon, 30 May 2011 02:11:53 +0000 (12:11 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 30 May 2011 02:11:24 +0000 (12:11 +1000)]
Export QSGVisualItemModel
Necessary for DataParticles.
Martin Jones [Mon, 30 May 2011 01:42:04 +0000 (11:42 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Martin Jones [Mon, 30 May 2011 01:23:22 +0000 (11:23 +1000)]
qmlvisual is broken and unmaintained. Remove it.
Change-Id: I9d522d3db81586da8f24be2b3becfdbf2968d933
Alan Alpert [Mon, 30 May 2011 00:46:31 +0000 (10:46 +1000)]
Update TextBallons .pro file
Botched the previous alteration
Charles Yin [Sun, 29 May 2011 23:44:27 +0000 (09:44 +1000)]
fix typos
Change-Id: Iff14f7378bf8fa063bd6096a8662d47320564af6
Martin Jones [Sun, 29 May 2011 23:40:57 +0000 (09:40 +1000)]
Fix typo.
Change-Id: Ide770bf31258b84b48ee1f588707c3415d662ccb
Charles Yin [Sun, 29 May 2011 23:40:45 +0000 (09:40 +1000)]
fix the qmltestrunner building errors
Change-Id: Ib544544615d8aa96d2e5af8c82766472e1ed4018
Martin Jones [Fri, 27 May 2011 06:55:30 +0000 (16:55 +1000)]
Mention that positioners may conflict with anchors.
Change-Id: I8c89abcc6dd18915dca0eb9643c2376b2d128a29
Martin Jones [Fri, 27 May 2011 06:31:50 +0000 (16:31 +1000)]
Work around remaining 'make check' failures.
Change-Id: Ie4480d4f05f5d784eb277fa2be6e502da00524f8
Alan Alpert [Fri, 27 May 2011 04:13:49 +0000 (14:13 +1000)]
Make textballon example follow convention
Currently, the qml examples autotest works on a set of conventions
defined in its source code to determine which tests to run.
Alan Alpert [Fri, 27 May 2011 03:41:38 +0000 (13:41 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Fri, 27 May 2011 03:41:13 +0000 (13:41 +1000)]
Update image stream example
ModelParticle has died.
Martin Jones [Fri, 27 May 2011 03:39:15 +0000 (13:39 +1000)]
Some fixes for tests/auto/declarative/examples autotest
Change-Id: I58b4c52c64fc51863f14f50e077c975928e71ebb
Martin Jones [Fri, 27 May 2011 03:00:47 +0000 (13:00 +1000)]
Remove webkit dependencies from qtdeclarative.
The webkit examples and demo should be added to webkit repo.
See https://bugs.webkit.org/show_bug.cgi?id=61596
Change-Id: Iffb2c5eb7f95a9bb563ad61c6002274cec54cd24
Martin Jones [Fri, 27 May 2011 02:07:55 +0000 (12:07 +1000)]
Skip the qdeclarativeimage and qdeclarativeborderimage mirror test
Also mark qmlvisual tests as CONFIG+=insignificant_test
Change-Id: I0febeafca4d9aa08ac17a99c97880520be78a35a
Martin Jones [Fri, 27 May 2011 02:06:20 +0000 (12:06 +1000)]
Revert "Make QSGTextNode back-end for QML's TextInput"
This reverts commit
e430f1336881850a73a54a291e0276160d568212.
Martin Jones [Fri, 27 May 2011 01:30:17 +0000 (11:30 +1000)]
Make tests compile.
Change-Id: Iecb50641f927b82533e25262ba1ab8a0a14a108c
Aaron Kennedy [Fri, 27 May 2011 00:44:13 +0000 (10:44 +1000)]
Remove webkit dependency from test.
This wasn't a real dependency anyway, as all the code that used it
is commented out.
Bjørn Erik Nilsen [Thu, 26 May 2011 13:12:37 +0000 (15:12 +0200)]
Textures not scheduled for deletion while scrolling QML view.
This happened when scrolling a view using an Image delegate (containing
QSGTexture). All textures were deleted at exit, but it is important to
immediately schedule the texture for deletion whenever the delegate is
destroyed to avoid unnecessary high memory consumption.
Task-number: QTBUG-19511
Reviewed-by: gunnar
Alan Alpert [Thu, 26 May 2011 05:30:20 +0000 (15:30 +1000)]
Multi-line sprite files will now work
Charles Yin [Wed, 25 May 2011 03:45:25 +0000 (13:45 +1000)]
Revert "uses the cached argument info"
This reverts commit
68d18d77ebac49c2b863c425969c70c5426864cd.
Charles Yin [Wed, 25 May 2011 03:45:18 +0000 (13:45 +1000)]
Revert "cache the arguments in property cache data"
This reverts commit
30327650798ba63281c7b9344c9d824d00dce82a.
Yann Bodson [Wed, 25 May 2011 03:23:30 +0000 (13:23 +1000)]
Fix QSGImage autotest.
Martin Jones [Mon, 23 May 2011 07:09:58 +0000 (17:09 +1000)]
Implement "mirror" property for BorderImage.
Change-Id: Iee5b252ce1b0d39da42f553cf2ae782ad14d297f
Reviewed-by: Gunnar
Yoann Lopes [Tue, 24 May 2011 09:43:17 +0000 (11:43 +0200)]
Small optimizations in distance-field cache.
Gunnar Sletta [Mon, 23 May 2011 14:04:21 +0000 (16:04 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Gunnar Sletta [Mon, 23 May 2011 11:51:45 +0000 (13:51 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Yoann Lopes [Mon, 23 May 2011 11:39:53 +0000 (13:39 +0200)]
Optimize distance-field glyph recycling.
Unused glyphs in the cache should not be overwritten if they are
immediatly reused after being unreferenced.
Gunnar Sletta [Mon, 23 May 2011 11:45:31 +0000 (13:45 +0200)]
Set paintNode to 0 after deleting it.
Otherwise, we will get crashes if we're switching back and froth
between ItemHasContent set to true and false.
Gunnar Sletta [Mon, 23 May 2011 10:45:12 +0000 (12:45 +0200)]
Don't store texture references after the view has gone away
This is a partial fix only. We will eventually need to get
proper sharing of resources across multiple GL contexts, but this
fixes the autotest and will work for most usecases.
The task QTBUG-19455 has been created to solve it properly.
Eskil Abrahamsen Blomfeldt [Mon, 9 May 2011 10:07:55 +0000 (12:07 +0200)]
Make QSGTextNode back-end for QML's TextInput
To get the benefit of different glyph node backends, the
TextInput item has now been moved over on SceneGraph's
TextNode instead of QPainter, and selections and
decorations are painted using QSGSimpleRects.
Charles Yin [Mon, 23 May 2011 11:41:19 +0000 (21:41 +1000)]
qmltestrunner not installed by default
Alan Alpert [Mon, 23 May 2011 09:04:33 +0000 (19:04 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 23 May 2011 09:04:17 +0000 (19:04 +1000)]
Compile on Mac
Bjørn Erik Nilsen [Mon, 23 May 2011 08:39:58 +0000 (10:39 +0200)]
Fix typo in API: QSGContext::schdelueTextureForCleanup.
Reviewed-by: kim
Chris Adams [Mon, 23 May 2011 05:22:37 +0000 (15:22 +1000)]
Support change slots for properties starting with '_'
According to ECMA-262r3, property names may begin with a letter,
underscore ('_'), dollar sign ('$'), or unicode escape sequence.
We previously supported Change slots for properties only if the
property name began with a letter; this patch adds support for
properties which begin with one or more underscore.
Task-number: QTBUG-17950
Reviewed-by: Aaron Kennedy
Change-Id: I6f28bde18a38e32c2131e0990fe0f69bda36f90e
Chris Adams [Mon, 23 May 2011 05:38:53 +0000 (15:38 +1000)]
Ensure that showDirs is respected in FolderListModel
Calling index() on a QDirModel can modify the filters applied.
This patch to FolderListModel ensures that filtering is reset if
required, so that programmatically selecting a subfolder in a
folder does not cause that subfolder to become visible if showDirs
is set to false.
Task-number: QTBUG-17837
Reviewed-by: Martin Jones
Change-Id: I449321d5170ecedf2a0cb36483d50020305a26dd
Alan Alpert [Mon, 23 May 2011 05:34:05 +0000 (15:34 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 23 May 2011 05:33:06 +0000 (15:33 +1000)]
Remove ModelParticle
Nothing is using it anymore, lets keep it that way.
Yann Bodson [Mon, 23 May 2011 05:20:02 +0000 (15:20 +1000)]
Fix QtDeclarative keyinteraction example
Task-number: QTBUG-19033
(cherry picked from commit
00a72cd1f5aff15d5a3a59d61efd2f5653d7dd34)
Alan Alpert [Mon, 23 May 2011 05:17:20 +0000 (15:17 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 23 May 2011 05:16:00 +0000 (15:16 +1000)]
Split up ModelParticle
Now has DataParticle (with model and delegate) and an ItemParticle
(which you just feed items manually). ModelParticle left for now for
damage control - it will probably just disappear someday.
Yann Bodson [Mon, 23 May 2011 04:44:10 +0000 (14:44 +1000)]
Fix QDeclarativeImage test
Use smaller images that fit in the cache.
Task-number: QTBUG-19425
Alan Alpert [Mon, 23 May 2011 03:08:02 +0000 (13:08 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Mon, 23 May 2011 03:07:21 +0000 (13:07 +1000)]
Fixed switching between particle performance modes
Actually switches shaders, and does not lose emitted particle data.
Charles Yin [Sat, 21 May 2011 13:53:11 +0000 (23:53 +1000)]
qmltestcase.prf moved to qtbase
Bjørn Erik Nilsen [Fri, 20 May 2011 13:04:07 +0000 (15:04 +0200)]
Fixes wrong flipping of textures.
Reviewed-by: Gunnar
Kim Motoyoshi Kalland [Fri, 20 May 2011 12:50:59 +0000 (14:50 +0200)]
Removed virtual type() from QSGNode, member variable instead.
Kim Motoyoshi Kalland [Fri, 20 May 2011 11:42:16 +0000 (13:42 +0200)]
Use QDataBuffer instead of QVector in QMLRenderer.
Using QDataBuffer instead of QVector reduces the number of
memory reallocations.
Kai Koehne [Fri, 20 May 2011 12:25:24 +0000 (14:25 +0200)]
QDeclarativeDebug: Fix autotest
Update the number of objects to be expected
Chris Adams [Fri, 20 May 2011 05:47:46 +0000 (15:47 +1000)]
Fix implicit qmldir imports unit test
Previously, the tst_qdeclarativemoduleplugin::implicitQmldir() test
worked only under shadow-built Qt. Now it works under in-src build
as well.
Reviewed-by: Martin Jones
Change-Id: Ie1395a8b93aba6e02f00bb047169d76f05ec10d9
Martin Jones [Fri, 20 May 2011 05:39:07 +0000 (15:39 +1000)]
Support 'mirror: true' in SG Image element.
Change-Id: Id94e5557e8ebbed4494fb342b87b8b595e01b38b
Charles Yin [Fri, 20 May 2011 03:12:52 +0000 (13:12 +1000)]
fix the build order error
Change-Id: I4b25a67462908367155fee3b104546c94db01b70
Charles Yin [Fri, 20 May 2011 01:57:29 +0000 (11:57 +1000)]
Integrate QtQuickTest into Qt
Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316
Task-number:QTBUG-16082
Martin Jones [Fri, 20 May 2011 01:37:06 +0000 (11:37 +1000)]
Some of the QML C++ methods should be slots.
Change-Id: Ib9465cf2a7638d013ce831f49ed0177741c22ab0
Yann Bodson [Fri, 20 May 2011 01:34:11 +0000 (11:34 +1000)]
Skip test in qdeclarativeimage::noLoading (QTBUG-19425)
Martin Jones [Fri, 20 May 2011 00:36:31 +0000 (10:36 +1000)]
Skip another pixmap comparison test.
Change-Id: Ie9280cfbb74d2ffa2da1ce5b6d1e5153a9b19d0f
Kim Motoyoshi Kalland [Thu, 19 May 2011 14:06:44 +0000 (16:06 +0200)]
Avoid using indices in the RectangleNode implementation.
Task-number: QTBUG-18731
Casper van Donderen [Thu, 19 May 2011 14:08:12 +0000 (16:08 +0200)]
Fix typo.
Kim Motoyoshi Kalland [Thu, 19 May 2011 13:31:35 +0000 (15:31 +0200)]
Improved RectangleNode implementation.
Task-number: QTBUG-18731
Casper van Donderen [Thu, 19 May 2011 12:49:30 +0000 (14:49 +0200)]
Add .pro file to fix build.
Reviewed-by: Kevin Wright
Casper van Donderen [Thu, 19 May 2011 09:12:01 +0000 (11:12 +0200)]
Add TextBalloon QML Scene Grpah example with documentation. I moved an old example over to a subfolder.
Reviewed-by: Gunnar Sletta
Alan Alpert [Thu, 19 May 2011 08:43:59 +0000 (18:43 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Thu, 19 May 2011 08:43:12 +0000 (18:43 +1000)]
Add BurstEmitter, and a simple render path for UltraParticles
None of the intermediate paths are written though. It's all or virtually
nothing.
Kim Motoyoshi Kalland [Thu, 19 May 2011 08:32:41 +0000 (10:32 +0200)]
Update unit test according to intended behaviour change.
The behaviour was changed in commit
9d7eb51da37e8dffbe284fc564c9b9f08a89bea2.
Kim Motoyoshi Kalland [Thu, 19 May 2011 08:26:55 +0000 (10:26 +0200)]
Re-apply "Support mirroring the source rectangle of ShaderEffectSource."
This reverts commit
616c7e768f3d88f6b8be6af72290769e99500e72.
Alan Alpert [Thu, 19 May 2011 08:02:21 +0000 (18:02 +1000)]
Normalize createQmlObject error message
Martin Jones [Thu, 19 May 2011 07:24:07 +0000 (17:24 +1000)]
Fix unstable test.
Change-Id: I336b6a02b763c3be9b01a074f641cb031cf18268
Martin Jones [Thu, 19 May 2011 06:19:44 +0000 (16:19 +1000)]
Link item focus to canvas widget focus.
Change-Id: I7da1db30819c80b48f4c285a43274b668c686826
Andrew den Exter [Thu, 19 May 2011 03:59:40 +0000 (13:59 +1000)]
Remove QEXPECT_FAIL from QSGTextInput test.
The QSGPaintedItem::setContentSize() function has now been implemented.
Change-Id: I620824073143de5e50c8ce2e4f886dc60dd79e64
Kim Motoyoshi Kalland [Wed, 18 May 2011 15:49:06 +0000 (17:49 +0200)]
Fixed crash when Image/ShaderEffectSource source is missing.
Kim Motoyoshi Kalland [Wed, 18 May 2011 11:48:18 +0000 (13:48 +0200)]
Added documentation for GridMesh.
Alan Alpert [Wed, 18 May 2011 11:11:51 +0000 (21:11 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Wed, 18 May 2011 11:10:00 +0000 (21:10 +1000)]
Add UltraParticle
They're not as cool as they sound. Includes example, and the now
pointless SuperParticle (for possible performance comparisions).
Andrew den Exter [Wed, 18 May 2011 07:00:49 +0000 (17:00 +1000)]
Fix test TextEdit preeditMicroFocus test failure.
Port change from QDeclarativeTextEdit test which removed a check for
an update when the cursor position had not changed.
Yann Bodson [Wed, 18 May 2011 06:16:00 +0000 (16:16 +1000)]
Skip mirror autotests while QTBUG-19351 and QTBUG-19252 are not resolved.
Martin Jones [Wed, 18 May 2011 04:15:40 +0000 (14:15 +1000)]
Make SG Text test work by disabling pixmap comparison.
This won't work with scenegraph. Manual test needed.
Yann Bodson [Wed, 18 May 2011 04:16:23 +0000 (14:16 +1000)]
More autotests fixes.
Charles Yin [Wed, 18 May 2011 03:46:16 +0000 (13:46 +1000)]
show initial chart in motion chart example
Change-Id: I39297ced1c532f633a7c9c6c64c0818bbc852084
Charles Yin [Wed, 18 May 2011 03:31:42 +0000 (13:31 +1000)]
fix motion chart example bug
Change-Id: I0d00d224d815210c8ef45f2289e9ec4d0adea6b5
Yann Bodson [Wed, 18 May 2011 03:21:39 +0000 (13:21 +1000)]
Fix QSGBorderImage autotest.
QtQuick 1.0 -> QtQuick 2.0
Chris Adams [Wed, 18 May 2011 02:32:28 +0000 (12:32 +1000)]
Revert "Support mirroring the source rectangle of ShaderEffectSource."
This reverts commit
155faa3b8b1e04241bd53df3eb008d54a71cc667.
The original commit broke behavior enforced by the tst_qdeclarativeqt
unit test, specifically relating to QRectF.