Bea Lam [Mon, 23 Jul 2012 07:45:40 +0000 (17:45 +1000)]
Revise the restructured "Integrating QML and C++" docs
These docs were yet to be cleaned up following the recent doc
restructure. This changes most of the the content in these sections
and includes some new docs and examples.
Currently all the code snippets are included inline. In a later patch,
these should be moved into the snippets/ directories and be included
using the \snippet command instead. Alternatively they can be moved
into examples/ to replace the BirthdayParty examples which are no
longer referenced in these docs as of this patch.
Task-number: QTBUG-26381
Change-Id: I94e3654e61476fad11fe81042d1bbe94fc649d06
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Glenn Watson [Tue, 24 Jul 2012 23:48:42 +0000 (09:48 +1000)]
Ensure params listed after unnamed params are available in QML.
If a parameter in a bound signal had no name, it was excluded from
the metaobject created by the bound signal expression. Change this
so that unnamed parameters are still added (with an anonymous
name). This means that subsequent parameters can be accessed from QML.
Task-number: QTBUG-24481
Change-Id: Ia3403fb3bdc3da0c7e58baf7e891b67ed413bebd
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Charles Yin [Tue, 12 Jun 2012 05:38:52 +0000 (15:38 +1000)]
Add waitForRendering() function for qmltest
Change-Id: I6357412d84fdb4a8b6bd8603baba7d10a2bcc245
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Andrew den Exter [Tue, 24 Jul 2012 03:40:55 +0000 (13:40 +1000)]
Add tests for QQuickItem::childAt and antialiasing.
Change-Id: I5dc26eaf27c201be05147c7bab4d6f0b0c926aed
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Damian Jansen [Thu, 19 Jul 2012 04:09:47 +0000 (14:09 +1000)]
Fix inconsistent playing / paused property setting and signals
Playing should only indicate false if it has been set as such
in code, or in the event of a valid image but non-movie being
used.
Noted the edge case in documentation.
Signals were not being emitted for playing/paused in the cases
where an image was not loaded. Paused property was also being
incorrectly assigned, which supressed pause behavior.
Task-number: QTBUG-26478
Change-Id: I1aaab9b7c495811114b30b491a900804a75d590f
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Tue, 24 Jul 2012 10:05:07 +0000 (20:05 +1000)]
Empty JSON files are not needed for the plugin system
Change-Id: I8df57ed1ced8128723d790c30c00ccaba0a2787d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Andrew den Exter [Tue, 10 Jul 2012 07:01:52 +0000 (17:01 +1000)]
Remove QListModelInterface.
Implement ListModel and XmlListModel using QAbstractListModel
instead.
Task-number: QTBUG-15728
Change-Id: I14e03d90883d341f4b1d89c1e9fc9dc1534fde78
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Thomas Senyk [Thu, 19 Jul 2012 11:38:02 +0000 (13:38 +0200)]
Adding mediump precision qualifier in distance-field fragment shader
sampler2D texture had no precision qualifier.
This was intepreted as lowp on trim slice, leading to a
glsl-compile-error because of mismatching types.
Change-Id: I0a6726f6cde15c7d81f891ec75caed702f273021
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Friedemann Kleint [Tue, 24 Jul 2012 12:56:35 +0000 (14:56 +0200)]
QtQuick: Remove usages of qWaitForWindowShown(QWindow *).
Change-Id: I722e20b2fb8d8c6c19c6f3f2cb16910d7433e9a4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Mon, 23 Jul 2012 07:43:51 +0000 (09:43 +0200)]
Mark some declarative libraries as internal.
The QtQuickParticles module is actually a QML plugin, even though it is
installed to lib/, and it doesn't have useful public API.
The QmlDevTools module is internal and non-stable API.
This avoids creating CMake files for those modules.
Change-Id: Iae7a66b18728d65aa6abd660365f0878bc6574a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Alan Alpert [Tue, 24 Jul 2012 02:15:47 +0000 (12:15 +1000)]
Clean up StocQt demo
Rename, add cpp shell, add doc file, add project files.
Task-number: QTBUG-26235
Change-Id: I51c2abefbadbadbadae0abdde5a52f857bcdb68b
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Alan Alpert [Tue, 19 Jun 2012 05:00:59 +0000 (15:00 +1000)]
TweetSearch Stylistic Tweaks
Includes upgrading the bird sprite to stochastic behavior
Change-Id: I6357f6a47ded0a18ad0746c3eef590ee9092db52
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Chris Adams [Fri, 20 Jul 2012 03:27:11 +0000 (13:27 +1000)]
Correctly link the QML module C++ class documentation
Previously, the links for in-depth documentation for the various C++
classes led to non-existent pages instead of the correct class
documentation. This commit fixes the links to point to the generated
class documentation for each class.
Also, fix some broken links in the application developer guide
essentials section.
Change-Id: I2fa9e0c19f645dec696d80387c436c2288b067bf
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Fri, 6 Jul 2012 06:05:33 +0000 (16:05 +1000)]
Fix restoration of cursor position and selection after undo/redo.
If a text selection was deleted, the selection should be restored by an
undo, but not if the selection was part of an atomic operation like
the DeleteStartOfWord key sequence.
Change-Id: Ia37f29c78f6367c60377c539c4e394e014485a49
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Alan Alpert [Tue, 17 Jul 2012 08:32:16 +0000 (18:32 +1000)]
Particle example restyling
For self-contained particle systems, placing them inside the
ParticleSystem element is encouraged.
Change-Id: Iafc5a94bb07c4c0dac0daec300d01e0fde165146
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Mon, 9 Jul 2012 08:25:40 +0000 (18:25 +1000)]
QQuickRenderThreadSingleContextWindowManager in separate files
Change-Id: I90364c3e96e5bcbff84d8da574af5695a0fd7993
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Chris Adams [Thu, 19 Jul 2012 00:46:35 +0000 (10:46 +1000)]
Fix value-type semantics in variant properties
Previously, variant properties storing value-type values would be
treated as value-type-copy values rather than value-type-reference
values. This caused inconsistency in behaviour with value-type
subproperty assignment.
Task-number: QTBUG-26562
Change-Id: I524ee06ab8e02bf9582c1a88f3317278199225e0
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Yann Bodson [Thu, 14 Jun 2012 04:40:00 +0000 (14:40 +1000)]
Cleanup/simplify tweetsearch example
Also make it possible to click on links
Change-Id: I51c2abef12662f415ae0abdde5a52f857bcdb68b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Jan-Arve Saether [Fri, 20 Jul 2012 14:52:31 +0000 (16:52 +0200)]
QSGContext::defaultSurfaceFormat() should be double-buffered
The problem was that if the opengl driver is single-buffered
by default it will remain so.
The scene graph really want double-buffered rendering.
Change-Id: Ie80f71276d1dd1304c75170f3ca17e585800e8b8
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Stephen Kelly [Mon, 23 Jul 2012 08:57:43 +0000 (10:57 +0200)]
Remove qtquick as a private dependency of qmltest.
It is already a public dependency a few lines above.
Change-Id: I4bee0df5970c80f7c2f25a4a1045859c05b8380e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Alan Alpert [Mon, 23 Jul 2012 04:20:32 +0000 (14:20 +1000)]
Fixup types page
No longer double referencing items
No longer referencing SpriteGoal (in .Particles module)
No longer referencing FolderListModel (in labs module)
Moved some types and categories around
Fixed some heading capitalization
General rewording of several parts
Change-Id: Ie36eb0c17ce6602c6ae15bceedaebebeaeeeaaab
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Tue, 10 Jul 2012 05:24:59 +0000 (15:24 +1000)]
Add a static object template for variant list model types.
Also cache any reused strings so a copy isn't created per model.
Change-Id: I32f6685df8c1ecc965c9dd7192fa9972655f0ce4
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Martin Jones [Mon, 23 Jul 2012 03:19:04 +0000 (13:19 +1000)]
Changing model after componentComplete should reset currentIndex
When the model is changed reset currentIndex back to 0.
Task-number: QTBUG-26604
Change-Id: I1934e083819537d416acd85c75362daff382aa04
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Martin Jones [Mon, 23 Jul 2012 01:08:06 +0000 (11:08 +1000)]
Add methods to PathView: positionViewAtIndex(), indexAt(), itemAt()
These methods are already present in ListView and GridView.
Change-Id: I3777fccdecd77c8ab756a0062c71c6e1bfb749ef
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Thu, 28 Jun 2012 05:51:06 +0000 (15:51 +1000)]
Add tests for QQuickPaintedItem.
Change-Id: If7645cc417b862d4d47da56e67035488fa83ede7
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Martin Jones [Wed, 18 Jul 2012 00:36:17 +0000 (10:36 +1000)]
Changing PathView model after componentComplete should reset position
If the model is changed after the component is completed, the offset
and currentIndex should be reset to 0.
Change-Id: Ie36eb0c17ce6602c6ae15b5ee7aeb8b1a6e7854b
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Mon, 23 Jul 2012 00:57:33 +0000 (10:57 +1000)]
Don't run pinch area test in parallel.
The tests require window focus, and therefore cannot be run in parallel
with other tests that spawn windows.
Change-Id: I3fc89054689779382cc42a26323756257b618192
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Yann Bodson [Fri, 20 Jul 2012 02:34:10 +0000 (12:34 +1000)]
More consistent coding style through QML documentation.
Change-Id: Ieeda1b22d30917dc9614b34d6ae4d41e0062478b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Matthew Vogt [Wed, 18 Jul 2012 00:16:12 +0000 (10:16 +1000)]
Update var property to null on object deletion
When a var property contains a pointer to a QObject-derived instance,
ensure that object deletion causes the property to be updated.
Task-number: QTBUG-26542
Change-Id: I67a59ffd7f09063328d45dc84889add55a5428e4
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Yann Bodson [Thu, 19 Jul 2012 03:47:43 +0000 (13:47 +1000)]
Fix links in QML documentation.
Change-Id: Ifd6a6cae8b0937548be23f36a23073f2b07e09b2
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Yann Bodson [Wed, 18 Jul 2012 04:39:20 +0000 (14:39 +1000)]
Make title capitalization more consistent in QML documentation.
Change-Id: Iec8168135676e0e9e130bd2245ef33fd780829d5
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Thu, 19 Jul 2012 01:05:30 +0000 (11:05 +1000)]
Mention opacity property change in porting.qdoc
Change-Id: I09343469bebcd7324ae1596d408cafea69c5dc60
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Friedemann Kleint [Thu, 19 Jul 2012 12:13:14 +0000 (14:13 +0200)]
QtDeclarative: Remove usage of deprecated qWaitForWindowShown().
- Replace by qWaitForWindowExposed() or
qWaitForWindowActive() where applicable.
- Use QVERIFY to verify success.
- Stabilize some tests by checking for 'active',
add missing call to show().
Change-Id: I6cae063e44a3839760ed9f61dacb26cd1717118d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Wed, 18 Jul 2012 17:51:33 +0000 (19:51 +0200)]
Fix include of QWindowSystemInterface.
Change-Id: I58e2cc04b74f81f3ff5a57f1d86cd5f38f7e4836
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Chris Adams [Tue, 17 Jul 2012 02:19:31 +0000 (12:19 +1000)]
Add documentation about property value modifiers
Previously, property value modifiers were only documented in QtQuick,
when really they are a QtQml module / QML language feature.
This commit also improves the QtQuick documentation for convenience
types, and rearranges some links and content for improved consistency.
Change-Id: Ic4dbe0b8bb85bdfbb8ac2f336c13c2960f8d1842
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Yann Bodson [Wed, 18 Jul 2012 05:01:22 +0000 (15:01 +1000)]
Doc fix: close code blocks properly
Change-Id: Id4f9e9cb9f37fcc13021c5e6582cf1daaa256438
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Stephen Kelly [Sat, 23 Jun 2012 08:52:03 +0000 (10:52 +0200)]
Test that the package configs for QtDeclarative work.
Change-Id: I514e2c6bb1ad7f3d7b72f58e335e3d3dcf0f1542
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Alan Alpert [Mon, 9 Jul 2012 08:05:30 +0000 (18:05 +1000)]
Add test for large file codepath
All black images are stored efficiently enough to not bloat the repo
while still hitting this codepath on desktop.
Change-Id: Id4b76bec1036849deca096bb8741b186cf18deb3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Thu, 19 Jul 2012 00:19:31 +0000 (10:19 +1000)]
Correct attribute name in image shader.
Task-number: QTBUG-26563
Change-Id: I346bc155aa16e92367dee2082974856769bad90a
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Kim Motoyoshi Kalland [Tue, 17 Jul 2012 11:26:25 +0000 (13:26 +0200)]
Rename Rectangle's border.aligned property to border.pixelAligned.
Rename the Rectangle element's border.aligned property to
border.pixelAligned to be consistent with the Flickable element's
pixelAligned property.
Change-Id: I916a47416c558f9a96f7b966c344525db984a85f
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Tue, 17 Jul 2012 01:14:43 +0000 (11:14 +1000)]
Allow QQmlPropertyMap property updates to be controlled
Allow clients to control updates made from QML to types derived from
QQmlPropertyMap, by overriding the updateValue() function.
Task-number: QTBUG-23183
Change-Id: I0169093779ebfe50dc9349f5aaac08ed85c80a8f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: abcd <amos.choy@nokia.com>
Charles Yin [Thu, 7 Jun 2012 03:08:13 +0000 (13:08 +1000)]
Add fuzzyCompare() to qmltest
Change-Id: I4834f4af0839fb89424ed25f0addfb618e5374f8
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Yann Bodson [Wed, 18 Jul 2012 02:29:16 +0000 (12:29 +1000)]
Minor doc fixes
Don't capitalize minor words in titles to be consistent with Qt doc.
Change-Id: Ib39ec50d7f9730a5bbf2b574ade8270e9290ec90
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Mon, 16 Jul 2012 01:44:56 +0000 (11:44 +1000)]
Update element references to smooth.
Change-Id: Ide30946e83c8c26d075b9ca3bb1f9e20afd69373
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Chris Adams [Tue, 17 Jul 2012 06:05:53 +0000 (16:05 +1000)]
Remove the syntax topic page from docs
This page was superfluous and missing lots of content. This change
ensures that we don't link to it, and instead links to the correct
subsection of the main page of documentation.
Change-Id: I97a944f517fb5d21319811f63c810e0e79cd330c
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Tue, 17 Jul 2012 00:47:45 +0000 (10:47 +1000)]
Don't double reference items created following a model reset.
If the model was reset then regenerate and exit immediately rather
than processing the change set.
Task-number: QTBUG-26536
Change-Id: I9d4f20d450a5116957c9468ba6088caad026a497
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Stephen Kelly [Mon, 2 Jul 2012 14:28:10 +0000 (16:28 +0200)]
Trim trailing whitespace
Change-Id: Iafc5a94bb07c499b581bfec300d01e0fde165146
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Wed, 20 Jun 2012 04:26:47 +0000 (14:26 +1000)]
Call handleRemovedWindows() before canvas rendering
Change-Id: I599ec0347a55422a3c85c89e0f6817b7f2d1343e
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Charles Yin [Fri, 29 Jun 2012 00:15:16 +0000 (10:15 +1000)]
Add I18N support to qmlscene
Task-number: QTBUG-22391
Change-Id: Id567d4aabf47ce4790cf33979c4e464ba4f09357
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Charles Yin [Fri, 13 Jul 2012 06:28:44 +0000 (16:28 +1000)]
Rewrite stockchart demo
Change-Id: Ie931d116f3ac16245d56b8c1539e5c4f2dc490f0
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Alan Alpert [Wed, 11 Jul 2012 07:32:16 +0000 (17:32 +1000)]
QQuickCanvas renames
QQuickCanvas is now called QQuickWindow
QQuickCanvas::rootItem is now QQuickWindow::contentItem
QQuickItem::canvas is now QQuickItem::window
QQuickItem::ItemChangeData::canvas is also renamed window
QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow
The functions related to the color property have dropped the clear from
their names.
The first three changes have interim compatibility measures in place to
ease the transition.
Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Yann Bodson [Tue, 17 Jul 2012 02:06:41 +0000 (12:06 +1000)]
Fix 'Unknown commands' in qtdeclarative documentation.
Change-Id: I179eb828a84af4feb834bac7159d5e1988cc3deb
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Matthew Vogt [Fri, 13 Jul 2012 05:34:05 +0000 (15:34 +1000)]
Select appropriate version for located module components
When a located module is imported with a version specifier, ensure that
the components resolved from that module use the appropriate version.
Task-number: QTBUG-26473
Change-Id: I33209ddef3fe9bb0ab9d096dfe19aff233744afc
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Matthew Vogt [Mon, 16 Jul 2012 06:31:45 +0000 (16:31 +1000)]
Improved error message wording
When a qmldir contains multiple definitions with the same name and
version numbers, the error message should indicate that the problem is
localized to that qmldir file.
Change-Id: I02cd4862c9ead2fd7ed1c75d0fa6949ab3eda6f6
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Matthew Vogt [Mon, 16 Jul 2012 05:59:06 +0000 (15:59 +1000)]
Document lack of qmlContext/qmlEngine in module API classes
Task-number: QTBUG-23116
Change-Id: Ia6620b4046ac3e72c8b304633fcad40cf0efe2ed
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Chris Adams [Tue, 10 Jul 2012 06:52:53 +0000 (16:52 +1000)]
Improve QtQml module documentation
General improvements, including:
- fixing broken links
- improving topic page content
- fixing incorrect qdoc commands
Change-Id: I50b6733b51cdabf9cecd96046f6e7f41260a9a4b
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Chris Adams [Mon, 16 Jul 2012 01:05:01 +0000 (11:05 +1000)]
Improve documentation for var properties
Previously, the initialization value assignment semantics of var
properties wasn't explicitly documented. Since curly braces on the
RHS of an initialization assignment denotes a binding (and curly
braces have a different meaning in JavaScript) confusion could result.
This commit clearly explains how to initialize a var property with an
empty object value.
Task-number: QTBUG-23734
Task-number: QTBUG-23388
Change-Id: Ifa94846b170919a0c893f7dda1421c9fb24bd0db
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Martin Jones [Wed, 11 Jul 2012 06:29:42 +0000 (16:29 +1000)]
Change Quick docs to refer to "types" rather than "elements"
Task-number: QTBUG-24785
Change-Id: I223479b879514abaacb123852323c1cfada7a5e1
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Yann Bodson [Tue, 10 Jul 2012 05:35:57 +0000 (15:35 +1000)]
Remove unneeded mac specific code in QQuickText
We don't need to relayout in painting thread.
Task-number: QTBUG-26361
Change-Id: Idfad1b90e2772e72411df821d02ea596a094f508
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Toby Tomkins [Mon, 16 Jul 2012 00:53:27 +0000 (10:53 +1000)]
Skip svg related test that is ASSERTing through no fault of declarative.
Task-number: QTBUG-26528
Change-Id: Id4a610ede0a9cbb8e58d8d8f4ff98cde3c27a6ec
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Matthew Vogt [Fri, 29 Jun 2012 02:25:20 +0000 (12:25 +1000)]
Support remote import paths
Probe for installed modules in import path elements which are not local
to the machine. Note that all local paths in the import path list will
be tried before any remote locations are probed.
Task-number: QTBUG-21386
Change-Id: I4f7b9e54e54c1d62a5e7cb7f059ee1e9319ef054
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Chris Adams [Tue, 10 Jul 2012 04:32:17 +0000 (14:32 +1000)]
Add quick-start documentation to QML/QtQuick AppDevGuide
This commit adds basic introductory information about QML to the
application developer guide.
Task-number: QTBUG-26427
Change-Id: I2fb313b8dec180988ef81c71579348b60e1d6962
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Fri, 13 Jul 2012 04:56:48 +0000 (14:56 +1000)]
Additional anchor documentation.
Task-number: QTBUG-17168
Change-Id: Iea39096e68beba322c5ea3790d83fbd9bfd6e972
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Tue, 10 Jul 2012 01:30:53 +0000 (11:30 +1000)]
Fix horizontal alignment of unwrapped text in TextEdit.
When the actual width of the text in a QTextDocument exceeds the
specificed textWidth it is aligned left irregardless of the text
alignment. Compensate by doing our own alignment of the laid out
document.
Change-Id: I7df900316ffb3ecdf01ddb053480a60a8258182d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alberto Mardegan [Thu, 5 Jul 2012 14:10:34 +0000 (18:10 +0400)]
MouseArea: use current value of drag.axis
If the drag.axis is changed while a drag operation is in progress, put
it into action immediately. This allows, for example, start a dragging
operation out of an item in a scrollable ListView to anywhere on the
screen.
See the linked bug number for an example.
Task-number: QTBUG-26440
Change-Id: Id4219d44d1066dd962319086ac1f2a2a75bb2525
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Glenn Watson [Fri, 13 Jul 2012 03:52:01 +0000 (13:52 +1000)]
Fix auto test for tiling image.
The test was using a resolution that was too high for some of the
CI machines. Changing the height to 480 is still high enough to
test the tiling functionality.
Task-number: QTBUG-26480
Change-Id: I40c731ae316471aeeafc8762a2d258adb2239c7b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Adriano Rezende [Sun, 26 Feb 2012 16:26:49 +0000 (17:26 +0100)]
Adjust Flickable autotest to check mouse events with transformation
Tests mouse events with graphical transformations applied to the element.
Change-Id: I767a40ca0d5ed748bcb27ad23212ddbc22272fc5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Shawn Rutledge [Wed, 4 Jul 2012 10:39:26 +0000 (12:39 +0200)]
Remove unneeded qpa/qwindowsysteminterface.h includes
They caused a build failure.
Change-Id: Id83623f079c80c59067a5b3fb3488ba8572ea453
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Adriano Rezende [Sun, 26 Feb 2012 16:26:46 +0000 (17:26 +0100)]
MultiPointTouchArea autotest checks touch events with transformations
Tests touch events with graphical transformations applied to the element.
Change-Id: Ie070ed2dc0ab64249455b95c382f920b3cd7b7b2
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Adriano Rezende [Sun, 26 Feb 2012 16:26:32 +0000 (17:26 +0100)]
Adjust PinchArea autotest to check pinch events with transformations
Tests pinch events with graphical transformations applied to the element.
Change-Id: I35810d9859678d4c468c0c1e8614f0928d52775b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Shawn Rutledge [Mon, 2 Jul 2012 13:23:24 +0000 (15:23 +0200)]
Fix transformed flickable so that the new autotest can pass
Not sure why we switched to using window coordinates in the last
patch, but that's the reason the new test fails.
Change-Id: Icb3b221fc3babb2e628af74066771e9eae8ff5ff
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Damian Jansen [Wed, 11 Jul 2012 07:01:09 +0000 (17:01 +1000)]
Fix signal emission for the Image based items when loading.
StatusChanged signals are now always emitted.
Other properties only emit when altered.
AnimatedImage local and remote loading was also unified in this fix.
BorderImage duplicated loading code is streamlined.
Task-number: QTBUG-26405
Change-Id: Ib412d5879e0007229a8098e1fa960003051508de
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Andrew den Exter [Thu, 12 Jul 2012 03:15:41 +0000 (13:15 +1000)]
Fix item positioning with multiple removes before the visible area.
The index of the previous first visible item needs to be adjusted
when items are removed before it in order to comparable against
later changes.
Change-Id: I3c72abb4dfc9c2ccc9b299dda186ecdc3994a735
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Kim Motoyoshi Kalland [Fri, 29 Jun 2012 15:14:10 +0000 (17:14 +0200)]
Change antialiasing method for QML2.
Since multisampling can require a lot of memory, and might not
be supported on some hardware, turn off multisampling and
implement antialiasing in the vertex shader instead. The
alternative method of antialiasing is implemented for Rectangle,
Image, BorderImage and AnimatedImage, and must be explicitly
enabled by setting the new antialiasing property.
Task-number: QTBUG-26268
Change-Id: I39a93d978658a494bf51e9f0fd02d8414eb8be12
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Chris Adams [Fri, 6 Jul 2012 08:36:01 +0000 (18:36 +1000)]
Improve object attributes documentation
There is no conceptual difference between custom attributes
(custom properties, signals and methods defined in QML object
declarations) and non-custom attributes (defined in C++).
This change coalesces the documentation for the different attribute
types, and also fixes some line wrapping issues.
Change-Id: I8cb8d71025e873523cb4389827eef7967e49a626
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Fri, 13 Jul 2012 01:11:31 +0000 (11:11 +1000)]
Fix TextEdit and TextInput test failures.
Use qWaitForWindowActive and instead of qWaitForWindowShown where focus
is required.
Also send events directly to the tested item, instead of getting a
pointer to the same object from QGuiApplication::focusObject() which
can return null and crash the test if focus is stolen.
Change-Id: I6b8956a3afc8ffa58394a957a35b64b1c0924596
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Fri, 13 Jul 2012 00:44:39 +0000 (10:44 +1000)]
Update multiple value type properties despite interceptor
When an interceptor is present on a value type, ensure that multiple
properties of that value can be updated simultaneously.
Task-number: QTBUG-25139
Change-Id: I3042b9883d404aed4b6507e6d2f38a76caee1196
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Chris Adams [Fri, 6 Jul 2012 06:36:11 +0000 (16:36 +1000)]
Include QQmlExpression in QtQml module CppClasses docs
This commit just adds the structure and the topic page entry.
The actual content for the in-depth page has yet to be written.
Change-Id: Iee083fe091c612d235bffb64ca38a8e06cc3b9e4
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Fri, 6 Jul 2012 06:23:30 +0000 (16:23 +1000)]
Add maroon demo
Change-Id: I880edf78e210d243ef87511e88ea592f6e252da6
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Thu, 5 Jul 2012 01:45:28 +0000 (11:45 +1000)]
Add new samegame and calculator demos
Change-Id: I06ac38a1d0f844eba367fc5e163151d1f70a0012
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Andrew den Exter [Tue, 10 Jul 2012 00:17:52 +0000 (10:17 +1000)]
Re-enable commented out tests.
The dependent task has now been resolved.
Change-Id: I6880b9c9240ffdbab6f39845ce700aab4c774f6f
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Andrew den Exter [Tue, 10 Jul 2012 05:29:58 +0000 (15:29 +1000)]
Re-enable tests dependent on QStandardItemModel.
These were disabled when QtWidgets was not available, but that is no
longer necessary following QStandardItemModel being moved to QtGui.
Change-Id: I7ed133d9fd5ae6daa5ed9df180f7745fc3f368b1
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Chris Adams [Thu, 12 Jul 2012 02:00:22 +0000 (12:00 +1000)]
Enable tst_qqmlpropertycache
Due to the lazy metaobject initialization change, the property cache's
append method is now private. Instead, it offers a copyAndAppend
method which the test should use.
Change-Id: I1279eb997832244593aa11d5644d14b31ea68dd2
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Thiago Macieira [Tue, 17 Jan 2012 13:37:27 +0000 (11:37 -0200)]
Update the export macros in qtdeclarative.git
Use the new, simpler QT_STATIC macro.
Change-Id: I86d9d1a0e2812896594bfb0e6945b194f896d775
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thiago Macieira [Tue, 29 May 2012 16:52:01 +0000 (18:52 +0200)]
Change CONFIG += staticlib to CONFIG += static
That's the targetted, correct way of defining a static library.
Change-Id: Ib039e1872c190900c3c7ef1f2d2c4ca03743852c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Mon, 9 Jul 2012 16:49:37 +0000 (18:49 +0200)]
use centralized qml plugin project handling
Change-Id: I27b773b042560d3a95d943ad942e84d9aaeeba40
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Oswald Buddenhagen [Mon, 9 Jul 2012 14:25:41 +0000 (16:25 +0200)]
"export" the qml tools for qtPrepareTool() use
notably, this disables the build of qmlplugindumpd.exe under windows -
it is not clear to me why somebody would want to do that, as both sets
of libraries would be available, and the output from both variants should
be the same.
Change-Id: I95c77b2aa32f17f9d6df0e5d4b9d11f456d860f6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Michael Brasser [Fri, 6 Jul 2012 01:43:41 +0000 (11:43 +1000)]
Fix, test and document animation started/stopped signals.
Rename completed to stopped (as it is not only emitted
on completion). Ensure that the started and stopped signals
are emitted at the right times. Document the signals.
Task-number: QTBUG-14968
Change-Id: Icd3babcef2c9e544476592a26e6b9e58a21ebe95
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Michael Brasser [Mon, 9 Jul 2012 02:13:05 +0000 (12:13 +1000)]
Add documentation for all font properties.
Change-Id: I575fb6f25a0c926a713b1aa266a2c7ca24368c3e
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Martin Jones [Tue, 10 Jul 2012 06:40:06 +0000 (16:40 +1000)]
pressed and pressedButtons don't work when multiple buttons are pressed
The pressed property would react to any mouse event, regardless of
whether it was in acceptedButtons, or there were other buttons still
pressed. It will now remain true while any button in acceptedButtons
is pressed.
The pressedButtons property could contain buttons not in the
acceptedButtons mask. It will now only contain buttons that are in the
acceptedButtons mask.
Task-number: QTBUG-26458
Change-Id: I6b25cc36a58c113de062d530761dc179d7ef4a5a
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Thu, 5 Jul 2012 06:09:27 +0000 (16:09 +1000)]
Allow color to be explicitly compared to a string
Add the Qt.colorEqual() function which compares any combination of
two supplied color and string arguments, by converting the string
arguments to colors as necessary.
Task-number: QTBUG-18754
Change-Id: I75baef9a2edd30a5f8b9cb5e151e4adba6f6a371
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Bea Lam [Thu, 5 Jul 2012 02:29:24 +0000 (12:29 +1000)]
Merge old "Modules" docs into new doc structure
This removes modules/todo.qdoc which contained the old "Modules"
documentation page and merges this content into the new Modules
documentation.
Also cleaned up the structure of the "qmldir" docs.
Task-number: QTBUG-26378
Change-Id: Idc8800d0595647eb7064ecadc5a00254341ed1e8
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Andrew den Exter [Tue, 10 Jul 2012 05:14:33 +0000 (15:14 +1000)]
Use QQuickTextUtil to calculate alignment offsets in TextInput.
Change-Id: I8602f949c01cb4c5a3b05de5a2800dead0ae8b47
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Mon, 9 Jul 2012 06:33:21 +0000 (16:33 +1000)]
Add tests for instantiating cursor delegates in the Loading state.
Components created by QML are usually (always?) ready when assigned to
n property, but it possible for an externally supplied component to
still be loading, as in the test and the code handles it.
Change-Id: I2058e3479e2e711b52af2a0128e6e4c4c3ff7504
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Mon, 9 Jul 2012 04:45:30 +0000 (14:45 +1000)]
Remove code for unused LinksAccessibleByKeyboard option.
The text interaction flags aren't exposed publicly and the option isn't
set by TextEdit itself so there's no need to handle it.
Change-Id: I83b98e58e3b8cb8c55752d8eefe3bf36bff75249
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Toby Tomkins [Wed, 11 Jul 2012 03:00:08 +0000 (13:00 +1000)]
Remove insignificant flag because test is passing reliably.
Change-Id: I373a013d22a71695399b1d3f03c602eaf68409fe
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Glenn Watson [Wed, 11 Jul 2012 01:50:47 +0000 (11:50 +1000)]
Fix test for value type interceptors.
In release mode, floating point inaccuracies can cause this test
to fail. Use a fuzzy compare since it doesn't affect what the test
is actually trying to check for.
Change-Id: I5e3d073614090450216c33fcc561a7454cf44ac3
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Chris Adams [Mon, 9 Jul 2012 06:12:49 +0000 (16:12 +1000)]
Document how to register namespaced types with the QML typesystem
Previously, the documentation wasn't clear that C++ types declared
in a namespace need to fully qualify any references to namespaced
typenames in order for them to be processed correctly by the meta
type system.
Task-number: QTBUG-15459
Change-Id: I3a1e5c441ad8d4c58e169bdf531cdefb935e7770
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Matthew Vogt [Mon, 9 Jul 2012 04:54:18 +0000 (14:54 +1000)]
Fix qmlscene initial resize for delayed loading
When QQuickView acquires a default initial size while waiting for
the source component to be loaded, the resulting width() and height()
are 1 rather than zero. Fix the check for default size after component
has loaded to account for this disparity.
Change-Id: Ifaf418525e66dcc094c87ac1f9b63d1b05a08fd7
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Mon, 9 Jul 2012 01:01:48 +0000 (11:01 +1000)]
Update usage of childrenRect in Flickable docs.
The childrenRect of the Flickable itself is rarely what is wanted when
setting the contentWidth and contentHeight.
Change-Id: Ica13a0955869157957b9d3b5917c634ea9c51e30
Reviewed-by: Martin Jones <martin.jones@nokia.com>