profile/ivi/qtdeclarative.git
12 years agoAdd fuzzyCompare() to qmltest
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>
12 years agoMinor doc fixes
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>
12 years agoUpdate element references to smooth.
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>
12 years agoRemove the syntax topic page from docs
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>
12 years agoDon't double reference items created following a model reset.
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>
12 years agoTrim trailing whitespace
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>
12 years agoCall handleRemovedWindows() before canvas rendering
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>
12 years agoAdd I18N support to qmlscene
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>
12 years agoRewrite stockchart demo
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>
12 years agoQQuickCanvas renames
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>
12 years agoFix 'Unknown commands' in qtdeclarative documentation.
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>
12 years agoSelect appropriate version for located module components
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>
12 years agoImproved error message wording
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>
12 years agoDocument lack of qmlContext/qmlEngine in module API classes
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>
12 years agoImprove QtQml module documentation
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>
12 years agoImprove documentation for var properties
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>
12 years agoChange Quick docs to refer to "types" rather than "elements"
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>
12 years agoRemove unneeded mac specific code in QQuickText
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>
12 years agoSkip svg related test that is ASSERTing through no fault of declarative.
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>
12 years agoSupport remote import paths
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>
12 years agoAdd quick-start documentation to QML/QtQuick AppDevGuide
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>
12 years agoAdditional anchor documentation.
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>
12 years agoFix horizontal alignment of unwrapped text in TextEdit.
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>
12 years agoMouseArea: use current value of drag.axis
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>
12 years agoFix auto test for tiling image.
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>
12 years agoAdjust Flickable autotest to check mouse events with transformation
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>
12 years agoRemove unneeded qpa/qwindowsysteminterface.h includes
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>
12 years agoMultiPointTouchArea autotest checks touch events with transformations
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>
12 years agoAdjust PinchArea autotest to check pinch events with transformations
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>
12 years agoFix transformed flickable so that the new autotest can pass
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>
12 years agoFix signal emission for the Image based items when loading.
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>
12 years agoFix item positioning with multiple removes before the visible area.
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>
12 years agoChange antialiasing method for QML2.
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>
12 years agoImprove object attributes documentation
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>
12 years agoFix TextEdit and TextInput test failures.
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>
12 years agoUpdate multiple value type properties despite interceptor
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>
12 years agoInclude QQmlExpression in QtQml module CppClasses docs
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>
12 years agoAdd maroon demo
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>
12 years agoAdd new samegame and calculator demos
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>
12 years agoRe-enable commented out tests.
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>
12 years agoRe-enable tests dependent on QStandardItemModel.
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>
12 years agoEnable tst_qqmlpropertycache
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>
12 years agoUpdate the export macros in qtdeclarative.git
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>
12 years agoChange CONFIG += staticlib to CONFIG += static
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>
12 years agouse centralized qml plugin project handling
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>
12 years ago"export" the qml tools for qtPrepareTool() use
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>
12 years agoFix, test and document animation started/stopped signals.
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>
12 years agoAdd documentation for all font properties.
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>
12 years agopressed and pressedButtons don't work when multiple buttons are pressed
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>
12 years agoAllow color to be explicitly compared to a string
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>
12 years agoMerge old "Modules" docs into new doc structure
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>
12 years agoUse QQuickTextUtil to calculate alignment offsets in TextInput.
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>
12 years agoAdd tests for instantiating cursor delegates in the Loading state.
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>
12 years agoRemove code for unused LinksAccessibleByKeyboard option.
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>
12 years agoRemove insignificant flag because test is passing reliably.
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>
12 years agoFix test for value type interceptors.
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>
12 years agoDocument how to register namespaced types with the QML typesystem
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>
12 years agoFix qmlscene initial resize for delayed loading
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>
12 years agoUpdate usage of childrenRect in Flickable docs.
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>
12 years agoSpecify platform that test is insignificant, has flaky behaviour.
Toby Tomkins [Mon, 9 Jul 2012 03:26:18 +0000 (13:26 +1000)]
Specify platform that test is insignificant, has flaky behaviour.

Change-Id: If18aaabdb68967a0396c84fe1410b820828acc7f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoRemove superfluous DEFINE no longer used in source code.
Toby Tomkins [Mon, 9 Jul 2012 04:04:17 +0000 (14:04 +1000)]
Remove superfluous DEFINE no longer used in source code.

Task-number: QTBUG-23385

Change-Id: I9115139e62d89db525e79c1800754b7df80d39d6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoDon't provide typehint in QQmlExpression::evaluate()
Chris Adams [Thu, 5 Jul 2012 01:53:18 +0000 (11:53 +1000)]
Don't provide typehint in QQmlExpression::evaluate()

Previously, the result returned by QQmlExpression::evaluate() was
converted from the actual JavaScript result with a default typehint
of QList<QObject*>.  This commit removes that typehint so that the
engine's conversion code will choose the most appropriate return type
for the result JavaScript value, instead.

Task-number: QTBUG-17082
Change-Id: I368a018b235e9e001b1b92db3699de377748b74f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoImprove documentation for JavaScript expressions and imports
Chris Adams [Fri, 6 Jul 2012 06:02:46 +0000 (16:02 +1000)]
Improve documentation for JavaScript expressions and imports

This commit splits the import documentation out of the expression
documentation, and corrects various ambiguities or errors in the
JavaScript-related documentation.

Change-Id: I351b0676f7271efba7cbff90c133dfe008321fb8
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoImproved error messages for malformed .import statements
Matthew Vogt [Fri, 6 Jul 2012 03:04:53 +0000 (13:04 +1000)]
Improved error messages for malformed .import statements

Report errors in .import statements, rather than pass them through
to V8 to yield 'Syntax error'.

Task-number: QTBUG-24867
Change-Id: I111b3bd3d198e97f42b29591f61753e86295aeb2
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
12 years agoFix broken value-type support by allowing property definition
Chris Adams [Tue, 26 Jun 2012 08:02:35 +0000 (18:02 +1000)]
Fix broken value-type support by allowing property definition

In QtQuick 1.x the "variant" property type was supported, which could
be used to allow value type properties to be defined in QML.  In
QtQuick 2.0, we have deprecated the "variant" property, but its
replacement ("var") is not suited for defining lightweight C++ type
values (such as QColor, QFont, QRectF, QVector3D etc).

This commit allows those QML basic types to be used in QML once more,
by supporting them in the property definition syntax.

Note that since some value types are provided by QtQuick and others
are provided by QtQml, if a client imports only QtQml they can define
but not use properties of certain types (eg, font).

Task-number: QTBUG-21034
Task-number: QTBUG-18217

Change-Id: Ia951a8522f223408d27293bb96c276281a710277
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
12 years agouse centralized handling of QT_BUILD_PARTS
Oswald Buddenhagen [Tue, 3 Jul 2012 19:37:01 +0000 (21:37 +0200)]
use centralized handling of QT_BUILD_PARTS

Change-Id: I14f08527a0b3a1bd58f815d28ebb4f38094d3bb7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoload plugins properly when QT_NO_SETTINGS is defined
Tasuku Suzuki [Tue, 29 May 2012 01:36:45 +0000 (10:36 +0900)]
load plugins properly when QT_NO_SETTINGS is defined

Change-Id: I2d28d698f4bb5cc299f1ce83b1ecb7fa87bc5fdb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agonicer gitignore
Oswald Buddenhagen [Mon, 9 Jul 2012 16:50:06 +0000 (18:50 +0200)]
nicer gitignore

Change-Id: I6e7afb77c98060c2968aa2fd7ede2435117205e3
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoremove dead files
Oswald Buddenhagen [Mon, 9 Jul 2012 19:02:36 +0000 (21:02 +0200)]
remove dead files

apparently these qml1 plugins moved out even before the patch adding
these files landed ...

Change-Id: Ie1cdd558787fedc9abe57ee8f2324f873b983cab
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFix warnings about multiple rules for install_targets.
Friedemann Kleint [Tue, 10 Jul 2012 12:05:34 +0000 (14:05 +0200)]
Fix warnings about multiple rules for install_targets.

- Remove the accessility scope from the profile since
  the parent plugins.pro already does that
- Remove the target lines since they are also in
  ../shared/qaccessiblebase.pri.

Change-Id: I6d95bf43b4dd9de8627713df2eecac5cd526cd79
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
12 years agoDon't cache visual data model v8 handles.
Andrew den Exter [Tue, 5 Jun 2012 06:43:57 +0000 (16:43 +1000)]
Don't cache visual data model v8 handles.

The external resource is reference counted and resused irregardless of
whether the handles are cached, and the reduction in the number of
handles allocated needs to be comes at the cost of keeping  persistent
handle which have a negative impact on garbage collection.

Change-Id: I92996faab08a0ff76d21e56dbdafdd7522882d2c
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoAdd option to use native rasterizer for SceneGraph text
Eskil Abrahamsen Blomfeldt [Wed, 4 Jul 2012 12:56:38 +0000 (14:56 +0200)]
Add option to use native rasterizer for SceneGraph text

For old-style (desktop components) apps using QML 2 on regular density
displays, distance field text will look out of place. We introduce
an option to use the native rasterizer instead if you would rather
have native look and feel than scalable text items.

Change-Id: Idb38e3c89f2deab9ae1963357c6c5fb235ddeab8
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoStabilize Loader test.
Michael Brasser [Tue, 10 Jul 2012 03:10:28 +0000 (13:10 +1000)]
Stabilize Loader test.

Wait for Loader to load its item, rather than using
a fixed timeout value.

Change-Id: I97ee56d0d7161c9c71a5524f108b0f56d92cc3f3
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
12 years agoRemove unwanted whitespace from test URLs
Matthew Vogt [Tue, 10 Jul 2012 05:01:19 +0000 (15:01 +1000)]
Remove unwanted whitespace from test URLs

Change-Id: Ia39c7bc458f46a8a32c1e54a8963b1f89dbbf271
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoFix warning about assigned/unused variable.
Friedemann Kleint [Mon, 9 Jul 2012 12:51:43 +0000 (14:51 +0200)]
Fix warning about assigned/unused variable.

Change-Id: I0c9a7c4bf52e5a1a81d5ac85fc594ad197e3b811
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoUse qWaitForWindowActive() where it is required.
Friedemann Kleint [Fri, 6 Jul 2012 12:10:38 +0000 (14:10 +0200)]
Use qWaitForWindowActive() where it is required.

Prepare a change in qtbase in which the implementation
of qWaitForWindowShown() will be changed to
qWaitForWindowExposed() instead of qWaitForWindowActive().
Try to stabilize further tests by introduing
wait functions instead of calls to qApp->processEvents().

Change-Id: I9825885430d78be1610a3fe20023fad24aaacba9
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoSpeed up Text construction with RichText
Andrew den Exter [Thu, 5 Jul 2012 02:40:13 +0000 (12:40 +1000)]
Speed up Text construction with RichText

Setting the page size to empty can short cut some unnecessary layouts
triggered by QTextDocument/QTextDocumentLayout prior to the Text item
requiring a layout.

This rougly halves the construction time a Text item with RichText.

Task-number: QTBUG-19728
Change-Id: I03e6d293d8e5ac40046aef41171ca5009b718546
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoSpeed up TextEdit construction time.
Andrew den Exter [Thu, 5 Jul 2012 00:18:43 +0000 (10:18 +1000)]
Speed up TextEdit construction time.

Defer setting content on the QTextDocument until componentComplete()
to avoid unnecessary layouts and move one time setup for the
text document from setContent to the constructor.

Reduces the construction time of a TextEdit with RichText textFormat
by about a third.

Change-Id: Idde0772063bf769cde984efddd68589c55a7431a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDo not permit excessive recursion in component creation
Matthew Vogt [Thu, 5 Jul 2012 23:53:03 +0000 (09:53 +1000)]
Do not permit excessive recursion in component creation

Limit recursion during component creation to prevent infinite
recursion resulting in a crash.  Recursion results from invoking
createObject() in the Component.onCompleted handler.

Task-number: QTBUG-25439
Change-Id: Ica2ba099d82b5747c938501af04e67f7ace8402e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoUse V4 binding for non-final properties where possible
Matthew Vogt [Mon, 4 Jun 2012 04:43:38 +0000 (14:43 +1000)]
Use V4 binding for non-final properties where possible

When a property referenced in a binding is not marked as final, do not
automatically abort optimization.  Instead generate both V4 and V8
binidngs, and only fall back to the V8 binding if necessary at run time.

Change-Id: I1bcc7e2b495935c5d519a9a223f640c1972cdb4e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoReduce the number of unnecessary layouts on geometry changes.
Andrew den Exter [Thu, 7 Jun 2012 05:56:16 +0000 (15:56 +1000)]
Reduce the number of unnecessary layouts on geometry changes.

Improve checks for geometry changes that don't affect layout, i.e
width increasing when the previous layout didn't wrap or elide.

Set implicit sizes just once during layout rather than setting the
implicit width during and the implicit height after to limit the when
an implicit size change can change geometry.

And if there are multiple layouts of the same text/font combination
re-use cached layout data as much as possible by guarding against
unnecessary property changes on the layout, and not creating a new
layout for calculating the implicit size of truncated text.

Change-Id: Ia05e52e9170e1f5d3364896ab119e00d8a318299
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoExpand test case for qrc:/ URLs
Matthew Vogt [Thu, 5 Jul 2012 05:00:24 +0000 (15:00 +1000)]
Expand test case for qrc:/ URLs

Change-Id: Ibf8a04efbcb9d39938201f65c1fc0f236243a287
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAllow all explicit margins to override margins.
Andrew den Exter [Fri, 29 Jun 2012 07:06:38 +0000 (17:06 +1000)]
Allow all explicit margins to override margins.

Task-number: QTBUG-24515
Change-Id: Ibfc657dec9fd0c8e71cf3686a04ea7b00ad72c11
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoRemove Qt::WindowFlags from QQuickView constructor
Alan Alpert [Thu, 5 Jul 2012 06:14:58 +0000 (16:14 +1000)]
Remove Qt::WindowFlags from QQuickView constructor

It's no longer in the constructor of QWindow. Those who wish to set it
can use the setWindowFlags function.

Change-Id: I8df57ed1ced8128723d790caaaaaaaaaaaaa787d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoClarify jumpTo docs
Alan Alpert [Fri, 6 Jul 2012 00:38:12 +0000 (10:38 +1000)]
Clarify jumpTo docs

Task-number: QTBUG-24769
Change-Id: Ib58a47deea2706f7fd683106380d1618d8b1d2cc
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoUpdate Age affector doc references
Alan Alpert [Fri, 6 Jul 2012 00:36:12 +0000 (10:36 +1000)]
Update Age affector doc references

Task-number:  QTBUG-26240
Change-Id: Ib58a47deea2706f7fd683106380d1618d8b1d2cd
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoUse enumeration in preference to enum when referring to QML API.
Andrew den Exter [Thu, 5 Jul 2012 06:08:09 +0000 (16:08 +1000)]
Use enumeration in preference to enum when referring to QML API.

Task-number: QTBUG-24666
Change-Id: I5197d4b4d1a1b53cae2033bd86ce26ba55d08384
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoUse qFloor instead of qRound for glyph coordinates
Jiang Jiang [Wed, 4 Jul 2012 16:49:20 +0000 (18:49 +0200)]
Use qFloor instead of qRound for glyph coordinates

Like we did in raster paint engine to make sure glyphs are positioned
correctly.

Change-Id: I1327b8727bd2b5085dfb2edc11b4d049403a2fb5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoUse unique port numbers for http servers in auto tests.
Andrew den Exter [Tue, 3 Jul 2012 04:00:25 +0000 (14:00 +1000)]
Use unique port numbers for http servers in auto tests.

Prevents conflicts when tests are run in parallel.

Change-Id: Ic1652d963da291c7c41b31e2621874824fa575cb
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
12 years agoFix QQuickApplication::activate test.
Andrew den Exter [Tue, 3 Jul 2012 06:50:40 +0000 (16:50 +1000)]
Fix QQuickApplication::activate test.

ApplicationActivate and ApplicationDeactivate events are now delivered.

Task-number: QTBUG-21573
Task-number: QTBUG-23331
Change-Id: I58e8d7c7730c66ec210f04a74a945d3eece61e01
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoRemove sections with no doc content for now
Bea Lam [Thu, 5 Jul 2012 00:41:56 +0000 (10:41 +1000)]
Remove sections with no doc content for now

Change-Id: I23566853ffebec4de3c48ce4f5cd1c4b1f2389d5
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoFix various QtQuick.* submodule docs
Bea Lam [Tue, 3 Jul 2012 05:51:04 +0000 (15:51 +1000)]
Fix various QtQuick.* submodule docs

- Create module index pages for QtQuick.Window, QtQuick.XmlListModel and
QtQuick.LocalStorage.
- Fix references to module names in docs so that docs for properties
  and methods are actually generated e.g. use "QtQuick.Window2" instead
  of "QtQuick2.Window".

There's no easy way to document Module APIs at the moment so the
QtQuick.LocalStorage documentation has been updated in a hacky way to
generate the correct method documentation.

Change-Id: I7b34e4b4ac794acffc6d198b98e2115ccf0fa9a6
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAdd references between being/completeCreate in the documentation
Laszlo Papp [Wed, 4 Jul 2012 06:54:43 +0000 (07:54 +0100)]
Add references between being/completeCreate in the documentation

Change-Id: I14f1c802347c9dad86f3fd7a9e858209a15d34e6
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoReorganize "concept" pages in QtQuick docs
Bea Lam [Tue, 3 Jul 2012 01:45:26 +0000 (11:45 +1000)]
Reorganize "concept" pages in QtQuick docs

This removes concepts/topic.qdoc and move this content into individual
concept topic pages under individual directories for each concept to
avoid having a really long "concepts" index page.

This change also:
- Moves components.qdoc ("Defining reusable components") into the
 appdevguide/ since it's not specific to QtQuick features - it's more
 about how to use a QtQml feature to build QML apps.
- Moves the part of qtqml/doc/src/cppintegration/data.qdoc that
 discusses how to use C++ models with QtQuick views into
 quick/doc/src/concepts/modelviewsdata/data-cppmodels.qdoc.

Change-Id: Id18a1d56acaaac41714c13cbc94bb3b80f337355
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoAdd some private V8ASSERT macros.
Andrew den Exter [Fri, 29 Jun 2012 03:15:33 +0000 (13:15 +1000)]
Add some private V8ASSERT macros.

Simple variation on the V8THROW macros to consilidate the normal usage
pattern of if (!condition) THROW.

Change-Id: I71aaabab705c3f73922efdaf8bb40b5dcc390101
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoLet ShaderEffectSource use same multisample count as GL context.
Kim Motoyoshi Kalland [Tue, 3 Jul 2012 14:05:13 +0000 (16:05 +0200)]
Let ShaderEffectSource use same multisample count as GL context.

Change-Id: I9b772a2c405c2fab13dfee3527212117de16e9c0
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoqmlplugindump: Add comment to file that it was auto-generated
Thomas McGuire [Tue, 3 Jul 2012 14:13:46 +0000 (16:13 +0200)]
qmlplugindump: Add comment to file that it was auto-generated

This prevents people who do not know about this tool from
accidentally changing these files by hand.

Change-Id: I8ff889b953f7c637f914f8b5b8b07a36f3cdf58f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoCompile without RTTI support
Eskil Abrahamsen Blomfeldt [Tue, 3 Jul 2012 12:10:20 +0000 (14:10 +0200)]
Compile without RTTI support

We need to be able to compile without RTTI support. Fortunately
QPaintEngine has built-in type info. No RTTI support is the
default configuration on Windows with MSVC2010, so this is
required to fix the build there.

Change-Id: I89b1ed4879fd0e8e0d61ef12d77f6961fd0b07e5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoDocument QQmlComponent::create(QQmlIncubator&, ...)
Martin Jones [Wed, 4 Jul 2012 02:37:38 +0000 (12:37 +1000)]
Document QQmlComponent::create(QQmlIncubator&, ...)

Task-number: QTBUG-25132
Change-Id: Ice6c75cbd7a45519ce7f38190db3fae95146269e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoPathView needs drag events similar to Flickable
Martin Jones [Tue, 3 Jul 2012 03:57:54 +0000 (13:57 +1000)]
PathView needs drag events similar to Flickable

Added dragging property and dragStarted() and dragEnded() signals.

Task-number: QTBUG-21740
Change-Id: I718835ff7e46af615951ec5f248eba41bac31071
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>