Alan Alpert [Wed, 13 Jun 2012 08:49:12 +0000 (18:49 +1000)]
Don't start running if a frame property is set
This fixes an error where running couldn't be reliably set, if a frame
property was also being set during initialization. With this fixed, the
autotest is no longer unstable.
Also fixed is a related issue where start/stop/restart were active
before componentComplete.
Change-Id: I34c6d872f2f146d38c65167eda8c0a97525d7f4e
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Chris Adams [Tue, 19 Jun 2012 06:41:35 +0000 (16:41 +1000)]
Remove hardcoded qdoc3 command from qtdeclarative_doc.pri
Previously, this called qdoc3 directly, which could fail if the system
path had a pre-existing qdoc3 of a different version.
Change-Id: If68e00fd60594590d40f11b08416f220f0806bfb
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Girish Ramakrishnan [Thu, 14 Jun 2012 00:28:00 +0000 (17:28 -0700)]
qmlscene: add --transparent argument
The option makes qmlscene request a format with alpha for the QQuickView.
Change-Id: I6490e606dd0af534147de95783f3a2ddfa8c52c8
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Robin Burchell [Mon, 18 Jun 2012 15:33:58 +0000 (17:33 +0200)]
Small cleanup: remove braces from single line conditionals.
Change-Id: I20588ad0634aebec8374a570179ee43dd1b1dd3b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Charles Yin [Tue, 12 Jun 2012 04:46:12 +0000 (14:46 +1000)]
Align windowShown flag with qml renderer state
Previously, we set windowShown to true once the window is active,
this is not enough for some tests as the initial rendering may not
be finished yet and will give the wrong result for some tests which
require reading back pixels.
Change-Id: Idd67329d207aaf1734a795b40a5bcc40093cf6b8
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Friedemann Kleint [Wed, 13 Jun 2012 10:08:03 +0000 (12:08 +0200)]
QtQuick: Fix warnings about unused variables.
Change-Id: Ibe134810cc67e30a61b42ffa3be73f59c2ef96a2
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Martin Jones [Wed, 13 Jun 2012 01:17:44 +0000 (11:17 +1000)]
Update Flickable velocity/overbound for each axis independently
We were attempting to update velocities/overbound correction for both
axes even if only one of them had changed, leading to inaccurate values
for one of the axes. Also removes a bunch of code duplication.
Change-Id: I6a50b908992c976889373f541bdd1abad462e247
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Martin Jones [Mon, 11 Jun 2012 23:19:35 +0000 (09:19 +1000)]
Set a non-zero default cacheBuffer.
The likelihood of constant framerate when flicking is considerably
improved by having a cacheBuffer. Since there is only a minimal cost
in having a modest cacheBuffer, it is better to have a more optimal
default value - 320 seems a good starting point.
Change-Id: Id3c8a153821573b5b08c6fbd80d34152908d358d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Kent Hansen [Tue, 12 Jun 2012 17:46:48 +0000 (19:46 +0200)]
tst_qquicklistview: further increase test timeout
This test has timed out on a recent test run, but appeared to be
making progress. Increase the timeout, and remove the
insignificant_test flag.
Change-Id: Ic3d5f0dbf43e5d0a284ae87c9fd21552b759cbad
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 12 Jun 2012 06:00:10 +0000 (16:00 +1000)]
Add a version 2 import for FolderListModel
An interim measure to allow FolderListModel using examples to adapt.
Longer term, version 1 will from be the QtQuick 1.0 module and version
2 will be from the QtQuick 2.0 module. This is implemented in change
Ic378b0b9f715422a2b2f4c1037adf3a07ced7c0f.
Task-number: QTBUG-25191
Change-Id: Ic378b0b9f715422a2b2f4c1037adf3a07ced7c0e
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Mon, 14 May 2012 03:01:29 +0000 (13:01 +1000)]
Remove non-templated qobject module api registration function
Previously, both templated and non-templated qobject module api
registration functions were provided as public API. The non-templated
version is identical to the templated version, except that bindings
which access properties of module apis registered with that function
cannot be optimized with v4.
This commit removes the non-templated version of the function.
Change-Id: Ic417aa241f1172bf6d055bdc7f528d7e9304097b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Wed, 6 Jun 2012 02:10:32 +0000 (12:10 +1000)]
Add pixel comparation support to qmltest
Change-Id: Icdee3fab497cc46260bbb9af89f4402fdc027fef
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Yann Bodson [Thu, 7 Jun 2012 03:21:56 +0000 (13:21 +1000)]
Allow setting horizontal and vertical tile modes in sci files
It was still using the old 'tileRule' name.
Also make sci file parser less strict with h/v tile mode values.
Task-number: QTBUG-26022
Change-Id: I41b7571b42a0fb9bd2cfab8ce2e76e57addabefd
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Alan Alpert [Tue, 12 Jun 2012 01:47:13 +0000 (11:47 +1000)]
Emit itemChanged when Loader fails to load a source.
As per the source comment, it is not actually tracked whether item was
null before. This is consistent with the behaviour in loadFromSource,
where setting a source to null always emits item changed.
This is reasonable behaviour, because it only occurs in unexpected error
states where the program logic likely expects a changed signal anyways.
Change-Id: I160ab04dc1b5c578ee508f4adbca65e8da5b16be
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Martin Jones [Tue, 12 Jun 2012 01:54:40 +0000 (11:54 +1000)]
Fix view delegate parent binding regression.
762b4d90110465aeceb96f44cd06dcda229dfe89 introduced a regression by
setting the item parent after completion. This was to avoid rendering
an incubated object before completion. However this breaks bindings.
Restore setting the item parent before completion, and ensure items are
not rendered until completed.
Change-Id: Ifc9d0c34ee62e687889c32ffab7c091b4c8cc470
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Chris Adams [Tue, 12 Jun 2012 07:47:15 +0000 (17:47 +1000)]
Check for null ptr in qmlobject_cast definition
Previously, the input object wasn't checked for nullness, and thus
the qmlobject_cast could assert.
Change-Id: I3552150953cef8411a860a381e28b1d681494b08
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kent Hansen [Sun, 10 Jun 2012 19:06:55 +0000 (21:06 +0200)]
Remove qtbase pin
Change-Id: I0fa3fb45aa26fe4eca15fa0bcb1f67c99925a21e
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kent Hansen [Sun, 3 Jun 2012 19:10:32 +0000 (21:10 +0200)]
Adapt to connection-related changes in qtbase
The QQmlData hooks signalEmitted() and receivers() now receive the
index in the signal index range (i.e., excluding non-signal methods).
This was done to avoid Q(Meta)Object having to compute the class's
method offset; the signal offset should be sufficient for everyone.
This required adapting QQmlNotifier, QQmlBoundSignal,
QQmlPropertyCache and friends to use the signal index range whenever
a property's notify signal is involved in the internal connection
lists and property captures.
Using the signal index range also reduces the memory used for
NotifyList::notifies, since useless entries for non-signal methods
will no longer be created.
Change-Id: I62872fbea5a1f829b8b03bae3fc1e6acd84cf886
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kent Hansen [Tue, 12 Jun 2012 07:52:28 +0000 (09:52 +0200)]
Mark qquickanimatedsprite autotest as insignificant
Failed twice on macx-clang developer-build OSX 10.7 only.
Change-Id: If6b4aa6b88c5db8eaa04dd241bc0b43808b3983a
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Kent Hansen [Tue, 12 Jun 2012 10:01:53 +0000 (12:01 +0200)]
Mark qquicklistview autotest as insignificant
Flaky on macx-clang developer-build OSX 10.7.
Change-Id: I4e8b7604dff9dd64efd6110e2cbde461d82b94d3
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Alan Alpert [Thu, 10 May 2012 10:26:13 +0000 (20:26 +1000)]
Emit currentFrameChanged signal when needed
Task-number: QTBUG-25039
Change-Id: I8bd5fd40a5fee1314f0401ed4708d73ed1cfad94
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Martin Jones [Tue, 12 Jun 2012 00:16:47 +0000 (10:16 +1000)]
Allow Loader to load non-Item types.
Loader has a more convenient API for loading/unloading components
than the dynamic object creation APIs. Remove the Item-only
restriction.
Change-Id: I6f9ecc8514ff1e814f7e56a3386814ba211b7e4f
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Kent Hansen [Sun, 10 Jun 2012 18:59:02 +0000 (20:59 +0200)]
Pin the qtbase SHA1
In preparation of staging
https://codereview.qt-project.org/#change,27471 in qtbase, which
isn't source/behaviorally compatible with qtdeclarative.
https://codereview.qt-project.org/#change,27477 adapts qtdeclarative
to the qtbase change, and will be staged (together with the change
that unpins the SHA1) once the qtbase change has gone in.
Change-Id: Ia47f1d86855a388a5ecf9520ed21dd52c43b1b95
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kim Motoyoshi Kalland [Fri, 8 Jun 2012 10:11:29 +0000 (12:11 +0200)]
Add support for using atlas textures directly in ShaderEffects.
Change-Id: Ib2b68c13513e2c1102264a3eb1d91ed840134159
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Kent Hansen [Sun, 3 Jun 2012 18:30:49 +0000 (20:30 +0200)]
Avoid string-based lookup in IS_SIGNAL_CONNECTED
Specify the signal as a member function suitable for passing to
QMetaMethod::fromSignal(), and use the new function
QMetaObjectPrivate::signalIndex(QMetaMethod) to get the index in the
signal range.
Change-Id: If16daa24c2699f7749a17decb611cf395d89d0c4
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Tasuku Suzuki [Mon, 28 May 2012 00:35:27 +0000 (09:35 +0900)]
Fix compilation for QT_NO_ACCESSIBILITY
Change-Id: Ic817ab15cb31bcd1c35ba5fab163dc0f52c36609
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tasuku Suzuki [Mon, 28 May 2012 00:34:32 +0000 (09:34 +0900)]
Fix compilation for QT_NO_FILEDIALOG
Change-Id: I2112bc8c9fe58cda84f498f9062b4b32b9ef0c24
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Yoann Lopes [Wed, 6 Jun 2012 15:59:59 +0000 (17:59 +0200)]
Fixed glyph margin in QSGDistanceFieldGlyphNode.
The margin was too big in some cases, causing visual artifacts.
The margin should never be bigger than the margin used in the glyph
cache.
Change-Id: Ia6bd3a9d4a98a2a3484d0e5e803de95ca14fffbb
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Yoann Lopes [Wed, 6 Jun 2012 15:52:19 +0000 (17:52 +0200)]
Support for variable glyph width in QSGDefaultDistanceFieldGlyphCache.
The glyphs are not stored in a fixed 64x64px tile anymore.
Glyphs are stored in area equal to <glyph_width> + 10 (margin) x 64px.
Allocation is now done with QSGAreaAllocator.
When glyph recycling is needed, unused glyphs are freed until the new
glyph can fit in the cache.
Change-Id: I179a8f17bfe35468bdb63bca5113ea4d0f06c414
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Gunnar Sletta [Mon, 4 Jun 2012 14:56:17 +0000 (16:56 +0200)]
Improve on scenegraph documentation.
Change-Id: Ib584a45454f6fd2a3c0bfb32a76b19839e4a2a09
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Alan Alpert [Wed, 6 Jun 2012 10:35:51 +0000 (20:35 +1000)]
Remove particles examples launcher
New examples guidelines include its own launcher scheme.
Change-Id: I93f2ef40ba2b9344e9e3074ef31d7b6d2aed72b1
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Martin Jones [Fri, 8 Jun 2012 06:16:32 +0000 (16:16 +1000)]
Export QQuickListModel (marked private)
There are some things that are difficult to achieve without this one.
Export for the more intrepid developer.
Change-Id: I3918835f66b9aa773eb5f2f2c58fb82aecc4b446
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Alan Alpert [Wed, 6 Jun 2012 10:28:17 +0000 (20:28 +1000)]
Update Affector folder of examples to guidelines
Change-Id: I1fa0e8424f94cf954098b7734ba25feab0790828
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Thu, 7 Jun 2012 02:29:07 +0000 (12:29 +1000)]
Fix handling of a direct child stealing focus from a parent-less item.
When an item gains focus it will remove focus from the previous item
that held focus. Normally this is the sub-focus item of an ancestor
item, however if the item with focus is at the root of the tree there
will be no sub-focus item and the focus of root item needs to be cleared
instead. Likewise if an item doesn't have a parent, focus still needs
to be removed from any sub focus item.
Change-Id: I0f192692e21e288c87ba0104f3d597363190f87c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 8 Jun 2012 01:19:09 +0000 (11:19 +1000)]
Performance should always be better with cacheBuffer
Setting a cacheBuffer introduced more work for the scenegraph due to
cached delegates' visibility being toggled. Changing visibility is
expensive as it is proagated to all children. Introduce a cheap
method of hiding a branch instead.
Also avoid initiating incubation in the same frame as a completed
creation.
Change-Id: I573bcf37f441f96a7502d445be50ef4301f217d5
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Tue, 5 Jun 2012 06:33:52 +0000 (16:33 +1000)]
Don't cache item indexes in VisualDataModel.
Sacrifice constant time lookup of indexes for rarely used features for
reduced memory usage.
Applications which use neither Packages, nor the VisualDataGroup api
don't ever need to query the index of an item so caching and maintaining
those indexes in unnecessary. Where they are used this add a cost
scanning for the index of an item in the cache, and in some instances
a lookup cost in the compositor.
Change-Id: I7d3c21a27a8a3c068c5ae2e1e326ff573c44d712
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Tue, 5 Jun 2012 04:16:50 +0000 (14:16 +1000)]
Destroy incubated objects if they are not claimed when ready.
If model data is removed while an object is incubating for it the view
cannot cancel the incubation because the index is invalidated. So if
the object has not been referenced after signalling it is ready assume
it's been abandoned and destroy it.
Change-Id: I32708e940cfbccbe0d330ad7822f29d3c1f39d13
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Wed, 6 Jun 2012 01:17:19 +0000 (11:17 +1000)]
rebound property for Flickable
This property specifies the transition to be used when the
flickable snaps back to its bounds.
Change-Id: I2bb9680dad219a4c7c911f0e4dda37ae739349c6
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Oswald Buddenhagen [Fri, 25 May 2012 09:30:40 +0000 (11:30 +0200)]
put private Qt dependencies below load(qt_module_config)
this will soon be needed to omit them from the master include header.
Change-Id: I8f62a228a68fd53605eaf3f39f412a7b30c529b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Aaron Kennedy [Wed, 6 Jun 2012 13:12:01 +0000 (14:12 +0100)]
Don't double emit threaded signals
As the metacall event was posted to the object emitting the signal, it
caused the signal to be *reemitted* on the object thread. If both QML
and Qt connections were present, the Qt ones were run twice.
Change-Id: I4bc1402ab0a43762ff6fef173ecc77fc20508bad
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Glenn Watson [Thu, 7 Jun 2012 00:06:14 +0000 (10:06 +1000)]
Fix alpha being ignored in Text element
The text element was using the implicit constructor to convert
QRgb -> QColor which ignores alpha. Use the explicit conversion.
Change-Id: I7975ffeab8b423716b9655776f38b0ca2f282cd0
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
LuÃs Gabriel Lima [Sat, 2 Jun 2012 16:29:45 +0000 (13:29 -0300)]
Fixing MouseArea::onWheel event doc
Change-Id: Ice5698ead44a6ca04f55739714818dd5d1da123a
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Aaron Kennedy [Thu, 24 May 2012 15:28:54 +0000 (16:28 +0100)]
Disallow parent changes for QML created objects
Currently this is protected with a QML_PARENT_TEST environment variable
to allow the rest of QtQuick to be updated before it is enforced.
Change-Id: I4dd3644cbbce91d67f24c9556637f97eafb00638
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Shane Kearns [Fri, 1 Jun 2012 13:36:48 +0000 (14:36 +0100)]
QQmlXmlHttpRequest - use readyread signal not downloadProgress
The readyRead signal (part of QIODevice base class) is the
appropriate signal for knowing when there is data available
in a QNetworkReply.
DownloadProgress is intended for UI elements e.g. progress bars.
Previously it was emitted at the same time, but now it is emitted
less often.
Task-number: QTBUG-20449
Change-Id: I60abb8f807bde314785c301dac74d27238be1a23
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Bea Lam [Mon, 4 Jun 2012 03:34:57 +0000 (13:34 +1000)]
Don't emit moving and flicking signals unnecessarily
The moving and flicking signals should only be emitted once when
the view has been moved/flicked both vertically and horizontally. (This
was already done correctly for the dragging signals.)
Also changes QQuickFlickable::flick() to return bool instead of void.
Subclasses no longer emit the flicking signals but call
flickingStarted() instead.
Also splits the tst_qquickflickable::movingAndDragging() test up into
several tests.
Change-Id: Ie527568a9702049dd0bcda18c2eb3e43d8938a18
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Samuel Rødal [Wed, 6 Jun 2012 06:33:24 +0000 (08:33 +0200)]
Fixed compile error in qqmlscript.cpp due to narrowing conversion.
qqmlscript.cpp:917: error: narrowing conversion of ‘6u’ from ‘size_t’
to ‘int’ inside { }
Change-Id: I2dae5b0fb8644b48bfa38bbb7bd173537a03a1a4
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Martin Jones [Fri, 18 May 2012 08:40:15 +0000 (18:40 +1000)]
Fix filesystem case sensitivity of QML directory cache
Don't attempt to compare file case - if we miss the cache
do a stat to determine file existance.
Change-Id: Ida79e81c75bc8f4064ba823d11fd0a097bac8b6b
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Laszlo Agocs [Mon, 4 Jun 2012 13:06:40 +0000 (16:06 +0300)]
Utilize StartDragVelocity style hint in Flickable
Change-Id: I96924b08aede57a0622ea3f7419e8f73a9f18f5d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Thu, 10 May 2012 04:01:15 +0000 (14:01 +1000)]
Restart a drag when the item canvas changes.
Likewise when a property that affects whether a drag event is likely to
be accepted. Properties were locked in when a drag was started, but
this means that if a drag was started by setting the active property
in a state change or similar bulk change the properties that are
locked in is undefined. And if an item changed canvases during a drag
or the active property was set before a parent enter and leave events
weren't sent as they should have been.
Change-Id: Iefd22dcab4c5469904d8d8c5eaf91ec339540d9c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Thu, 31 May 2012 06:45:45 +0000 (16:45 +1000)]
Fix affected signal and docs
Signal wasn't being called in its primary usecase, which was to interact
without altering the particles. Docs have been updated to clarify the
usecase as well.
This also updates the position properties of custom affector to more
accurately specify if they caused changes.
Change-Id: Ia411d9e81002443a56ed8bab9232f1aad49a4c5e
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Alan Alpert [Wed, 6 Jun 2012 02:04:39 +0000 (12:04 +1000)]
Better documentation for subclassing QQuickItem
Task-number: QTBUG-26025
Change-Id: Ia0fadf54ee8924f9892bc567c107efc4dca80628
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Jerome Pasion [Mon, 28 May 2012 17:40:02 +0000 (19:40 +0200)]
Doc: Grouped Qt Quick types into several groups
-created new groups and converted some overviews into group pages
-edited type documentation and added \ingroup
-articles still need title fixes and link fixes
Groups:
qtquick-visual-types
qtquick-item-graphics
qtquick-shaders
qtquick-canvas
qtquick-text
qtquick-text-validator
qtquick-interaction
qtquick-positioners
qtquick-transformations
qtquick-states
qtquick-animation-define
qtquick-animation-properties
qtquick-animation-control
qtquick-animation-modifiers
qtquick-images-sprites
qtquick-images
qtquick-models
qtquick-containers
qtquick-views
qtquick-paths
qtquick-utility
Task: QTBUG-25685
Change-Id: I81d4df3320bf5daad5cabb5e42408013fb24f464
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Wed, 22 Feb 2012 00:45:53 +0000 (10:45 +1000)]
Remove unused performance flags.
Change-Id: I9a9111703e2480af02b1af7033ea6bb12e7a75a5
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Yann Bodson [Mon, 4 Jun 2012 07:21:30 +0000 (17:21 +1000)]
Make sure we relayout on height change when onLineLaidOut is used
Change-Id: I66e47682eba337562543a99eb576a7e24d00cdcf
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Kent Hansen [Sun, 3 Jun 2012 19:16:23 +0000 (21:16 +0200)]
Avoid unnecessary QByteArray creation
Change-Id: I5e76a6f74c39bbffdf31aef2367efeecf1dcf19c
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Simjees Abraham [Fri, 1 Jun 2012 09:49:21 +0000 (11:49 +0200)]
Changes for "App on Top"
Changes made such that the App is on Top at startup if the option was
set in creator.
Task-number: QTCREATORBUG-6295
Change-Id: I218a619805d9091049ba51ac6da2f64049d5185d
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Anselmo L. S. Melo [Fri, 25 May 2012 02:14:03 +0000 (23:14 -0300)]
Accessible plugin build: Do not install before make install
When prefix is set, libqtaccessiblequick.so was created in the install
directory. This patch fixes this behavior.
Change-Id: I3fe47841676e4ef8912498b6a1d8a42a55a4d6ac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Charles Yin [Mon, 4 Jun 2012 06:34:17 +0000 (16:34 +1000)]
Introduce QQuickCanvasPixmap
1. QQuickPixmap now only store textures instead of QImage data, however
context2d still need to access the QImage in some places, so cache the
loaded images to avoid the expensive GL readback operations.
2. Use texture directly if the render target is FBO.
Change-Id: I6228011e5698fa00f2e3420a3a4a305995b8a238
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Laszlo Agocs [Tue, 29 May 2012 11:30:32 +0000 (14:30 +0300)]
Do not lose timestamps in mouse press events
Change-Id: Iaa7953cd2ea21f43a98f984b6aea43feb0c2fbed
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Rohan McGovern [Tue, 5 Jun 2012 02:21:02 +0000 (12:21 +1000)]
tst_qquickgridview: further increase test timeout
This test has timed out on several recent test runs, but appeared to be
making progress. Increase the timeout to 1100 seconds, approximately
twice the test's runtime from the last successful run.
Change-Id: I42ca4ae860fa22348a9f23343e2f5fef65dc4a86
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Matthew Vogt [Mon, 4 Jun 2012 05:32:32 +0000 (15:32 +1000)]
Allow the global JS UTC offset to be invalidated
If the system timezone is changed, it is necessary to inform
V8 so that the global offset-from-UTC value can be recalculated.
This changes adds the 'timeZoneUpdated' function to the JS
'Date' class exported by QML, which allows QML applications to
inform V8 when the timezone has been updated.
Change-Id: Ic5898ca7bc640002a4a6fd5a52b8623d87ee8085
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 1 Jun 2012 04:53:26 +0000 (14:53 +1000)]
Allow qtdeclarative to compile with -no-widgets
We have no hard requirement for QtWidgets library, so we should
build without it.
Change-Id: I85c85cc1a52bf9daa7ab7916f19bf7cc3ad5845f
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Michael Brasser [Wed, 30 May 2012 00:24:14 +0000 (10:24 +1000)]
Delay conversion of v8 exceptions to QQmlErrors.
This conversion in relatively expensive, and not required for transient
exceptions that occur during startup due to the order of binding
evaluation.
Change-Id: I29a16c075890c8966c0bad0a77412ad232c791bb
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Alan Alpert [Tue, 29 May 2012 10:44:14 +0000 (20:44 +1000)]
Use the texture coordinates provided by QSGTexture
Change-Id: I24e377ba69b2108f3bc4f6aca3ed910fbbf77caf
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Andrew den Exter [Fri, 1 Jun 2012 01:47:12 +0000 (11:47 +1000)]
Hide the default cursor if a cursor item is available.
Change-Id: I9ef3350a60ddd355ab588c9cfb3256004ee4493e
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Andrew den Exter [Fri, 25 May 2012 06:41:14 +0000 (16:41 +1000)]
Ensure the cursor delegate position is updated on text changes.
Change-Id: I7518aa5969ea45538feccb87f4c296db6b7d6944
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Charles Yin [Mon, 4 Jun 2012 13:03:58 +0000 (23:03 +1000)]
Fix unstable test_paint test case
Change-Id: I11c79b3f014d82b113429bd17b2d5473fdcebf1d
Task-number: QTBUG-25859
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Mon, 28 May 2012 00:48:37 +0000 (10:48 +1000)]
Fix canvas item drawImage bug with FBO render target
If canvas' render target is FramebufferObject, only the first drawImage() call
was successful, it could be fixed by adding beginNativePainting() and endNativePainting(),
but this could be unexpected behavior with OpenGL paint engine.
task-number: QTBUG-23595
Change-Id: Iff70fc88f6d39655dd283fa5dde3365887910460
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Mon, 4 Jun 2012 00:36:52 +0000 (10:36 +1000)]
Send valueTypeIndex to setBindingNoEnable in the expected format.
Ensure we send a -1 if the property is not a value type property.
Change-Id: Ic4fa6954a0bcfd32d50da565f82f21f17d81ac9b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Fri, 1 Jun 2012 14:07:54 +0000 (15:07 +0100)]
Fix crash in lazy meta object generation.
Inside the property cache, override data can only handle overrides
pointing to either a method or a property, but not to a signal
handler. This is a bug in itself, but has never come up before due
to no one following override data on methods. When this
was changed by
d2e557c2c2d7fcf3bf7c1676df3902e115986dc2, this bug
was exposed.
This change doesn't actually fix the underlying problem, but it does
restore exactly the same behavior we had previously. The complete
fix will come in a later change.
Change-Id: I6a890e6ca1e40735da8158b21dfe38dc88091081
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Fri, 1 Jun 2012 23:59:49 +0000 (09:59 +1000)]
Fix resizing of Canvas item that use FBO as renderTargets.
Change-Id: I2a158e7838f637a662700290f9f4fd28ca726d1e
Task-number: QTBUG-25992
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kim Motoyoshi Kalland [Thu, 31 May 2012 13:28:28 +0000 (15:28 +0200)]
Fix resizing of QQuickPaintedItems that use FBOs.
Task-number: QTBUG-25472
Change-Id: Icc8d0f93841a76bbc92d09e0bf96f147ac64a8c6
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Morten Johan Sorvig [Fri, 1 Jun 2012 09:24:04 +0000 (11:24 +0200)]
Don't swap buffers before the window is exposed.
At app startup there is often a delay between setting
a window visible and the window being exposed by the
window manager.
Add check to canvas->isExposed() before calling
swapbuffers.
Change-Id: I5e588ab334a72c4fe817da44eff4c3dc785d6b1f
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Girish Ramakrishnan [Thu, 31 May 2012 21:21:27 +0000 (14:21 -0700)]
doc: Fix typo
Change-Id: Ie693d28515e3d524024ef79377ade5a030c8b147
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Kent Hansen [Wed, 30 May 2012 11:45:42 +0000 (13:45 +0200)]
Remove dead code
Change-Id: If93723e48e1088d1e0664b315058803e2f61bdab
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kent Hansen [Wed, 30 May 2012 11:23:28 +0000 (13:23 +0200)]
Avoid copy-and-paste of property cache resolution code
Change-Id: I0f3d8c1641c7c277ef62af7d4f81437e44ac0bad
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kent Hansen [Wed, 30 May 2012 09:33:32 +0000 (11:33 +0200)]
Avoid string-based lookup of signals
Change-Id: I5b83b5d07b6a5d2de86d0f37471cf59baa7b0e43
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Chris Adams [Thu, 31 May 2012 04:48:18 +0000 (14:48 +1000)]
Fix another crash due to unregistered enum types
f62ab0a3dfaa873bb15cd1526f98f50a17228a9c missed one other case,
when binding valid property values to invalid property types.
This commit fixes that case, and adds both binding and assignment
tests for that case.
Change-Id: Iaca889e4214d2218012d30c4a00f2aac886375f7
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Martin Jones [Thu, 31 May 2012 22:43:19 +0000 (08:43 +1000)]
Firm-up the over bound Flickable behavior
When the end of a list is reached or you flick past the bounds the
amount of tension is too weak and items fly far to far past their bounds
or can be pulled far to far down from the edge
Reduce the default maximum overshoot. Ensure that the amount we have
already flicked past the bound is considered in the overshoot
calculation.
Task-number: QTBUG-25427
Change-Id: Ia102b9995f944beebf6b4efc6ee35c6e9fe56d79
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Damian Jansen [Mon, 30 Apr 2012 00:44:47 +0000 (10:44 +1000)]
Update system tests
A few items have changed, namely:
SpriteImage property names
XmlListModel is separated from QtQuick
A fixed bug in ParticleSystem
Change-Id: Iec8fb1c6ad0a76deb6b0733caf3b893e0da0627e
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Bea Lam [Thu, 31 May 2012 05:10:42 +0000 (15:10 +1000)]
Skip tst_complete test in qquickanimationcontroller
This test sometimes fails.
Task-number: QTBUG-25967
Change-Id: Ic8f87e8ac44761b989f525fb1b90aa5df90abe6f
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Yann Bodson [Fri, 11 May 2012 03:54:08 +0000 (13:54 +1000)]
Replace twitter demo with new tweetsearch demo
Change-Id: I1b4433e63184cb773056bb753011d6320254cd52
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Bea Lam [Mon, 28 May 2012 01:56:24 +0000 (11:56 +1000)]
Fix doc snippets paths and parsing errors
qtqml.qdocconf and qtquick.qdocconf now refer to the correct
snippets and source directories.
Snippet paths in .qdoc and .cpp files have been updated to refer to
the new shortened path references, e.g. \snippet qml/file.cpp instead of
\snippet doc/src/snippets/qml/file.cpp.
This also deletes snippets from src/qml/doc/snippets that belonged under
src/quick/doc/snippets (and were already duplicated there anyway) and
restores some snippet files that shouldn't have been deleted.
Also fixes some inline snippets to use \code .. \endcode instead of
\qml .. \endqml as they contained javascript or partial QML
snippets that were causing parsing errors from qdoc.
There are still snippet errors arising from qmlintro.qdoc as the
qmlintro snippets directory that it refers to cannot be located.
There are also two references to a removed snippet identifier in
examples/qml/cppextensions/plugins/plugin.cpp that need to be fixed
in conjunction with the related docs in a later commit as the relevant
code has changed and the docs are now invalid.
Task-number: QTBUG-25721
Change-Id: I50c665245a74c140470c58a32546591d187dfe4b
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Mitch Curtis [Tue, 29 May 2012 07:40:58 +0000 (09:40 +0200)]
Clean up QJSEngine tests.
Change-Id: Ia778f07a79c3354b639e25dbd847c0ff643b5418
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Martin Jones [Wed, 30 May 2012 02:58:04 +0000 (12:58 +1000)]
Clearing a view didn't reset content size.
Ensure that a valid contentHeight/contentWidth is set regardless
of whether there is a valid model.
Change-Id: I546683c7571a1379e3ca2ef285435ad48319e8e4
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Charles Yin [Thu, 17 May 2012 23:58:09 +0000 (09:58 +1000)]
Enable threaded/immediate rendering for FBO(step 1)
1. Create a new gl context if the scenegraph render thread is different with context2d render thread
2. Expose the gl context and window surface from context2d
3. Get the right current gl context before painting
Change-Id: I5e252a8142d760442f9dfb53ed8a8ce289379af9
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Andrew den Exter [Tue, 29 May 2012 05:45:15 +0000 (15:45 +1000)]
Reset the PathView currentIndex to 0 when all items are removed.
The default currentIndex for an empty PathView is 0, and except when
there is no model or an empty model setCurrentIndex won't allow a
currentIndex outside the valid index range for the model. This changes
the wrapping for negative numbers in setCurrentIndex so that it is
consistent with decrementCurrentIndex and forces the currentIndex to
0 if there are no model items.
Task-number: QTBUG-21316
Change-Id: Id4d4d78e9832d05baf8a9d148e7f81ee89c9bc61
Reviewed-by: Martin Jones <martin.jones@nokia.com>
aavit [Wed, 30 May 2012 09:13:55 +0000 (11:13 +0200)]
Avoid non-deterministic ordering of glyph nodes.
The ordering of glyph nodes depended on the internal ordering
of a QHash, where the key contains the value of a heap pointer,
so it could change with each run (even if QT_HASH_SEED was set).
This made effective regression testing impossible.
Change-Id: I1e5cff7db6d0db9ebbfb1e5b2e3d6e56170752b7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Jiang Jiang [Wed, 30 May 2012 07:50:34 +0000 (09:50 +0200)]
Fix lineHeight test for QQuickText
qCeil() should be used to wrap the result of height() instead of
the end result after multiply with 1.5.
Change-Id: Ia69d63ad4a9aa9c48365b8c3b994708bbbdab7c5
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Mitch Curtis [Fri, 25 May 2012 16:37:24 +0000 (18:37 +0200)]
Clean up QJSValue tests.
Change-Id: I967facfbd0b738c3a2938904a094f6312be5dcef
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Simjees Abraham [Fri, 25 May 2012 07:02:44 +0000 (09:02 +0200)]
Debugger: Clearing the ObjectReferenceHash
ObjectReferenceHash is cleared when the Qml file is reloaded.
Change-Id: I78da1d88cce2f04fe820f3af14b047cd562e90ed
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Jerome Pasion [Wed, 30 May 2012 08:32:19 +0000 (10:32 +0200)]
Doc: Changed title of "QML Plugins and C++ Bindings" article
New title is "C++ in QML Applications"
Change-Id: Ic5d3bb6488e2d41c2b1b75557c8d043a9e6871d4
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Eskil Abrahamsen Blomfeldt [Thu, 24 May 2012 13:51:27 +0000 (15:51 +0200)]
Uses new batching API to potentially speed up glyph cache
Give the cache information that a burst of requests/releases
are coming, so it can potentially optimize this.
Change-Id: Icfb591a63075c2f1e93bf269402649116de9e5be
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Damian Jansen [Tue, 15 May 2012 04:32:07 +0000 (14:32 +1000)]
Clean up visuals of elements test
Elements were not being displayed correctly on small screens,
i.e. devices. Should anchor these to the bottom, rather than center.
Also fix layout element child positions, as opacity is not used to
determine placement - use visible property instead.
Change-Id: I9fff7e64f3f03f1a4d60a242fb8f95629da6f7c9
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Mon, 21 May 2012 03:04:06 +0000 (13:04 +1000)]
Use a shared meta-object for VisualDataModel list context objects.
The objectDestroyed() function on QAbstractDynamicMetaObject makes it
possible to reference count dynamic meta objects so there is no longer
a need to construct an instance per item.
Change-Id: I6f32b803b97db015212284718239dc3062dcefe7
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Wed, 14 Mar 2012 02:00:40 +0000 (12:00 +1000)]
Ensure that variant property references keep QObjects alive
Previously, only var property references could keep QObjects alive.
This meant that the garbage collector would collect QObject data
prematurely.
This commit ensures that variant properties keep QObjects alive as
required.
Task-number: QTBUG-24767
Change-Id: Ic98a06863251a3e7d6384ba9256810a78fb23406
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Mon, 28 May 2012 22:46:43 +0000 (08:46 +1000)]
Remove unused data member in QQuickPixmapCache
Change-Id: Ia66d2fac821c133d00d9dfcaf2b497f212ffc832
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Michael Brasser [Tue, 29 May 2012 01:15:11 +0000 (11:15 +1000)]
Change animation grouping and ownership model.
Don't rely on QObject ownership.
Change-Id: Id1b27a5f8a15ef24c34b206d5736aad344bf9ada
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Matthew Vogt [Mon, 28 May 2012 05:51:42 +0000 (15:51 +1000)]
Do not modify 'declarative' in file paths
Change-Id: I527a115f02671577c754a36f3ab0b7086c5c7918
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Gunnar Sletta [Tue, 29 May 2012 08:13:45 +0000 (10:13 +0200)]
Improve QQuickCanvas::createTextureFromImage() docs a bit
Change-Id: I7be40edeee8bfca2a2725e998f64922388b97f64
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>