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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Eskil Abrahamsen Blomfeldt [Tue, 20 Nov 2012 09:17:47 +0000 (10:17 +0100)]
Merge branch 'newdocs'
Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
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>
Thiago Macieira [Mon, 15 Oct 2012 21:01:59 +0000 (14:01 -0700)]
Use the new QLibraryInfo::Qml2ImportsPath path for QML 2.
Also change the environment variable to be QML2_IMPORT_PATH. This
splits the imports from QML 1 (the QtDeclarative library).
Change-Id: Icadbf96283b1cf071ed0deb04e8c8476da664009
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Matt Vogt [Mon, 19 Nov 2012 01:03:20 +0000 (11:03 +1000)]
Allow margin changes during Flickable drag operation
Previously, the dimensions of the flickable were captured at mouse
press and reused during dragging, which causes problems if the margins
of the Flickable are altered during the drag. Adjust the captured
values so that margin changes are correctly handled.
Change-Id: I1ce608dcc1302ea8639bf18a81361b27749b217b
Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
hjk [Fri, 16 Nov 2012 11:15:18 +0000 (12:15 +0100)]
Update gettingStartedQml example code to use standard Qt coding style
Change-Id: I225ea53a4e06e92367feb368dd6deea6f9acf403
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Samuel Rødal [Wed, 7 Nov 2012 16:10:42 +0000 (17:10 +0100)]
Use threaded renderer even without BufferQueueingOpenGL.
Without threaded rendering QML 2 often ends up running at half the
screen refresh rate on X11. Not having BufferQueuingOpenGL shouldn't
prevent us from using threaded rendering, since the issue of four
animating windows running at 1/4th of the screen refresh rate will
happen regardless of whether rendering happens on the main thread or in
a separate rendering thread.
Change-Id: I0edc818e6d762fa1faf13e7f2f47dfda132b6fdf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Frederik Gladhorn [Sat, 3 Nov 2012 22:50:49 +0000 (23:50 +0100)]
Accessibility: add stepSize to value interface.
Change-Id: I4c654837c37dbef8f6f407387ce4ea82cb3b821b
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Kai Koehne [Fri, 9 Nov 2012 10:24:40 +0000 (11:24 +0100)]
QuickTest: Remove reference to /tests/qmlauto
There's no tests/qmlauto in the source tree, neither could I find
an example using QUICK_TEST_SOURCE_DIR.
Task-number: QTBUG-27919
Change-Id: I5a4ba5653a06e448a922a47900ae3f2d12e3020c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Shawn Rutledge [Sun, 11 Nov 2012 14:18:23 +0000 (15:18 +0100)]
Fix StocQt example - need full 4-digit years for yahoo API
Change-Id: Id5f6895c3e4c901af3e4e45ca8a1474c9fdb19d9
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
Alexandr Akulich [Sat, 20 Oct 2012 02:24:56 +0000 (08:24 +0600)]
Deduplicate checking of conditions.
Change-Id: I0621db17db2bb8fe885a3a65f6a7a042279c3752
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Frederik Gladhorn [Sat, 3 Nov 2012 22:52:47 +0000 (23:52 +0100)]
Improve documentation.
Change-Id: I9bfb8bf8167e3b55d3539dc35e4278b5514119c8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Shawn Rutledge [Fri, 9 Nov 2012 10:36:01 +0000 (11:36 +0100)]
Preparation for changing QWindow::windowState to visibility
QQuickWindow needs to avoid depending on QWindowPrivate::visible.
It can go back to using private variables after the replacment is done.
Change-Id: I38b99df8b4ef0139c9eadcbb07d33d3f1894a8ac
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Shawn Rutledge [Thu, 8 Nov 2012 15:12:01 +0000 (16:12 +0100)]
Window example tests Qt.application.supportsMultipleWindows
Change-Id: I7fcdd518e56427316f454ff4e5b298d13b396ac0
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Fabian Bumberger [Fri, 9 Nov 2012 13:10:27 +0000 (14:10 +0100)]
Blackberry: Workaround for GLSL compiler bug.
Change-Id: If3ce968c0a0a2af4244671fe028a560843c9016a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Shawn Rutledge [Mon, 22 Oct 2012 11:44:21 +0000 (13:44 +0200)]
Examples and fixes for QML Window properties
Setting Window.color in QML takes effect immediately.
It was only possible to set the property at startup.
Examples demonstrate new Window property features.
Change-Id: Ic5b43d0d84371f3fe5c42223ccc98e6de27aed10
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Shawn Rutledge [Mon, 22 Oct 2012 15:09:06 +0000 (17:09 +0200)]
Renamed QWindow::pos property to position
Abbreviated properties are to be avoided, and this is a new class so
we have a good opportunity to avoid it before the release.
Related to qtbase change I19c00b54b1d2712f9418e8bcf56e35a8008b89ef
Change-Id: Ibd5cd10814c8cbd2b1f6e49b70782c7768d2366d
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Thiago Macieira [Mon, 24 Sep 2012 13:58:00 +0000 (15:58 +0200)]
Install the Qt Quick 2 examples in the "qtquick" dir
Leave the "qtdeclarative" dir for Qt Quick 1, which is where it used
to be in Qt 4.
Change-Id: I44997771d77617564fc608c1aba95e3ada8f9a69
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Kai Koehne [Fri, 9 Nov 2012 10:07:53 +0000 (11:07 +0100)]
Don't install tst_qmltest to $QTDIR/tests
Don't try to install the tst_qmltest by default, since it will
install itself to $QTDIR/tests.
Task-number: QTBUG-26661
Change-Id: I310f660cc486ffb4358af14ea15db389375ed802
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Samuli Piippo [Thu, 8 Nov 2012 08:35:51 +0000 (10:35 +0200)]
tests: Mark some tests as insignificant on Mac
Task-number: QTBUG-27890
Change-Id: I48edea29ccaa593e4bab61c1a968130a5d3457f3
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Samuel Rødal [Thu, 8 Nov 2012 14:34:26 +0000 (15:34 +0100)]
Expose "Qt.application.supportsMultipleWindows".
Useful on platforms like kms and eglfs that only support a single
QWindow. On those platforms the QML application can thus choose to use a
Rectangle instead of a Window to show dialogs etc.
Change-Id: Idc3f46d2cad6cf3f55c5c84df2c8511407bd4849
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>