platform/upstream/qtdeclarative.git
11 years agoWork towards supporting front-to-back reordering of opaque items.
Michael Brasser [Sat, 8 Dec 2012 05:05:48 +0000 (23:05 -0600)]
Work towards supporting front-to-back reordering of opaque items.

Change-Id: Ic3b9defa6ac61409adcfb2b5cb8167698ed00255
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoFixed abstractitemmodel example
Oliver Wolff [Thu, 6 Dec 2012 13:54:32 +0000 (14:54 +0100)]
Fixed abstractitemmodel example

Change-Id: I1e85fd3f35f4f3d80e3fb599ae95b771db5f949b
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoFixed install targets for model examples
Oliver Wolff [Tue, 11 Dec 2012 07:20:33 +0000 (08:20 +0100)]
Fixed install targets for model examples

Change-Id: I4c23fe37ec7adc17180c2405e68273b5cd3ee219
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoExamples: Remove unused import "../shared"
Kai Koehne [Tue, 11 Dec 2012 12:59:44 +0000 (13:59 +0100)]
Examples: Remove unused import "../shared"

Change-Id: I3c84eab1ff97380362828aa96b0d5189cbd62509
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
11 years agoRemoved leftover file from example cleanup
Oliver Wolff [Tue, 11 Dec 2012 07:15:50 +0000 (08:15 +0100)]
Removed leftover file from example cleanup

Change-Id: I63b9ca28724d651d8e4cb74eed114665a75e8b18
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoImproved the scene graph overview a bit
Gunnar Sletta [Tue, 11 Dec 2012 15:59:02 +0000 (16:59 +0100)]
Improved the scene graph overview a bit

Change-Id: I82f5a48801b2c8ed94ef1f8d0b2e82998bb91c78
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoMove the Q_DECLARE_METATYPE to where it should be.
Stephen Kelly [Tue, 11 Dec 2012 14:22:50 +0000 (15:22 +0100)]
Move the Q_DECLARE_METATYPE to where it should be.

Change-Id: Id17b30ed59fd9e68229bb80de5b9e4bc2aa0b75d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agomake use of qt_headersclean.prf
Oswald Buddenhagen [Mon, 3 Dec 2012 20:34:23 +0000 (21:34 +0100)]
make use of qt_headersclean.prf

Change-Id: I50f2299573770bb546333f57a61b6eb6b7e80e4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoAdd PLUGIN_CLASS_NAME to qtdeclarative plugins
Miikka Heikkinen [Mon, 10 Dec 2012 12:18:22 +0000 (14:18 +0200)]
Add PLUGIN_CLASS_NAME to qtdeclarative plugins

Needed for automating static plugin loading.

Task-number: QTBUG-28131
Change-Id: I558a0f83c69179d3838c64fee069cc0e9c1d67cb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoMove examples around
Alan Alpert [Fri, 10 Aug 2012 06:51:01 +0000 (16:51 +1000)]
Move examples around

imageprovider is a QtQuick example. Models and Views examples are now split up,
as one is a collection of C++ examples and the other is banded into a single
QML example.

Task-Number: QTBUG-24133
Change-Id: I81874871bd69ffef6a88df84f3d3f649e0c56bc6
Reviewed-by: hjk <qthjk@ovi.com>
11 years agocentralize and fixup example sources install targets
Oswald Buddenhagen [Thu, 29 Nov 2012 15:02:34 +0000 (16:02 +0100)]
centralize and fixup example sources install targets

follow respective change in qtbase

Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
11 years agoOnly free context if the owning QV8ContextResource gets destroyed
Philip Lorenz [Sat, 1 Dec 2012 11:58:39 +0000 (12:58 +0100)]
Only free context if the owning QV8ContextResource gets destroyed

Since fdeee38b781376012c4f086276c3c376726c8839 QQmlXMLHttpRequest stores
the calling context for later use. This leads to issues after the first
request completes and the wrapping QV8ContextResource gets freed by
garbage collection and therefore removes the associated QQmlDataContext
which may still be required for later calls (e.g. if the calling context
is part of a stateless library).

This patch introduces an ownership flag for QV8ContextResource which
indicates if the associated context should be cleared when the object is
destroyed.

Task-number: QTBUG-28351

Change-Id: I552ebb5c55b889eb33f3884283c8fdf037ac33be
Reviewed-by: Alan Alpert <aalpert@rim.com>
11 years agoDon't generate duplicate doc pages
Paul Olav Tvete [Fri, 7 Dec 2012 12:06:50 +0000 (13:06 +0100)]
Don't generate duplicate doc pages

Cross-linking works now, so we don't need the old hack anymore.

Change-Id: I7d413788f643a75f3407f7186f5e1bdc9ed972a6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoFix doc links to submodels
Paul Olav Tvete [Fri, 7 Dec 2012 12:47:22 +0000 (13:47 +0100)]
Fix doc links to submodels

Change-Id: I2c65a77ca9c5fa1df1f0ff2ea67655e9ce1b0039
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoMark autotest as insignificant on mac
Paul Olav Tvete [Mon, 10 Dec 2012 11:32:39 +0000 (12:32 +0100)]
Mark autotest as insignificant on mac

This test blocks unrelated changes from getting through the CI system.

Task-number: QTBUG-28505
Change-Id: I514b449ddd4cfc7c4f2fdb011b8910838aeabac7
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
11 years agoChange qFatal to qWarning
Alan Alpert [Thu, 6 Dec 2012 22:17:47 +0000 (14:17 -0800)]
Change qFatal to qWarning

While the process should terminate immediately with a non-zero exit code
on component error, it does that in the next line already. The main
difference is dropping the backtrace, which is not useful in this case.

Change-Id: I866ea00e62cb9d1b7c506b9819cd9bb2750ac81f
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoStabilize tst_qquickpathview
Alan Alpert [Wed, 5 Dec 2012 20:57:45 +0000 (12:57 -0800)]
Stabilize tst_qquickpathview

The complete flick is already a long operation, so when it's delayed due
to heavy system load it can exceed 5s easily. Increase the timeout to
give the flick time to finish.

Change-Id: I333c41ea432676a8c7f6de637f6af98203cd07fb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoDoc: Fix external references
Christian Stenger [Wed, 5 Dec 2012 15:20:33 +0000 (16:20 +0100)]
Doc: Fix external references

Change-Id: Icf5d6a6bcfe7ef15c6e8e66d94bdd59ae6dbc904
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoRemove 'com.nokia' string from autotest
Alan Alpert [Fri, 30 Nov 2012 23:16:27 +0000 (15:16 -0800)]
Remove 'com.nokia' string from autotest

Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5e
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
11 years agoQtDeclarative: Add qtlinguist to the doc dependecies.
David Schulz [Tue, 4 Dec 2012 14:35:13 +0000 (15:35 +0100)]
QtDeclarative: Add qtlinguist to the doc dependecies.

Change-Id: I1217b0df22a5f9111d22387a512d53ab0c176a17
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
11 years agoUse the qRegisterMetaType which does not take a string.
Stephen Kelly [Tue, 4 Dec 2012 13:27:15 +0000 (14:27 +0100)]
Use the qRegisterMetaType which does not take a string.

The string is redundant, not needed, and is at risk of containing typos.

Change-Id: I692dba07a09d4cbe8dca6ac4ac1187070b2bf59a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoDeclare QJSValue as a metatype where it is defined.
Stephen Kelly [Tue, 4 Dec 2012 13:24:43 +0000 (14:24 +0100)]
Declare QJSValue as a metatype where it is defined.

Instead of in multiple different TUs, therefore causing ODR violations.

Change-Id: I08d3624d3ed5a995e96488361665afa197fb9fc9
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoDeclare QQmlV8Handle as a metatype where it is defined.
Stephen Kelly [Tue, 4 Dec 2012 13:13:14 +0000 (14:13 +0100)]
Declare QQmlV8Handle as a metatype where it is defined.

Instead of in multiple different TUs, therefore causing ODR violations.

Change-Id: Iefc5f3486961b91dd4e97a462f72570ff49bfd1b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agosync.profile: Point dependencies to 'refs/heads/stable'
Sergio Ahumada [Tue, 4 Dec 2012 10:26:08 +0000 (11:26 +0100)]
sync.profile: Point dependencies to 'refs/heads/stable'

We should test stable branches against stable branches only.
At some point we should automate the merges from dev->stable->release
and decide how to handle possible merge conflicts.

This is good enough for the time being.

Change-Id: Idc68c5c4653375b1805638b80c2a9e8f5a2cacad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
11 years agodoc: Fix remaining snippet in qml-modelviews example
Eskil Abrahamsen Blomfeldt [Tue, 4 Dec 2012 09:56:48 +0000 (10:56 +0100)]
doc: Fix remaining snippet in qml-modelviews example

The others were already fixed, but I missed this one.

Change-Id: I4a53784b474a393877c4a65bd157b807e2d52939
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoAvoid duplicating Qt Quick Code Samples
Eskil Abrahamsen Blomfeldt [Mon, 3 Dec 2012 14:13:02 +0000 (15:13 +0100)]
Avoid duplicating Qt Quick Code Samples

We can't include ../../.. in exampledirs, because then qtqml
will include all in the whole repository and a bunch of them
will be duplicated in qtquick and qtqml.

Change-Id: Ib2b9776af0969baceb1e4907c79ce6cecf31f67e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoDoc: Edited qdocconfig files to change QCH titles and redirects.
Jerome Pasion [Mon, 3 Dec 2012 15:35:35 +0000 (16:35 +0100)]
Doc: Edited qdocconfig files to change QCH titles and redirects.

Task-number: QTBUG-28341
Change-Id: Iba37adc500794f18e90f0a9dd4a765a5c90d5e10
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
11 years agoResume testing of customparticle
Alan Alpert [Fri, 30 Nov 2012 20:27:48 +0000 (12:27 -0800)]
Resume testing of customparticle

Tests were suspended pending a fix for QTBUG-24034, which was fixed
months ago.

Change-Id: I903addc8cb1206073e8e1e1532dbabc6611060b4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoDocs: Fix some more references
Christian Stenger [Thu, 29 Nov 2012 12:48:21 +0000 (13:48 +0100)]
Docs: Fix some more references

Change-Id: I9fa1337128d91527056e3bcd26e693a19ab68eff
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoQt Quick high-dpi support.
Morten Johan Sørvig [Wed, 21 Nov 2012 13:26:05 +0000 (14:26 +0100)]
Qt Quick high-dpi support.

Set the device and viewport rect to the full device
pixel size. Set the projection matrix to the device
independent pixel size.

Scale shader effect source texture sizes.

Change-Id: I61dd546ff36a7ce6ad05f908796555674c714c1a
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoStabilize tst_qqmltimer
Alan Alpert [Fri, 30 Nov 2012 22:53:37 +0000 (14:53 -0800)]
Stabilize tst_qqmltimer

Use consistent timing on the unified timer instead of qWait

Change-Id: I76c402081062f7f6849bd421e90bc96f08e8d959
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix QML XmlHttpRequest Insecure Redirection Flaw
Richard Moore [Fri, 30 Nov 2012 11:16:51 +0000 (11:16 +0000)]
Fix QML XmlHttpRequest Insecure Redirection Flaw

Fix the redirection flaw in QML's XmlHttpRequest implementation that
is described in
http://lists.qt-project.org/pipermail/announce/2012-November/000014.html

Change-Id: Idfad4bc5dde6eda8840737c38e85568f3a4c0420
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoUpdate SGNode after pixmap is invalidated
Alan Alpert [Sat, 17 Nov 2012 06:32:03 +0000 (22:32 -0800)]
Update SGNode after pixmap is invalidated

If the QDeclarativePixmap on a previously valid Image is cleared, and the
scenegraph updates before the networked pixmap request returns, the
scenegraph can crash when trying to paint a now invalid texture.

Task-number: QTBUG-27795
Change-Id: I83436f846a3e965b324ff6ebf057708fe8c3b82a
Reviewed-by: Alan Alpert <aalpert@rim.com>
11 years agoMake static QQmlProperty::read() take a const QObject pointer.
Andreas Hartmetz [Fri, 30 Nov 2012 15:35:45 +0000 (16:35 +0100)]
Make static QQmlProperty::read() take a const QObject pointer.

It uses the QObject in a non-const, but still logically const, way
internally. Given that the compiler disregards const for code generation
and that the QObject won't change in any way observable from the
outside, that should not be a problem.

Task-number: QTBUG-28258
Change-Id: I1a852a2597eb2ff05b421e8024e70e7ac5299627
Reviewed-by: Alan Alpert <aalpert@rim.com>
11 years agoCompile with QT_NO_VALIDATOR.
Volker Krause [Fri, 30 Nov 2012 15:09:23 +0000 (16:09 +0100)]
Compile with QT_NO_VALIDATOR.

Theses enums were apparently renamed for the case QValidator is present,
so follow this here as well.

Change-Id: Ic2a3fd5296a6dd9da356c2e5efd88f56d0843664
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoCompile with -no-feature-cursor.
Volker Krause [Fri, 30 Nov 2012 10:45:56 +0000 (11:45 +0100)]
Compile with -no-feature-cursor.

Change-Id: I47fa7b978a8087086161b1e7bde2e0b2f91fd6e5
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoQmltypes: Update plugins.qmltypes
Kai Koehne [Fri, 30 Nov 2012 10:22:05 +0000 (11:22 +0100)]
Qmltypes: Update plugins.qmltypes

Change-Id: I5388ece0f62a57566d7059077c88bb42e81b3238
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
11 years agoFix example lists for Qt Quick
Eskil Abrahamsen Blomfeldt [Fri, 30 Nov 2012 11:30:11 +0000 (12:30 +0100)]
Fix example lists for Qt Quick

Snippets are fixed, the extending-examples are moved from
QtDoc, groups are used to generate the lists and I've removed
some unrelated stuff from the list of Qt Quick examples.

Change-Id: I347b6fa8a29b1cede1164fa858488f34507e1a17
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoLimit case-sensitivity check in QML to file names.
Friedemann Kleint [Thu, 29 Nov 2012 16:20:34 +0000 (17:20 +0100)]
Limit case-sensitivity check in QML to file names.

Provide for checking relative paths only; default to file names.
Currently, the checking triggers on a drive letters and
installation folder names, which is too strict.

Task-number: QTBUG-28277
Change-Id: I1174bb0c485eeb1ffee10bb2a523d6629c57728b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
11 years agoRemove the remaining usages of deprecated QWindow accessors
Shawn Rutledge [Fri, 30 Nov 2012 10:44:52 +0000 (11:44 +0100)]
Remove the remaining usages of deprecated QWindow accessors

Change-Id: I146e7b8e3ae0ee74f5f4e3ef85f59d50a639c0f5
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoAdd calqlatr to qmldemos group and move qmldemos list
Eskil Abrahamsen Blomfeldt [Fri, 30 Nov 2012 09:21:37 +0000 (10:21 +0100)]
Add calqlatr to qmldemos group and move qmldemos list

The qmldemos list has been moved to qtdoc, otherwise the links
to the documentation for the demos (in qtdoc) doesn't work.
Links from qtdoc to calqlatr in qtdeclarative works because
that's the direction of the dependency.

Change-Id: Ib275a9c7f009194a260b2e70278244afc1cedfaa
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoQmlPluginDump: Prevent crash if run without WM
Kai Koehne [Fri, 30 Nov 2012 09:55:07 +0000 (10:55 +0100)]
QmlPluginDump: Prevent crash if run without WM

Make sure that the minimal platform plugin is used by default.

Change-Id: I2362649dafaf823b00ab37519b516aef9ac3166b
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoMade tst_QQmlDebugJS insignificant on Mac.
Janne Anttila [Thu, 29 Nov 2012 07:42:28 +0000 (09:42 +0200)]
Made tst_QQmlDebugJS insignificant on Mac.

This test has been failing often on Mac. It seems that test case only
fails with Qt5 master integration, but not with QtDeclarative CI. This
test has now failed twice consecutive in virtualized Mac OSX machines.
Since I'm going to add some more virtual Macs to CI tomorrow morning,
making this test case insignificant to avoid good changes integrating
in additional capacity.

For more information, see the following bug report.

Task-number: QTBUG-28263

Change-Id: I3492373f4f034c27fdbc207e395a40ef96dccbd9
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoRemove superfluous function call
Alan Alpert [Sat, 17 Nov 2012 06:37:56 +0000 (22:37 -0800)]
Remove superfluous function call

Because we just set pixmapChanged, we're certain to update the texture
in the next if block.

Change-Id: I83436f846a3e965b324ff6ebf057708fe8c3b82b
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoMove no-Gui related QML types from QtQuick into QtQml
Tasuku Suzuki [Sat, 24 Nov 2012 19:36:33 +0000 (04:36 +0900)]
Move no-Gui related QML types from QtQuick into QtQml

Task-number: QTBUG-26340

Change-Id: I9049128db2598bf3c7a9d677b774eaae53b54eb5
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoRenamed QQuickItem::pos property to position
Shawn Rutledge [Mon, 22 Oct 2012 14:59:25 +0000 (16:59 +0200)]
Renamed QQuickItem::pos property to position

Abbreviated property names are less descriptive so we don't have
many of them.  Might as well be consistent.  QWindow::pos was already
renamed.

Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoMake tst_examples::namingConvention not fail
Kai Koehne [Thu, 29 Nov 2012 11:39:14 +0000 (12:39 +0100)]
Make tst_examples::namingConvention not fail

The test seems to be wrong. Keep the warning though if other
tests actually rely on the behavior.

Task-number: QTBUG-28271
Change-Id: I862fd442982021f26531f43b56b97f7c7b8c9c69
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoMake FolderListModel available from the module overview.
Gunnar Sletta [Thu, 29 Nov 2012 09:08:50 +0000 (10:08 +0100)]
Make FolderListModel available from the module overview.

Change-Id: I19c9a28b290a2ed7b3edee18583b686abf97dec0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoWarn about potential abuse of QQuickPaintedItem::paint().
Gunnar Sletta [Thu, 29 Nov 2012 07:41:21 +0000 (08:41 +0100)]
Warn about potential abuse of QQuickPaintedItem::paint().

Change-Id: I9908402b3ada90497070930d43eafd433276201f
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agotr()-Fix: Do not use QObject::tr().
Friedemann Kleint [Tue, 27 Nov 2012 10:19:12 +0000 (11:19 +0100)]
tr()-Fix: Do not use QObject::tr().

Change-Id: I85eb3f429d273b69270817eb4e9f1c386b5cda20
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoApply full transform
Alan Alpert [Thu, 22 Nov 2012 03:49:39 +0000 (19:49 -0800)]
Apply full transform

Previously the particle system was only applying the translaton of the
relative transfrom from any emitters. Now the full transform is used.

Task-number: QTBUG-25518
Change-Id: I4c654837c37dbef8f6f407387ce4ea82cb3b821c
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoFix mouse event distribution for Flickable with pressDelay
Matt Vogt [Wed, 28 Nov 2012 22:35:00 +0000 (08:35 +1000)]
Fix mouse event distribution for Flickable with pressDelay

If an item responds to mouse events but does not accept them, it
can prevent the events from being processed by the correct item
further up the parent chain.  For example, a text item inside a
mouse area can wrongly consume a press event, so that the following
release event does not yield a click when processed by the mouse area.

Rather than speculatively assigning the mouse grab to items during
event filter processing, change Flickable to retain the grab for
the duration of the pressDelay and to release it during replay of
the press event.

Change-Id: Ied12b9643838a984c7026978047465c2830e55e4
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
11 years agoDocs: Fix some reference errors
Christian Stenger [Wed, 28 Nov 2012 17:32:31 +0000 (18:32 +0100)]
Docs: Fix some reference errors

Change-Id: Idf616d765398fe694b203dde595347f642ce503e
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoRemove QML intro and QML Application Development pages
Gunnar Sletta [Wed, 28 Nov 2012 15:19:33 +0000 (16:19 +0100)]
Remove QML intro and QML Application Development pages

These are duplicates of the getting started document and the overviews
listed in the "Important Concents of Qt Quick".

They are also not accessible from the toplevel docs (because they are
duplicates).

Change-Id: I628d264a7738bb3b9efdaf04f3a3c1a3853688d6
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoMark scarc resource docs as internal for 5.0
Frederik Gladhorn [Fri, 23 Nov 2012 13:37:35 +0000 (14:37 +0100)]
Mark scarc resource docs as internal for 5.0

Change-Id: Ic3e235399161dcf0c9a259a5e94b4178d61eb5cb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix escape sequences in lexer: the capital X is not an EscapeCharacter.
Erik Verbruggen [Wed, 28 Nov 2012 13:21:21 +0000 (14:21 +0100)]
Fix escape sequences in lexer: the capital X is not an EscapeCharacter.

The ECMA test suite has a test to check that none of the characters in
the English capital alphabet are escapable (S7.8.4_A4.2_T1). Or, put
differently, paragraph 7.8.4 states that only the lower-case x is
escapable and usable for a HexEscapeSequence.

Change-Id: Ie9f73726889ee9e0165c75c9b2e006a9f2b3dbda
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoRemove superflous "defining reusable components" documentation.
Gunnar Sletta [Wed, 28 Nov 2012 07:47:26 +0000 (08:47 +0100)]
Remove superflous "defining reusable components" documentation.

Change-Id: I73e6be5c7e5abe42ebf797ccfc7db5035ec4ec2c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoExamples: quick/scenegraph - add needed main.qml file to pro file
Caroline Chao [Wed, 28 Nov 2012 08:53:40 +0000 (09:53 +0100)]
Examples: quick/scenegraph - add needed main.qml file to pro file

To fix the installation for customgeometry and simplematerial examples.

Task-number: QTBUG-28243

Change-Id: Iafe62e30e7a0deeaeb0b6755fa2fd25a31f18ce5
Reviewed-by: Holger Ihrig <holger.ihrig@digia.com>
11 years agodocfix: Some of the scenegraph overview content did not make sense.
Gunnar Sletta [Wed, 28 Nov 2012 07:34:12 +0000 (08:34 +0100)]
docfix: Some of the scenegraph overview content did not make sense.

Change-Id: Ib354e5f0a9f3c6e35eb8dabfb36e931f9ba4f255
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agodocfix: Move image to correct location
Gunnar Sletta [Wed, 28 Nov 2012 07:11:20 +0000 (08:11 +0100)]
docfix: Move image to correct location

Change-Id: Id16d52de895bf48e29c565c84c7602318a90a85d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDocfix: Move images to correct location and fix bugs in code sample.
Gunnar Sletta [Wed, 28 Nov 2012 06:55:20 +0000 (07:55 +0100)]
Docfix: Move images to correct location and fix bugs in code sample.

Change-Id: I7ec530f0e1a41051e31517e6fcac5eb691d1795d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDeclare type information for some internal qml types.
Jędrzej Nowacki [Fri, 2 Nov 2012 16:21:38 +0000 (17:21 +0100)]
Declare type information for some internal qml types.

QQmlVME::State and QBitField are movable and used in QStack. Declaring
them as movable may improve potential reallocation time, although it is
hard to prove.

Change-Id: Ia42b8104e2f24ca7574370c76084df44b9f9298e
Reviewed-by: Alan Alpert <aalpert@rim.com>
11 years agoFix the QML Effects docs up a bit
Gunnar Sletta [Tue, 27 Nov 2012 15:57:02 +0000 (16:57 +0100)]
Fix the QML Effects docs up a bit

Change-Id: I09226e8796be6a9785496192a5e3114d01e2ffd7
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoEnable the lexer to run in JS strict/non-strict mode as well as QML mode
Erik Verbruggen [Tue, 27 Nov 2012 14:46:05 +0000 (15:46 +0100)]
Enable the lexer to run in JS strict/non-strict mode as well as QML mode

If the lexer is running in JS mode (non-qmlMode), then allow for
FutureReservedWords as identifiers. Proper strict mode handling of them
should be implemented in the semantic phase.

QML mode is not affected, so it will reject most FutureReservedWords,
and a number of other keywords.

See also ECMA-262, version 5.1, paragraph 7.6.1.2.

Change-Id: Ide73a041f2dfda2de3b719d6437d517f469eb450
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFixed line terminators to handle LS/PS and CR+LF correctly.
Erik Verbruggen [Mon, 26 Nov 2012 12:35:24 +0000 (13:35 +0100)]
Fixed line terminators to handle LS/PS and CR+LF correctly.

Change-Id: Ie1cd4d662c80630155e922dce38ea01d8ee2504a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix qdoc typo
Gunnar Sletta [Tue, 27 Nov 2012 14:38:55 +0000 (15:38 +0100)]
Fix qdoc typo

Change-Id: I3527064168c44cb4909f183d4b6a5c804649d0bb
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoRemove TODO from docs as it doesn't make sense.
Gunnar Sletta [Tue, 27 Nov 2012 13:57:02 +0000 (14:57 +0100)]
Remove TODO from docs as it doesn't make sense.

Change-Id: If23707d5778c6f97e9c9565ac1c5e23d5729fdc4
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agostyle microfix in example
Robert Loehning [Thu, 22 Nov 2012 16:16:44 +0000 (17:16 +0100)]
style microfix in example

Change-Id: I930f4a9ed117c9adf7fe2b4efbaa1e65401d1e42
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
11 years agoQt Quick (2) is not dependent on LGPL code
Lars Knoll [Tue, 27 Nov 2012 11:29:34 +0000 (12:29 +0100)]
Qt Quick (2) is not dependent on LGPL code

Change-Id: I0cece9da63bce327d2d6bc2eb13d500bd054f12f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoexamples/quick/multipointtouch: move emitter instead of ParticleSystem
Thomas Senyk [Thu, 22 Nov 2012 15:19:30 +0000 (16:19 +0100)]
examples/quick/multipointtouch: move emitter instead of ParticleSystem

When you move the ParticleSystem, the existing particles will be moved
as well. If you move the emitter, only new particles will be moved.
Additional the velocityFromMovement adds a nice effect.

Change-Id: I58eeb1fecde1ca24631400676049e5f9a06518de
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
11 years agoImports: update .qmltypes files
Kai Koehne [Mon, 26 Nov 2012 15:52:26 +0000 (16:52 +0100)]
Imports: update .qmltypes files

Change-Id: I897c1e04cbbb2adf9655cbd277d7d51bcd2a50de
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
11 years agoAccept missing semicolon after do-while statement.
Erik Verbruggen [Thu, 22 Nov 2012 08:39:22 +0000 (09:39 +0100)]
Accept missing semicolon after do-while statement.

Although not valid according to ECMA 5.1, both JSC and V8 accept a
missing semicolon after a do-while loop. (Both JSC and V8 do not do this
through automatic semicolon insertion, but handle it as a special case.)

Change-Id: Iff2b07b894564740d2dcbf9b1d46bc279d30b9e3
Reviewed-by: Alan Alpert <aalpert@rim.com>
11 years agoEnable module build with QT_NO_IM
Tasuku Suzuki [Thu, 22 Nov 2012 17:47:45 +0000 (02:47 +0900)]
Enable module build with QT_NO_IM

Change-Id: I90f8ec7e6357db7b4038bb1646fe9d3835821556
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
11 years agoEnable mobule build with QT_NO_TRANSLATION
Tasuku Suzuki [Thu, 22 Nov 2012 19:21:49 +0000 (04:21 +0900)]
Enable mobule build with QT_NO_TRANSLATION

Change-Id: Id7aeef0d499f48ddc64b4ea3e4dc713db8458c38
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
11 years agoFix deployment docs.
Lars Knoll [Mon, 26 Nov 2012 09:52:20 +0000 (10:52 +0100)]
Fix deployment docs.

Qt Quick is not dependent on widgets.

Change-Id: Icd7ab72d9558905ac6d3790faa0248b0d197ea8c
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoQQuickWindow cannot rely on QWindowPrivate.geometry
Shawn Rutledge [Fri, 23 Nov 2012 16:04:43 +0000 (17:04 +0100)]
QQuickWindow cannot rely on QWindowPrivate.geometry

because sometimes geometry has been set on the platform window and
sometimes it's only stored in the QWindow geometry, waiting for the
asynchronous confirmation.  So it should call QWindow::geometry()
instead.

Change-Id: Ifa54792be31440108fae212240a46ae269393eb7
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoNested Flickables with pressDelay flick incorrect Flickable
Martin Jones [Sun, 25 Nov 2012 23:33:20 +0000 (09:33 +1000)]
Nested Flickables with pressDelay flick incorrect Flickable

If the gesture is triggered within the pressDelay the outer Flickable
will always handle the gesture.  When the drag distance is exceeded
replay the press event to allow all Flickables an opportunity to
process the gesture normally.

Task-number: QTBUG-28189
Change-Id: I36912cc19a48c90ae7a9a430580a8f40071bd5fd
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
11 years agoReduce number of relocations
Marc Mutz [Fri, 23 Nov 2012 16:12:49 +0000 (17:12 +0100)]
Reduce number of relocations

...by turning pointer into array variables.

Change-Id: Ia5a0cedcf28d54210cc1f179db5c519e7e0672cc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoDeclarative examples: fixed particles/imageparticle example
Christiaan Janssen [Fri, 23 Nov 2012 16:17:45 +0000 (17:17 +0100)]
Declarative examples: fixed particles/imageparticle example

Change-Id: Idec210a23e85f1460652f938c72aea7b5a2a2458
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
11 years agoDeclarative Examples: improved buttons in particles/wander example
Christiaan Janssen [Fri, 23 Nov 2012 15:28:38 +0000 (16:28 +0100)]
Declarative Examples: improved buttons in particles/wander example

Change-Id: I5c8019e702d848c8ec61ea850502c68f378c44fe
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
11 years agoSupport requestPixmap if platform has ThreadedPixmaps feature
Albert Astals Cid [Fri, 23 Nov 2012 11:44:16 +0000 (12:44 +0100)]
Support requestPixmap if platform has ThreadedPixmaps feature

As discussed with Samuel enable the use of requestPixmap in a thread
for async requests if the platform support ThreadedPixmaps

Task-number: 28138
Change-Id: I106cf0123430115464b0a75071c7e6129a98d22b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoQtDeclarative: fixed modelviews example
Christiaan Janssen [Thu, 22 Nov 2012 16:54:33 +0000 (17:54 +0100)]
QtDeclarative: fixed modelviews example

Change-Id: I3d31beb6a23b7c74061cf66d3c13616911cda7c6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
11 years agoStop using the name "trolltech" in interface name
Tasuku Suzuki [Fri, 23 Nov 2012 05:11:03 +0000 (14:11 +0900)]
Stop using the name "trolltech" in interface name

Change-Id: Ie30146415c99700c1b55fb2f01331ec9b1a42359
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agodocs: Separate qml and c++ examples
Frederik Gladhorn [Thu, 22 Nov 2012 15:54:15 +0000 (16:54 +0100)]
docs: Separate qml and c++ examples

Change-Id: I1d9e2e281bff2bb77a8bdf53726d3c452e3fe911
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agomake module compile with -no-gui
Tasuku Suzuki [Wed, 21 Nov 2012 04:06:25 +0000 (13:06 +0900)]
make module compile with -no-gui

Change-Id: I106cf0933930115464b0b7507177e6129098d22b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoDoc: Adding "qtgui" to the documentation dependency.
Jerome Pasion [Thu, 22 Nov 2012 11:53:40 +0000 (12:53 +0100)]
Doc: Adding "qtgui" to the documentation dependency.

-Qt Quick and Qt QML depend on Qt GUI and its
documentation.

Change-Id: Icf14107490bf7a884a5e5840d7ec7bdd62e1cf09
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoImproved documentation of Text.textFormat property.
Samuel Rødal [Thu, 22 Nov 2012 11:36:25 +0000 (12:36 +0100)]
Improved documentation of Text.textFormat property.

Even though using RichText is not recommended, we should still at least
point out what it does.

Change-Id: I96d0e1e7074b5fdbb3a5dcaf84e5afe805c92080
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoFix installation of examples.
Christian Kandeler [Thu, 22 Nov 2012 10:33:28 +0000 (11:33 +0100)]
Fix installation of examples.

Enable examples to be built in the target tree. This entails installing
the project files and possibly other missing stuff.
Task-number: QTBUG-27977

Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoAdd designer support for animations and componentComplete
Marco Bubke [Thu, 22 Nov 2012 10:28:57 +0000 (11:28 +0100)]
Add designer support for animations and componentComplete

In the designer animations confuse users, if you change a state or move a
item around. Also component complete is called later by the designer.
The call in the VME is to early.

Change-Id: I49aa04edbc49fb44ddb7b52062307982865efd7e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
11 years agoFix security warning about passing a variable to printf-formatting.
Friedemann Kleint [Thu, 22 Nov 2012 09:25:30 +0000 (10:25 +0100)]
Fix security warning about passing a variable to printf-formatting.

Change-Id: I7ea8ff54d24fe0818cd216d4aac0e8970461306e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoExpose QMatrix4x4 properties as mat4 uniforms in shaders
Chris Adams [Mon, 19 Nov 2012 08:36:09 +0000 (18:36 +1000)]
Expose QMatrix4x4 properties as mat4 uniforms in shaders

Previously, QMatrix4x4 properties were not exposed as uniforms in
shaders.  This commit adds conversion code for matrix 4x4 properties
so that they are automatically converted to mat4 uniforms.

Task-number: QTBUG-27952
Change-Id: I9b1de39fbbcb02743cf8c4e09b4d83c44f1dd438
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoAesthetic tweaks for qmleasing UI
Alan Alpert [Wed, 21 Nov 2012 15:55:03 +0000 (07:55 -0800)]
Aesthetic tweaks for qmleasing UI

Add window title and shrink import button.

Change-Id: Ic35b03c1b7d24fc4c3ca1dc237445474ecf3a213
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
11 years agoUnify qmleasing and easingcurveeditor
Alan Alpert [Tue, 20 Nov 2012 03:01:50 +0000 (19:01 -0800)]
Unify qmleasing and easingcurveeditor

Keeping the name qmleasing, but most of the code from easingcurveeditor.
easingcurveeditor had more UI and functionality, as qmleasing could only
import AfterEffects curves. That functionality has now been added to
easingcurveeditor.

Change-Id: Iac1a004f13fe33a18449af1b08bd22138d525322
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
11 years agoDeliver parameters to bound signals.
Frederik Gladhorn [Wed, 21 Nov 2012 12:47:13 +0000 (13:47 +0100)]
Deliver parameters to bound signals.

In the following property change "mouse" would be undefined
since the number of parameters was not correctly evaluated.

PropertyChanges {
    target: mouseArea
    onClicked: console.log(mouse)
}

Task-number: QTBUG-27300
Change-Id: Ie3fb9a49155312af1feb5c7ff67d78e019925130
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoUngrab mouse upon leave event.
Frederik Gladhorn [Thu, 8 Nov 2012 16:43:46 +0000 (17:43 +0100)]
Ungrab mouse upon leave event.

The event signals that the mouse has left the window.
This happens also when a popup is shown (overlapping the original window).
Before a mouse area would still think it was in pressed state
when the popup (QWindow/QMenu) was shown and even after the popup was closed.

Change-Id: I6d32571f5a473610f60e9476850989ff665edb93
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoDocument importing issues in worker script
Jędrzej Nowacki [Tue, 20 Nov 2012 14:32:37 +0000 (15:32 +0100)]
Document importing issues in worker script

Task-number: QTBUG-27454
Change-Id: Ia9f384ab92fe0c55d3299d32a3f7faba1446ce35
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
11 years agoRefactoring samegame
Fabian Bumberger [Thu, 15 Nov 2012 12:47:24 +0000 (13:47 +0100)]
Refactoring samegame

This patch cleans up the example and makes it more customizeable by adding a setting file. Also a bug has been fixed, where the "New game" button could not been clicked.

Change-Id: Ia397258721dfcf4900e3ed1e176a257eccfad354
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
11 years agoFix syncqt-warnings.
Friedemann Kleint [Tue, 20 Nov 2012 09:53:52 +0000 (10:53 +0100)]
Fix syncqt-warnings.

Use include with module name in the public headers.

Change-Id: I50d3767a5538bc3f935ebf61b56894c8f0461981
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
11 years agoMerge branch 'newdocs'
Eskil Abrahamsen Blomfeldt [Tue, 20 Nov 2012 09:17:47 +0000 (10:17 +0100)]
Merge branch 'newdocs'

Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25

11 years agoFixed memory leak of registered QML modules
Vadim Zakondyrin [Sat, 17 Nov 2012 12:29:25 +0000 (19:29 +0700)]
Fixed memory leak of registered QML modules

Change-Id: I254f755641f5ac8383e5818b5294ec85fd9236e8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>