platform/upstream/qtdeclarative.git
10 years agoMove Value::fromBool, ... to a new Primitive class
Lars Knoll [Wed, 25 Sep 2013 10:24:36 +0000 (12:24 +0200)]
Move Value::fromBool, ... to a new Primitive class

This will simplify finding the remaining direct usages of
QV4::Value that need fixing.

Change-Id: I223099727436d5748027c84c53d9dfc4028e38ed
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoUse SafeValue in more places
Lars Knoll [Wed, 25 Sep 2013 09:53:03 +0000 (11:53 +0200)]
Use SafeValue in more places

Change-Id: Ic15c1419c74f22bd7639ce8746ff11b15240b718
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoClean up QV4::ExecutionContext
Lars Knoll [Wed, 25 Sep 2013 08:33:35 +0000 (10:33 +0200)]
Clean up QV4::ExecutionContext

Remove an unused variable, and don't copy runtimeStrings

Change-Id: I2197a7eb82ab3dbefea83cc917567390266f9673
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix CallContext to not hold arguments on the C stack anymore
Lars Knoll [Wed, 25 Sep 2013 08:09:26 +0000 (10:09 +0200)]
Fix CallContext to not hold arguments on the C stack anymore

Change-Id: I35f46cce4f243d4b8b2bac9244f8fc26836f413b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoDoc: Updated imports, \qmlmodule, and \inqmlmodule versions in src/qml.
Jerome Pasion [Tue, 24 Sep 2013 14:58:35 +0000 (16:58 +0200)]
Doc: Updated imports, \qmlmodule, and \inqmlmodule versions in src/qml.

-QDoc ignores the version in \inqmlmodule so its better to remove them
to avoid confusion.
-Qt QML import version is 2.2 for 5.2 release
-Qt Quick import version is 2.2 for 5.2 release

Task-number: QTBUG-32172
Change-Id: I15df270f1fb4df0476a9ddd854fb9ddf58e9fc7c
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
10 years agoUpdate after changes to QTestResult API in qtbase
Tor Arne Vestbø [Thu, 26 Sep 2013 11:59:46 +0000 (13:59 +0200)]
Update after changes to QTestResult API in qtbase

Change-Id: I8a28418753a21c700a365dd369d7befa8ab14f76
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
10 years agoAllow animators to work properly with multiple windows
Gunnar Sletta [Tue, 24 Sep 2013 10:51:36 +0000 (12:51 +0200)]
Allow animators to work properly with multiple windows

Change-Id: I5ba663ba0fa089ea786cf43cb4dfa40cbc955342
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
10 years agoQSGRenderLoop: don't dereference gl pointer if it has been deleted
Dmitry Shachnev [Wed, 11 Sep 2013 07:58:14 +0000 (11:58 +0400)]
QSGRenderLoop: don't dereference gl pointer if it has been deleted

Change-Id: Icd612b243cdfe1248d1b94964c53f5102f9558d2
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
10 years agoSupport looping for "uncontrolled animations".
Gunnar Sletta [Fri, 20 Sep 2013 13:26:03 +0000 (15:26 +0200)]
Support looping for "uncontrolled animations".

The render thread animations rely heavily on uncontrolled
animations, meaning animations with duration=-1. We support
this by adding a m_currentLoopStartTime and incrementally
counting the finish time of each uncontrolled animation.

Change-Id: I1f2ccea09aff4c51b1a7f98a2ddb58636af50557
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
10 years agoSkip two tests that don't work reliably with a conservative GC
Lars Knoll [Wed, 25 Sep 2013 19:40:54 +0000 (21:40 +0200)]
Skip two tests that don't work reliably with a conservative GC

Change-Id: I5619d533b6e48c88fda063bc7cdcc62d6838bcdf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoConvert more methods in QV8Engine
Lars Knoll [Tue, 24 Sep 2013 13:46:11 +0000 (15:46 +0200)]
Convert more methods in QV8Engine

Change-Id: I5b059b41842b4a6d9541525b3955d2b64c0011c3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoMove more API over to use ValueRef
Lars Knoll [Tue, 24 Sep 2013 13:25:10 +0000 (15:25 +0200)]
Move more API over to use ValueRef

Change-Id: I372f1f3e3e78d45912a913f437e622e0acfc9646
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoMake parts of qv8engine_p.h GC safe
Lars Knoll [Tue, 24 Sep 2013 12:28:02 +0000 (14:28 +0200)]
Make parts of qv8engine_p.h GC safe

Change-Id: Iaa15423cedc307a09b3cd7287272d93d7a604caf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix QQmlV4Function API to be GC safe
Lars Knoll [Tue, 24 Sep 2013 11:53:54 +0000 (13:53 +0200)]
Fix QQmlV4Function API to be GC safe

Change-Id: Id4f79c22fc48ada1c8a9a858e1b7b3d1cf14d120
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix API of QQmlV4Handle
Lars Knoll [Tue, 24 Sep 2013 10:13:42 +0000 (12:13 +0200)]
Fix API of QQmlV4Handle

Change-Id: Iac4a3fefebd33a5990408598486231a5add8e639
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix Persistent/WeakValue API
Lars Knoll [Mon, 23 Sep 2013 13:52:10 +0000 (15:52 +0200)]
Fix Persistent/WeakValue API

Don't use unprotected Values in the API anymore.

Change-Id: I8851628227fca374de24701bc8ee0908b5ae3923
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoCleanups in qv4stringobject
Lars Knoll [Sun, 22 Sep 2013 19:06:34 +0000 (21:06 +0200)]
Cleanups in qv4stringobject

Make the methods GC clean, and simplify some logic

Change-Id: I02df8cb571f27d640c6effc871ea7c24b23b8368
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix WinCE build.
Sérgio Martins [Wed, 25 Sep 2013 16:11:34 +0000 (17:11 +0100)]
Fix WinCE build.

Change-Id: Ie0536ad94f88efe1e54226ed7f1d9e1042ffcc19
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoqmlimportscanner: Print usage when no arguments are passed.
Friedemann Kleint [Wed, 25 Sep 2013 13:55:12 +0000 (15:55 +0200)]
qmlimportscanner: Print usage when no arguments are passed.

Change-Id: I2ba5e18fff635705b1f5e8e19c104ba078c8e3a1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoImport QtQml instead of QtQuick now that Locale is available there.
Mitch Curtis [Fri, 20 Sep 2013 10:31:30 +0000 (12:31 +0200)]
Import QtQml instead of QtQuick now that Locale is available there.

97feace2aaaf08075c17ea175a5ed0c12aa40a0d made it available.

Change-Id: I4a263a26c1db164f410c49fe0fca776aed53f7e8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
10 years agoDoc: Fix documentation of qmlProtectModule
Topi Reinio [Wed, 25 Sep 2013 13:09:00 +0000 (15:09 +0200)]
Doc: Fix documentation of qmlProtectModule

Fix the function signature used in \fn command and
document the parameters.

Change-Id: Ieda9b2b402886b81691195dbad17663fd454f282
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
10 years agoAvoid out-of-bounds read.
Gunnar Sletta [Tue, 24 Sep 2013 10:48:14 +0000 (12:48 +0200)]
Avoid out-of-bounds read.

Change-Id: I28777806b13da1b0a9e1fecc2734de0614f2443c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
10 years agoInitialize variable
Gunnar Sletta [Tue, 24 Sep 2013 10:13:45 +0000 (12:13 +0200)]
Initialize variable

Change-Id: I1f3cf8b922849fc482b3c1346eb476019f466a13
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoSplit off crashing test from qqmlecmascript.
Erik Verbruggen [Wed, 25 Sep 2013 12:09:57 +0000 (14:09 +0200)]
Split off crashing test from qqmlecmascript.

Task-number: QTBUG-33658

Change-Id: I5a9f24d49ab894e3cde745cc0c1d44ef0880510f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoConvenience class for FBO rendering in Qt Quick
Gunnar Sletta [Mon, 23 Sep 2013 07:53:58 +0000 (09:53 +0200)]
Convenience class for FBO rendering in Qt Quick

Change-Id: I5712bbfa0cde9f2fe5fddc35c4cc23597717065c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoDoc: Fixed and updated Qt Quick's \qmlmodule page
Jerome Pasion [Tue, 24 Sep 2013 14:41:12 +0000 (16:41 +0200)]
Doc: Fixed and updated Qt Quick's \qmlmodule page

-incremented version to Qt Quick 2.2 (in \qmlmodule page)
-import changed to QtQuick 2.2
-\inqmlmodule no longer needs the version. QDoc will ignore the version
but it is better to remove it now to avoid confusion

Task-number: QTBUG-32172
Change-Id: I40b52e59667014720be40a35b3a8fb9836825e31
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
10 years agoDoc: Made \since commands in src/qml consistent.
Jerome Pasion [Tue, 24 Sep 2013 14:02:26 +0000 (16:02 +0200)]
Doc: Made \since commands in src/qml consistent.

-QDoc displays the Qt version in the HTML output.
-If there is only one argument to \since, QDoc assumes it is the Qt
 version.

"QtQuick 2.1" -> "Qt 5.1"
"QtQml 2.1" -> "Qt 5.1"
"QtQuick 1.1" -> "Qt 4.8"

Task-number: QTBUG-32172
Change-Id: I3c0da4dce8e44d717a6840bea250b4f0f9d78128
Reviewed-by: Martin Smith <martin.smith@digia.com>
10 years agoDoc: Made Qt Quick items' \since consistent.
Jerome Pasion [Tue, 24 Sep 2013 13:23:45 +0000 (15:23 +0200)]
Doc: Made Qt Quick items' \since consistent.

Qt 5.2:
-"\since QtQuick 2.2" -> "\since 5.2"

Qt 5.1:
-"\since QtQuick 2.1" -> "\since 5.1"
-"\since Qt 5.1" -> "\since 5.1"

Qt 5.0:
-"\since QtQuick 2.0" -> "\since 5.0"

Task-number: QTBUG-32172
Change-Id: I699b00b31373a434ddb8f4caccfef40c588bf8a4
Reviewed-by: Martin Smith <martin.smith@digia.com>
10 years agoDoc: Made \since command in Dialog QML types consistent.
Jerome Pasion [Tue, 24 Sep 2013 12:44:50 +0000 (14:44 +0200)]
Doc: Made \since command in Dialog QML types consistent.

-QDoc only requires the version number for Qt versions

Task-number: QTBUG-32172
Change-Id: Ifa3a94fa66194807d58b079b4f451af90cc1d00a
Reviewed-by: Martin Smith <martin.smith@digia.com>
10 years agowince: Build fix, NtCurrentTeb() is not available in this platform.
Sérgio Martins [Thu, 29 Aug 2013 14:21:40 +0000 (15:21 +0100)]
wince: Build fix, NtCurrentTeb() is not available in this platform.

This was copied from qtscript's:
src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp

Change-Id: Iaa5549e6915aa4aa4bf532fbe7c9117a0858ff02
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix Component.onCompleted emission and bindings for composite types
Simon Hausmann [Mon, 23 Sep 2013 14:35:34 +0000 (16:35 +0200)]
Fix Component.onCompleted emission and bindings for composite types

When instantiating the composite type with a sub QQmlObjectCreator,
make sure to link the componentAttached objects back into the parent
creator. Similarly we need to collect the bindings the sub-creator
created, as finalize() is only called on the top-level creator.

Fixes remaining failures in tst_qqmllanguage::onCompleted

Change-Id: If79b31ee94000aeec280284200df8ee97e57fd03
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix lookup scopes into the context object
Simon Hausmann [Mon, 23 Sep 2013 14:25:13 +0000 (16:25 +0200)]
Fix lookup scopes into the context object

Given

QtObject {
     property int value: 42
     property var o: QtObject {
         Component.onCompleted: print(value)
     }
}

Should print 42 - the lookup for "value" should fail in the
scope object (o) and succeed in the context object.

Fixes part of tst_qqmllanguage::onCompleted

Change-Id: If48d6a780aa0f3cb4a7757694f93359e57757973
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix component boundary detection
Simon Hausmann [Mon, 23 Sep 2013 13:58:30 +0000 (15:58 +0200)]
Fix component boundary detection

For a component boundary, the type in question has to be an actual
QQmlComponent. If it's a type that itself is derived from a component (type ==
0 && component != 0 in typereference), then it is not a boundary.

Fixes tst_qqmllanguage::componentCompositeType

Change-Id: I938abe94c2fa4c69788176235ac74d0c6e385c0c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix bug in assigning to self-declared properties in child object literals
Simon Hausmann [Mon, 23 Sep 2013 13:30:55 +0000 (15:30 +0200)]
Fix bug in assigning to self-declared properties in child object literals

When createInstance() calls populateInstance, make sure that the QObject
used for bindings is the instance we just created, not the _qobject from
the caller side (which is completely wrong and unrelated).

Change-Id: I7dc44ffaa70799b2f37258aeacdb33d8a1cf8c48
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix assigning composite type object literals to object properties
Simon Hausmann [Mon, 23 Sep 2013 13:28:13 +0000 (15:28 +0200)]
Fix assigning composite type object literals to object properties

When doing the assignability test, pick the property cache from our
property caches for the created sub object and only otherwise fall
back to the regular engine cache.

Change-Id: I07b9746335a9a169e1055a3f4dc7fd3f0ab0fdef
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix bindings on properties in grouped value type properties
Simon Hausmann [Mon, 23 Sep 2013 09:26:16 +0000 (11:26 +0200)]
Fix bindings on properties in grouped value type properties

... such as
    point.x: { someExpression }

This requires special handling to install the QQmlBinding not on the
value type itself (not possible) but on the point property itself.

Fixes tst_qqmllanguage::valueTypes

Change-Id: I8f95379e1872dff7cdcc0480c229a5e68f3cf575
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix setting the id property when also present in the type itself
Simon Hausmann [Mon, 23 Sep 2013 06:19:40 +0000 (08:19 +0200)]
Fix setting the id property when also present in the type itself

Fixes tst_qqmllanguage::idProperty

Change-Id: I3051da6a55f29bfca58aa83647fe5d51fb2a67e0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix warnings about includes.
Friedemann Kleint [Tue, 24 Sep 2013 14:37:57 +0000 (16:37 +0200)]
Fix warnings about includes.

QtQml: WARNING: qtdeclarative/src/qml/qml/qqmlabstracturlinterceptor.h
QtQml: WARNING: qtdeclarative/src/qml/qml/qqmlfileselector.h
includes qtqmlglobal.h when it should include QtQml/qtqmlglobal.h

Change-Id: I1cc4e3a201e0f3bec34c5e4bca8ec1578c8b0224
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
10 years agoqml: handle all possible QtMsgType in switch because of -Werror
Shawn Rutledge [Mon, 23 Sep 2013 08:42:16 +0000 (10:42 +0200)]
qml: handle all possible QtMsgType in switch because of -Werror

Perhaps this illustrates why having -Werror is more of an annoyance
than whatever it was supposed to help:
https://codereview.qt-project.org/#change,65253 cannot be merged
until the new enum value that it adds is handled _everywhere_ that
it can be.

Change-Id: I2bba730b471683487e38693c9ace2d09be4c874d
Reviewed-by: hjk <hjk121@nokiamail.com>
10 years agoV4 SSA: cleanup: rename single letter variables.
Erik Verbruggen [Sat, 21 Sep 2013 16:56:52 +0000 (18:56 +0200)]
V4 SSA: cleanup: rename single letter variables.

Because "targetTemp" and "sourceTemp" is clearer than, say, t1 and t2.

Change-Id: I5195c75f1958a3bea3c370924685ff6ba9c9c515
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoV4 SSA: change life-time interval coverage calculation.
Erik Verbruggen [Fri, 20 Sep 2013 16:28:21 +0000 (18:28 +0200)]
V4 SSA: change life-time interval coverage calculation.

When iterating over the ranges in a life-time interval, stop when the
range starts after the position to check.

Change-Id: Ib64cbfc644820fdb4c0167b8db0b40dacfb5d076
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoV4: enable register allocator on linux and macos on x86_64.
Erik Verbruggen [Fri, 20 Sep 2013 14:04:29 +0000 (16:04 +0200)]
V4: enable register allocator on linux and macos on x86_64.

Change-Id: I958cf90da5c44b0119c5666df6ed2e4820444841
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoV4 regalloc: fix intersection calculation.
Erik Verbruggen [Fri, 20 Sep 2013 14:02:27 +0000 (16:02 +0200)]
V4 regalloc: fix intersection calculation.

The previous version was plain wrong: when the first interval had more
than one range, those ranges would never be checked for intersection.

This version iterates over all ranges in the first interval, and returns
the index of the first range in the second interval that overlaps with
that range. Iterating over the second interval is cut off when an
interval is found that starts after the current one end (the ranges of
both intervals are sorted).

Change-Id: I87c254a645164eb6639925c2e3b7fd7c1b1bfa0a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoV4: fix move mapping
Erik Verbruggen [Fri, 13 Sep 2013 16:43:46 +0000 (18:43 +0200)]
V4: fix move mapping

When resolving conflicting register use between basic blocks, only
insert the resolving moves into the successor when it has one incoming
edge. Because of the absence of critical edges, this implies that it is
also save to insert those moves into the predecessor block if there is
more than one incoming edge (the predecessor will only have one outgoing
edge).

Change-Id: I83c41b4ca86946d3aa09619f20ddab3e692136f2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoV4 JIT: fixes after NaN boxing changes.
Erik Verbruggen [Fri, 20 Sep 2013 13:48:47 +0000 (15:48 +0200)]
V4 JIT: fixes after NaN boxing changes.

Change-Id: I22a1b46f488dc65513ed287dabe7d85469cc5173
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoV4: re-enable SSA transformation and optimization.
Erik Verbruggen [Fri, 13 Sep 2013 10:06:45 +0000 (12:06 +0200)]
V4: re-enable SSA transformation and optimization.

But keep the register allocator disabled for now.

Change-Id: I475835ec35ef31d76e084788a754c00b1f8fdda6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoV4 JIT: generate code for unary not operator.
Erik Verbruggen [Fri, 13 Sep 2013 12:42:42 +0000 (14:42 +0200)]
V4 JIT: generate code for unary not operator.

Change-Id: I00a47d261a76db0b938f8c9300be9afc06b42d02
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoAdd qmlimportscanner.
Morten Johan Sørvig [Fri, 23 Aug 2013 13:03:20 +0000 (15:03 +0200)]
Add qmlimportscanner.

qmlimportscanner scans for import statements in qml
files and returns a JSON-formatted list of imports.
This is done recursively in order to get all dependencies.

Usage: "qmlimportscanner path/to/app/qml/"
-importPath path/to/qtbase/qml

Change-Id: I0e99caaf4216058c52a4706f7fdbeaf1eba0bbc1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoMerge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Sergio Ahumada [Sun, 22 Sep 2013 20:36:27 +0000 (22:36 +0200)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

10 years agoMake qv4objectproto GC clean
Lars Knoll [Sun, 22 Sep 2013 13:32:25 +0000 (15:32 +0200)]
Make qv4objectproto GC clean

Fix the remaining usages of raw pointers into the GC heap.

Change-Id: I3654a6f74fe6b59e25ed65a79ff02c29cc2cdecc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix grouped property access for non-value type properties
Simon Hausmann [Sun, 22 Sep 2013 09:32:26 +0000 (11:32 +0200)]
Fix grouped property access for non-value type properties

If we don't have a value type, read the grouped property as QObject
instance and populate that instead.

Fixes tst_qqmllanguage::deepProperty

Change-Id: I9a8d5f929a9c0ebb39461863f6a93b3f35274f97
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix cases where mark() would access uninitialized memory
Lars Knoll [Fri, 20 Sep 2013 13:13:14 +0000 (15:13 +0200)]
Fix cases where mark() would access uninitialized memory

Change-Id: I4e07e20d30ba57759a0ece1c298a02b098718b33
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoPrevent objects from being collected while in their constructor
Lars Knoll [Thu, 19 Sep 2013 14:05:25 +0000 (16:05 +0200)]
Prevent objects from being collected while in their constructor

While objects are being constructed, we don't have a reference to them
on the JS stack yet. So the constructor needs to protect itself against
being collected by putting the this object onto the JS stack.

Added an environment switch MM_EXACT_GC to test exact garbage
collection.

Change-Id: Ie37665a954de800359c272ffbebbe1488e7a8ace
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoConvert the last methods in qv4object_p.h
Lars Knoll [Thu, 19 Sep 2013 11:17:55 +0000 (13:17 +0200)]
Convert the last methods in qv4object_p.h

Change-Id: I4fda83a0832760c277e629d4e658da718c0bf92b
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix some more methods to take ValueRef's
Lars Knoll [Thu, 19 Sep 2013 10:55:36 +0000 (12:55 +0200)]
Fix some more methods to take ValueRef's

Change-Id: Ia0e30ba98c16e51c9992027c7e5f78d4def8697a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
10 years agoFix some smaller spec incompliances in Array.concat
Lars Knoll [Thu, 19 Sep 2013 10:43:12 +0000 (12:43 +0200)]
Fix some smaller spec incompliances in Array.concat

Change-Id: I4a2252ef590c0d48ba734f96c7478637e1ddfd07
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
10 years agoMake sure ScopedArrayObject works as intended
Lars Knoll [Thu, 19 Sep 2013 10:42:31 +0000 (12:42 +0200)]
Make sure ScopedArrayObject works as intended

We need a proper cast method for the class.

Change-Id: I8f2e4b3201d70e8fc90148f1780fd377057947bb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
10 years agoChange the runtime API over to using StringRef's instead of String*
Lars Knoll [Thu, 19 Sep 2013 10:05:18 +0000 (12:05 +0200)]
Change the runtime API over to using StringRef's instead of String*

Change-Id: I0ea95e6cca995dc5f98871f0369204af18e48111
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoremove debug output
Lars Knoll [Thu, 19 Sep 2013 10:02:29 +0000 (12:02 +0200)]
remove debug output

Change-Id: I168f24ac12715fc65abe230b2bd0f86f777eea00
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoConvert Object::inplaceBinOp to be GC safe
Lars Knoll [Thu, 19 Sep 2013 08:33:59 +0000 (10:33 +0200)]
Convert Object::inplaceBinOp to be GC safe

Change-Id: I98a8591f4b556cc1d00271e6b389dc0d2c16e6ec
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoConvert the remaining vtable methods to be GC safe
Lars Knoll [Thu, 19 Sep 2013 07:58:50 +0000 (09:58 +0200)]
Convert the remaining vtable methods to be GC safe

Change-Id: I679d1833609c41d71e8436ec0ba8a4624f0c4dd0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoConvert putIndexed()
Lars Knoll [Thu, 19 Sep 2013 07:10:42 +0000 (09:10 +0200)]
Convert putIndexed()

Change-Id: I7d02b0fdf45079d0f7afcfb6d3158dd60cb09f33
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoconvert Managed::put() API to be GC safe
Lars Knoll [Wed, 18 Sep 2013 14:36:02 +0000 (16:36 +0200)]
convert Managed::put() API to be GC safe

Change-Id: I09198ce372fa545372db389fac26828d21ad5731
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoUse a StringRef for Managed::get()
Lars Knoll [Wed, 18 Sep 2013 13:34:13 +0000 (15:34 +0200)]
Use a StringRef for Managed::get()

also store "toString" and "valueOf" as identifiers
in the engine and fix two places where we compared
strings the wrong way.

Change-Id: I70612221e72d43ed0e3c496e4209681bf254cded
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoUse StringRef for most methods in Object
Lars Knoll [Wed, 18 Sep 2013 12:30:53 +0000 (14:30 +0200)]
Use StringRef for most methods in Object

Change-Id: I8e2dad0e9e34c5a549952bc0765cd57f6aa8aadf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoCleanup Object::define*Property API
Lars Knoll [Wed, 18 Sep 2013 10:31:55 +0000 (12:31 +0200)]
Cleanup Object::define*Property API

Change-Id: I99125908a9bc1d41a2642c409af9704def7a0832
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoAdd a Safe<T> class and start using it
Lars Knoll [Wed, 18 Sep 2013 09:00:38 +0000 (11:00 +0200)]
Add a Safe<T> class and start using it

The class denotes objects that are stored safely
in areas controlled by the GC. These we can convert
fast to a StringRef etc.

Change-Id: I6b154eccaefddc42d4fafca55b7ee9e77179830c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
10 years agoStart using StringRef for parameter passing
Lars Knoll [Wed, 18 Sep 2013 08:02:04 +0000 (10:02 +0200)]
Start using StringRef for parameter passing

Change-Id: If2c41daeda2862cd1162c5da8163a9d62fe4111d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoIntroduce a Referenced<T> class to pass Objects into methods
Lars Knoll [Wed, 18 Sep 2013 07:30:45 +0000 (09:30 +0200)]
Introduce a Referenced<T> class to pass Objects into methods

Added some convenience typedefs (StringRef, ObjectRef, ReturnedString,
ScopedString, ...)
Used StringRef in newBuiltinFunction() for testing.
Cleaned up the duplicated code for thrower functions.

Change-Id: I7b7676690cbe70d9eabb0a5afd0d922f0be3aefd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoCleanup ExecutionEngine::newBuiltinFunction() usages
Lars Knoll [Tue, 17 Sep 2013 20:33:48 +0000 (22:33 +0200)]
Cleanup ExecutionEngine::newBuiltinFunction() usages

And change the return type to be GC safe

Change-Id: I6d7513962370fea4072a3d8c6b2c6f2d1705992e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoDon't use Value::emptyValue() anymore.
Lars Knoll [Tue, 17 Sep 2013 16:16:35 +0000 (18:16 +0200)]
Don't use Value::emptyValue() anymore.

emptyValue is special and reserved for usage inside the
engine to mark missing values. The main to use cases
are when converting property descriptors, and to mark
holes in array data.

Change-Id: I0ed357e65102b1041bf9a878e6e9a4ae0657523b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFurther work towards an exact GC
Lars Knoll [Mon, 16 Sep 2013 20:02:27 +0000 (22:02 +0200)]
Further work towards an exact GC

Add some more convenience in the helper classes
in qscopedvalue_p.h
Make accesses to CallData safer, and change
ExecutionEngine::newObject() to return a safe
pointer.

Change-Id: I980909754ce9681cf6faa1355bab3a1e5d6dd186
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoAnimators - Render thread animation system
Gunnar Sletta [Wed, 18 Sep 2013 18:16:16 +0000 (20:16 +0200)]
Animators - Render thread animation system

This introduces 6 new QML types for animating state in the
scene graph when the UI thread is blocked. The QObject property
being animated is updated after the animation completes.

It works also with the "windows" and "basic" render loops, but
offer litte benefit then compared to in the "threaded" case.

Change-Id: Ic19e47c898c0b8bd53e457db922b3c9c457c8147
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoMerge remote-tracking branch 'origin/stable' into dev
Sergio Ahumada [Sat, 21 Sep 2013 16:14:10 +0000 (18:14 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I899f3b517523e4037de50802c0912f7dd960133e

10 years agoFix build logic for host_build tools.
Morten Johan Sørvig [Fri, 13 Sep 2013 12:49:48 +0000 (14:49 +0200)]
Fix build logic for host_build tools.

Link against bootstrap-private instead QtCore when
cross-compiling.

Change-Id: I7aeb9d693b0dd041aea72b6b3dcb8614a9a92b89
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoMerge branch 'wip/v4' of qtdeclarative into dev
Simon Hausmann [Sat, 21 Sep 2013 07:29:58 +0000 (09:29 +0200)]
Merge branch 'wip/v4' of qtdeclarative into dev

Pull in the remaining bits of the new compiler/vme branch.

Change-Id: I4706011c5eaf35f893d0733c4e130a31ce0ebb66

10 years agoDocs: fix QtQuick2::Item::layer.sourceRect type
J-P Nurmi [Fri, 20 Sep 2013 20:30:50 +0000 (22:30 +0200)]
Docs: fix QtQuick2::Item::layer.sourceRect type

Change-Id: Ia02f451b07638ec2e3f0355b89bf9f7356da44a6
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
10 years agoAdd Singleton support for QML
Antti Piira [Thu, 22 Aug 2013 19:08:37 +0000 (12:08 -0700)]
Add Singleton support for QML

This introduces Singleton support for QML (Composite Singleton). For
now, the Singleton support is only availabe for QML types in modules
or (remote and local) directories with qmldir file. However, in the
future this support may be expanded to arbitrary QML file imports
without by leaving out the qmldir requirement.

You define a QML type as a Singleton with the following two steps:
1. By adding a pragma Singleton to a type's QML file:

pragma Singleton

The pragma and import statements can be mixed and their order does
not matter. Singleton is the only supported pragma for now. Others
will generate errors.

2. By specifying a qmldir file for the directory of your imported
type and prepending the type with "singleton" keyword as follows:

singleton TestTypeSingleton TestTypeSingleton.qml

Alternatively you may specify a qmldir file for a module and specify
your type as a singleton as follows:

singleton TestTypeSingleton 1.0 TestTypeSingleton.qml

Composite Singletons may be included in a module and may be used with
a local namespace qualifier when imported with:
"import xxx as NameSpace"

A singleton instance is created at first use and stored into the
QmlEngine (one instance per engine) and eventually released by the
engine's destructor.

CompositeSingletonType has a dual nature and will return true to both
isComposite() and isSingleton() calls. In most cases its enough to
check for just isComposite() or isSingleton(). However, there is a
isCompositeSingleton() available as well.

I used "qlalr --no-debug --no-lines --qt qqmljs.g" to generate the
qqmljsparser and qqmljsgrammar files from qqmljs.g.

Unit tests are included.

Change-Id: I91b303612c5e132143b325b9a8f982e9355bc90e
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
10 years agodialog-private: replace QJSValue with QQmlV4Handle in js functions
Liang Qi [Fri, 20 Sep 2013 09:00:29 +0000 (11:00 +0200)]
dialog-private: replace QJSValue with QQmlV4Handle in js functions

Change-Id: I1e16147a1930f717cddd246068c06728e76eddd9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix uniform property mapping docs in ShaderEffect
Laszlo Agocs [Thu, 19 Sep 2013 13:00:23 +0000 (15:00 +0200)]
Fix uniform property mapping docs in ShaderEffect

QVector4D and QMatrix4x4 are supported too, while QTransform maps to
mat3 instead of mat4.

Change-Id: Ibba7174dc21f475276e2ee8ecb585740d7bdfa4a
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
10 years ago[new compiler] Add support for default properties
Simon Hausmann [Fri, 20 Sep 2013 14:29:10 +0000 (16:29 +0200)]
[new compiler] Add support for default properties

When trying to determine the destination property for a binding, properly
fall back to the default property if existent.

Fixes tst_qqmllanguage::simpleContainer

Change-Id: Icb7752f088e92e09f03b1b66f43c882e7089f3cd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Fix binding evaluations
Simon Hausmann [Fri, 20 Sep 2013 14:08:05 +0000 (16:08 +0200)]
[new compiler] Fix binding evaluations

All created bindings are activated at finalization time and given sub-objects
they're all collected in allCreatedBindings. When populating that, make sure
to populate the right variable before the qSwap.

Change-Id: Ibf5b55aca933c062e1ffcac327214c73a2ae6348
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Fix local variable declarations in binding expressions
Simon Hausmann [Fri, 20 Sep 2013 13:46:28 +0000 (15:46 +0200)]
[new compiler] Fix local variable declarations in binding expressions

Always look up locals by name

Change-Id: I2fa14499f6d8749f450bfe2b8a53d684b93bd1dc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Fix crash with remote imports
Simon Hausmann [Fri, 20 Sep 2013 12:53:53 +0000 (14:53 +0200)]
[new compiler] Fix crash with remote imports

The import logic keeps pointers to the provided const QQmlImport references,
which means we can't pass references to temporaries when using the new code
path but for now have to keep the import objcts as member.

Change-Id: I75eff8dbe655ed23188f3f62f743a8f987bc709e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Improve error handling with invalid base types
Simon Hausmann [Fri, 20 Sep 2013 12:34:58 +0000 (14:34 +0200)]
[new compiler] Improve error handling with invalid base types

If we fail to instantiate a composite type, handle it gracefully and
propagate the errors to the caller correctly. Similarly, if we try to
create an uncreatable type, produce an error.

Change-Id: Idce5b567c4f33eff7a97a733606c1e823c6d8297
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Fix JavaScript expressions in composite types
Simon Hausmann [Fri, 20 Sep 2013 12:34:15 +0000 (14:34 +0200)]
[new compiler] Fix JavaScript expressions in composite types

When creating a composite type, we instantiate a nested QQmlObjectCreator
on the QQmlCompiledData of the composite type. It may be that this is
the first time the type is instantiated and the QV4::CompiledData::CompilationUnit
isn't linked into the engine yet. Instead of doing that on the QQmlComponent
side, do it in the QQmlObjectCreator constructor (on demand), so that it
also works for nested builders.

Change-Id: I614bbae4ef6da5a5960cc64b40b092663e1bd810
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Fix signal handlers on own properties
Simon Hausmann [Fri, 20 Sep 2013 12:32:06 +0000 (14:32 +0200)]
[new compiler] Fix signal handlers on own properties

When compiling signal handler expressions we need to determine the parameters.
We first try to look up the signal in the base meta-object. For our own
QML type itself we don't have a meta-object yet and so we extract the information
about which parameters the signals have from the parsed AST's signal declarations.

For signal handlers on declared properties we need to "synthesize" the
signal (myPropertyChanged) as well, with an empty parameter list.

Change-Id: Iecfe7bc7a9979d57586cbd9434bb9eb2f38a2c7b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoMerge "Merge branch 'wip/v4' of qtdeclarative into dev" into refs/staging/dev
Simon Hausmann [Fri, 20 Sep 2013 17:30:06 +0000 (19:30 +0200)]
Merge "Merge branch 'wip/v4' of qtdeclarative into dev" into refs/staging/dev

10 years agoMerge branch 'wip/v4' of qtdeclarative into dev
Simon Hausmann [Fri, 20 Sep 2013 14:47:57 +0000 (16:47 +0200)]
Merge branch 'wip/v4' of qtdeclarative into dev

This brings in the infrastructure for the new compilation of QML and JS
in the loader thread and the new VME replacement for creating objects
in the GUI thread.

Change-Id: Ib8127c10f5cb3ad238e57469723d031ab765a79b

10 years agoRemove milliseconds before comparing JS + Qt date strings.
Mitch Curtis [Wed, 18 Sep 2013 13:25:08 +0000 (15:25 +0200)]
Remove milliseconds before comparing JS + Qt date strings.

It seems that tst_qjsengine also needs:
https://codereview.qt-project.org/#change,65811

Change-Id: I5f5586f004dec047c3a1edebbc98d7ecde195bfd
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
10 years agoRevert "Temporarily disable tst_QJSEngine tests [...]"
Mitch Curtis [Wed, 18 Sep 2013 13:57:41 +0000 (15:57 +0200)]
Revert "Temporarily disable tst_QJSEngine tests [...]"

This reverts commit 17ae095602bf36ece892598e69f794ef982c603b.

The test can be re-enabled now.

Change-Id: I0134365edbfd4aed05665bf16b8e15221fe62d67
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
10 years ago[new compiler] Initial support for alias properties
Simon Hausmann [Thu, 19 Sep 2013 11:32:13 +0000 (13:32 +0200)]
[new compiler] Initial support for alias properties

Aliases are resolved at "compile time", not rough JS expressions. This is
done right after we determined the scope of components in the QML file,
which is also where we collect object ids (that aliases use).

Change-Id: If5702337f2cca08d17f196c3b2fde3bbdfea5b3c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Fix scope object for binding expressions in signal handlers of attache...
Simon Hausmann [Fri, 20 Sep 2013 10:09:04 +0000 (12:09 +0200)]
[new compiler] Fix scope object for binding expressions in signal handlers of attached objects

In populateInstance the QObject instance to populate with properties, etc. may
not necessarily be the scope object (in qml lookup terms), so it needs to be provided
as a separate parameter.

Change-Id: I05db123c249e8582469bcfb76f56eb3f7bfbc4a2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix destruction of QV4::CompiledData::CompilationUnit objects
Simon Hausmann [Thu, 19 Sep 2013 07:32:42 +0000 (09:32 +0200)]
Fix destruction of QV4::CompiledData::CompilationUnit objects

Now that we store them per QML file, they live in the type cache and
can outlive the engine. Therefore the engine needs to free to unlink
any remaining units upon destruction. This needs to be done after the
"death" of the memory manager, which is likely to sweep away any
function objects that also hold a reference to the compilation units.

Change-Id: I3968d5995289e8d2bc1e3abbb1f8be88a0ab4e03
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Implement dependency type availability checking
Simon Hausmann [Thu, 19 Sep 2013 05:18:42 +0000 (07:18 +0200)]
[new compiler] Implement dependency type availability checking

Change-Id: I9c2c69dbf88574cbce85898b2b54654445cdb552
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Fix crash with non-existent attached property objects
Simon Hausmann [Wed, 18 Sep 2013 19:41:24 +0000 (21:41 +0200)]
[new compiler] Fix crash with non-existent attached property objects

Produce an error message as expected by auto-tests.

Change-Id: I28caf2ac20692e2e3b055a61289bb02372047a65
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Fix crash with empty function bodies
Simon Hausmann [Wed, 18 Sep 2013 19:37:35 +0000 (21:37 +0200)]
[new compiler] Fix crash with empty function bodies

Change defineFunction back to taking AST::SourceElements for the body (how it
was originally)

Then in the new compiler, do the same "function->body ? function->body->elements
: 0" dance for function expressions and for binding expressions, synthesize the
AST::SourceElements.

Change-Id: Iaedb15925a6bb8482cde2b371a6e781477252435
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Fix off-by-a-few in meta object creator
Simon Hausmann [Wed, 18 Sep 2013 19:33:55 +0000 (21:33 +0200)]
[new compiler] Fix off-by-a-few in meta object creator

When reserving space for the methods, properties and signals, take into account
that each property for example also adds a notify signal. The calculation is
the same as in the older compiler.

Change-Id: I84f38d7c3016261a844d188978428ed021e7f9b8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoAllow delayed deallocation in the executable memory allocator
Simon Hausmann [Wed, 18 Sep 2013 19:13:03 +0000 (21:13 +0200)]
Allow delayed deallocation in the executable memory allocator

Allow for allocations to outlive the allocator itself. When the allocator dies,
it invalidates any remaining non-free allocations, making them safe to delete
later.

Change-Id: I6c71cddbbd5dcaff1ad50f3991a3c710d4f96737
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years ago[new compiler] Correctly handle attempts to set invalid group properties
Simon Hausmann [Fri, 20 Sep 2013 08:11:54 +0000 (10:11 +0200)]
[new compiler] Correctly handle attempts to set invalid group properties

Don't crash, bail out with an error message (expected by tst_qqmllanguage)

Change-Id: I357281d009d92c4b0248ba648c88e20334aabb5b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>