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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Simon Hausmann [Fri, 20 Sep 2013 08:10:30 +0000 (10:10 +0200)]
Fix crash in QV4::CompiledData::CompilationUnit
Don't crash when a CompilationUnit is created, never linked into an engine but instead
deleted (because there was an error elsewhere compililing the rest of QML
before it could reach the link-to-engine stage)
Change-Id: Iff535009b6b4d1fc4004987c98730251a3a7d8d8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Wed, 18 Sep 2013 14:02:05 +0000 (16:02 +0200)]
[new compiler] Initial support for composite types
Change-Id: I01030814a978d8a52a086b0389fe62af42a4bbba
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Tue, 17 Sep 2013 15:27:07 +0000 (17:27 +0200)]
[new compiler] Initial support for components
We use a dedicated pass through the objects in QV4::CompiledData::QmlUnit to determine
which objects are QQmlComponents. We remember their object indices as well as to which
component other objects belong to (if any).
Change-Id: I97929c57e2ccb2fd380d612002d128359c4bc253
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Tue, 17 Sep 2013 15:23:49 +0000 (17:23 +0200)]
[new compiler] Improve error handling and sanity checking for object ids
Disallow properties called id.foo.bar as well as id: Object {}
Change-Id: I3e31875a5863b5b4d4f9f7dd6c74d337eea3dfb2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Tue, 17 Sep 2013 15:21:11 +0000 (17:21 +0200)]
[new compiler] Fix id parsing
id: foo;
produces a statement on the right hand side that includes the semicolon.
Strip it off - reduce expression statements similar to setBindingValue.
Change-Id: I22a02ce364a309b4364476166402f8284e01ef98
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Tue, 17 Sep 2013 13:55:39 +0000 (15:55 +0200)]
[new compiler] Fix function-local variable declarations
Make sure to call defineFunction with FunctionCode as compile mode when
compiling functions or signal handler functions, to assign an index to local
variables.
Change-Id: I8948840dba68ce6293a87c55d3386df69d5f6a5c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Tue, 17 Sep 2013 10:47:47 +0000 (12:47 +0200)]
[new compiler] Cleanups
Collect code for collecting errors and string access for different compile
passes (vme creation, qobject creation) in a QQmlCompilePass base class.
Change-Id: Ib2119e730ce7d3181599ba29da12273f041f2b70
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Tue, 17 Sep 2013 07:59:10 +0000 (09:59 +0200)]
[new compiler] Cleanups
Make the v4 context to use for binding expressions/functions/signal handlers
a member variable instead of a function parameter, as it doesn't change
frequently.
Change-Id: I8a73bbc3f37c116d29172d5c935c66ecf2f67a38
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Mon, 16 Sep 2013 15:25:53 +0000 (17:25 +0200)]
[new compiler] Finish support for initializing list properties
Setting a value on a list property is always just appending to the list instead
of replacing it. Based on that, initializing list properties with multiple
items is done with one binding per item to the same list property. So
myList: [ Item{}, Item{} ]
is mapped to
myList: Item {}
myList: Item {}
Change-Id: Iadc048ab3a8d73ac824aa6b2ae5dec33731fa362
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Mon, 16 Sep 2013 15:01:40 +0000 (17:01 +0200)]
[new compiler] Add initial support for assigning single objects to list properties
Just like in the old VME, setting a value to a list property appends instead of
replacing.
Change-Id: Ie70bf45c6badba6cac09248dc2e41ec6a6a7538b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Mon, 16 Sep 2013 13:59:22 +0000 (15:59 +0200)]
[new compiler] Implement setting object properties
This includes assigning to interface properties, variants that hold QObject
pointers and regular QObject <> QObject assignments (assuming that they are
compatible)
Change-Id: Icd82c672e6899c6bfeb7f0ec758a81f8b70275ab
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Mon, 16 Sep 2013 12:38:58 +0000 (14:38 +0200)]
[new compiler] Cleanup attached and group property determination
Determine when a qualified identifier signifies an attached property or a group
property in one place and set the Binding::Type accordingly.
This simplifies the object builder code, too.
Change-Id: I9f572441e9b5b43338752b848649fbd507cabe4c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Mon, 16 Sep 2013 12:47:12 +0000 (14:47 +0200)]
[new compiler] Fix timing of binding enabling
Enabling bindings right before emitting Component.onComplete
Change-Id: I4cc330f5e59b326368c617f16a7d4fd51b6c50db
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Mon, 16 Sep 2013 10:17:01 +0000 (12:17 +0200)]
[new compiler] Implement remaining literal binding value assignments
Ported over the code from genLiteralAssignment and testLiteralAssignment
to converting the AST type (string, bool, number) to the expected property
meta-type.
Change-Id: I709b97efdd741dbc4217ee0b9712de58dd32b82d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 13 Sep 2013 14:39:00 +0000 (16:39 +0200)]
[new compiler] Initial support for attached properties
Attached properties are implemented similarly to group properties, except that
the object operated on isn't a QQmlValueType from a property (i.e. font) but the
QObject that implements the attached properties.
Change-Id: If73751162c191c65512ca1bddadd6270e6e33793
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Sat, 14 Sep 2013 12:41:18 +0000 (14:41 +0200)]
[new compiler] Add support for finalization callbacks
This is needed for Component.onCompleted (the signal emission) as well
as the private finalization callback API in QQmlEngine, used by QtQuick.
The creator - similar to the VME - tracks the attached properties object
of QQmlComponent through a linked list.
Change-Id: I8ada94009a7ce2078feefd359485657626c300fb
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 13 Sep 2013 13:03:51 +0000 (15:03 +0200)]
[new compiler] Initial implementation of signal handler support
Signal handlers start out in the parser as binding expressions. A new
SignalHandlerConverter converts the bindings then so that the expression is
turned into a function declaration where the function parameters match the
parameters of the signal.
Change-Id: I3ea5aa3b80a6ee3b095c6841c63c3e3bb0b47e4f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 13 Sep 2013 13:22:54 +0000 (15:22 +0200)]
[new compiler] Avoid type reference lookups with empty strings
For example when declaring
signal mySignal(string blah)
then we don't need to try to "resolve" the type "string".
Change-Id: I80924ebf244c6b8e2827d19f9c78faf93031fe15
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 13 Sep 2013 11:43:15 +0000 (13:43 +0200)]
[new compiler] Fix function and binding expression setup
Binding expressions and QML used to be set up so that they were written
as function closure:
(function(...) {
expression here
})
and then evaluated inside qml scope. With the new setup we do that closure
setup manually now.
For that we have to define a dummy outter "context scope" function in the
codegen, that will later be used to look up the context ids.
Change-Id: I0656419d67a1728451fcd46f402b03979f118b0b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 13 Sep 2013 07:08:41 +0000 (09:08 +0200)]
Cleanup: Fold CompiledData::Value into CompiledData::Binding
Value isn't needed anywhere else
Change-Id: Ib12d85332a6096e6232a790a7e6fd63961329e3b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Thu, 12 Sep 2013 14:53:32 +0000 (16:53 +0200)]
[new compiler] Add support for id properties
Change-Id: Idb4a0ad06f6cbe5d040da075a8f43d067a27ebc4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Thu, 12 Sep 2013 12:43:56 +0000 (14:43 +0200)]
[new compiler] Initial support for group properties
This implements support for "font.pixelSize: 24" for example. The representation
in the compile data structure is so that font.pixelSize is short-hand for
font {
pixelSize: 24
}
which means that inside the braces is a complete object initializer. For that
initializer we create a dedicated CompiledData::Object, which however has its
type name empty. When populating the outer instance then, the "font" property
is read as QQmlValueType (a QObject) and instead of creating a new QObject we
use that value type as instance to run the rest of the QML object initializer
(everything in braces).
Change-Id: Ic0a37ac77ab88f582546b9c09a3d06a07726420b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Erik Verbruggen [Fri, 13 Sep 2013 11:38:35 +0000 (13:38 +0200)]
V4: fixes after ReturnValue and ValueRef introduction.
Change-Id: I072cd7168aca4163af560c0b65e8527ddf55e26b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Erik Verbruggen [Tue, 10 Sep 2013 08:18:48 +0000 (10:18 +0200)]
V4 interpreter: inline add/sub/mul on numbers.
Change-Id: I36d000acef9426b842847691372e9a786b9a45e8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Erik Verbruggen [Tue, 10 Sep 2013 08:15:47 +0000 (10:15 +0200)]
V4 interpreter: add hints for unop/binop targets
Change-Id: Ic1230170a89557ad25f0e37261f98819a42a2b47
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Erik Verbruggen [Mon, 9 Sep 2013 13:36:09 +0000 (15:36 +0200)]
V4 JIT: generate inline code for more binops.
Bitwise-and, shift left, and shift-right.
Change-Id: Ifa949c60261054218797302673822f480f47bd6e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Erik Verbruggen [Mon, 9 Sep 2013 12:00:06 +0000 (14:00 +0200)]
V4 IR: rename ObjectType to VarType
The ObjectType was a misnomer: it was used to indicate that the
expression could have multiple types, or that the type could not be
inferred statically.
Change-Id: Ic48a0cd1dd7ae7bfafd361e0c9792ab161417039
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 20 Sep 2013 06:21:42 +0000 (08:21 +0200)]
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into HEAD
Conflicts:
src/qml/compiler/qv4isel_masm.cpp
src/qml/jsruntime/qv4script.cpp
src/qml/qml/qml.pri
src/qml/qml/qqmltypeloader_p.h
Change-Id: Ia784d855a2131e3289454f12d841ca2c65be15c1
Lars Knoll [Thu, 19 Sep 2013 20:44:14 +0000 (22:44 +0200)]
Use a handwritten offsetof macro
clang complains about our usage of offsetof(). What we do is not
strictly c++98 compliant, but compliant with c++11. So replace
the default offsetof with a handwritten macro to shut up clang
until we can switch to c++11 mode for all compilers.
Change-Id: Id724adb323ba9724ad5d7d9e0dba5a73b51af24f
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Lars Knoll [Thu, 19 Sep 2013 17:11:27 +0000 (19:11 +0200)]
Disable gui tests on Mac for now
Qt base is still broken on the mac, leading to random
crashes in UI tests.
Change-Id: If636c44169c2386ea2f49d7936ef8d6fe1488537
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Alan Alpert [Fri, 17 May 2013 22:32:19 +0000 (15:32 -0700)]
Add qmlProtectModule
A C++ analog to the protected qmldir syntax, this is also a potential
performance improvement because we can avoid some file system accesses.
Change-Id: I41781a6cc72aa65bd2d397800345ea16ef442e90
Reviewed-by: Antti Piira <apiira@blackberry.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Mitch Curtis [Tue, 17 Sep 2013 11:31:02 +0000 (13:31 +0200)]
Register Locale object in the QtQml namespace.
It was previously registered with QtQuick, which meant QtQuick had to
be imported in order to use Locale; a basic QML object.
Task-number: QTBUG-32505
Change-Id: I9d49cc0d87c0fae07b46885fcdec4f27fb0e0708
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Alan Alpert [Fri, 5 Jul 2013 21:31:06 +0000 (14:31 -0700)]
Apply file selectors to QQmlApplicationEngine apps
You can also manually apply them to a QQmlEngine using
setUrlInterceptor(new QQmlFileSelector(parent)), or using
your own QQmlAbstractUrlInterceptor subclass.
Change-Id: I0c0ff8b080c138686b3c03e0bc3b9f25bcd11a85
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Fawzi Mohamed [Mon, 10 Jun 2013 09:16:38 +0000 (11:16 +0200)]
qmlplugindump: adding verbose output for the instantiation operations
Change-Id: Ic18d85de92f05c01b6ce00b071ef9b94d878434f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Aurindam Jana [Tue, 10 Sep 2013 15:32:00 +0000 (17:32 +0200)]
QmlDebugging: Process commands in v4DebugService
Change-Id: I6371db756f72ee373884268fc49a5b16cb66fd34
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Aurindam Jana [Tue, 10 Sep 2013 14:57:45 +0000 (16:57 +0200)]
QmlDebugging: Replace QV8DebugService with QV4DebugService
Change-Id: Ic8c99e3984d9ef6d122f7d8834df97eeb1f1fda3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Aurindam Jana [Tue, 10 Sep 2013 14:47:14 +0000 (16:47 +0200)]
QmlDebugging: Add v4DebugService
Initial checkin
Change-Id: Id38166bcc4a63e0543033d25515a135ad492ee2e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Sergio Ahumada [Thu, 19 Sep 2013 15:38:18 +0000 (17:38 +0200)]
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Sergio Ahumada [Thu, 19 Sep 2013 13:50:28 +0000 (15:50 +0200)]
Merge branch 'stable' into dev
Conflicts:
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
tests/auto/qml/qml.pro
Change-Id: Ib373aed6a8f8df9521740fb5b080daed38546cd2
Shawn Rutledge [Mon, 26 Aug 2013 08:31:54 +0000 (10:31 +0200)]
Adding QtQuick.Dialogs.MessageDialog
Change-Id: Ifa3de21e6f611c24742118d6d178edbe14f243be
Reviewed-by: Liang Qi <liang.qi@digia.com>
Gunnar Sletta [Wed, 18 Sep 2013 08:48:41 +0000 (10:48 +0200)]
Fix zero pointer access in renderer.
Change-Id: I185af453684c7223c0c9de103eb707d4918b8ae0
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Alan Alpert [Tue, 17 Sep 2013 04:47:37 +0000 (21:47 -0700)]
Make QQmlAbstractUrlInterceptor public
A supporting class for file selectors and qml import control, it allows
redirecting local file paths (use a QNAM for remote paths).
All work was done previously for Qt 5.1, including tests. This is just
making it public for Qt 5.2.
Change-Id: Icb319cc23200541c8e4088b2d400e9af94f3eee5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Liang Qi [Wed, 11 Sep 2013 05:22:08 +0000 (07:22 +0200)]
Add FontDialog to QtQuick.Dialogs
As with FileDialog, it tries QPA, then QFontDialog, and falls back to
a QML implementation (which is also provided here) if neither type of
native dialog is available.
The update of plugins.qmltypes files will be in a separate commit.
Task-number: QTBUG-31852
Done-with: Shawn Rutledge <shawn.rutledge@digia.com>
Change-Id: I066ebbcf44c413af26020ddf8414252b99f5218b
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Caroline Chao [Wed, 18 Sep 2013 09:25:45 +0000 (11:25 +0200)]
qmlplugindump: Update the description for the generated file
The full command was written in the generated file including
the full path to the qmlplugindump tool.
Now only the tool name without its full path will be
printed with the adjacent arguments.
Change-Id: I03aa7350d1cd6b96ce00341796f8944669989793
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Caroline Chao [Wed, 18 Sep 2013 09:18:31 +0000 (11:18 +0200)]
qmlplugindump: Add --defaultplatform argument
QT_QPA_PLATFORM is set to minimal by default unless
--defaultplatform is set when running the qmlplugindump tool.
This is for example useful for the QtQuick.Dialogs module.
Change-Id: I1194526ee0641d11802c4db20bd3043aebd1e261
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Caroline Chao [Wed, 18 Sep 2013 07:32:45 +0000 (09:32 +0200)]
qmlplugindump: QMetaMethod signals have public access
Since
56bbf3c2d5b31142e5a1b872a0118479edcf874b (qtbase)
So public signals must be dumped.
Change-Id: Ic7047660fbac40f78c7a205e760c059256c71d6f
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Shawn Rutledge [Wed, 4 Sep 2013 11:18:40 +0000 (13:18 +0200)]
rerun qmlplugindump for QtQuick.Dialogs, now including QML types
Task-number: QTBUG-33106
Change-Id: Ib2ee0563f423bf7fe1d5990c621c46950f81516a
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
Simon Hausmann [Tue, 17 Sep 2013 08:31:10 +0000 (10:31 +0200)]
Android: Fix compilation when doing ARM builds
Clean up the code to determine when to _disable_ the JIT and add
Android to that list when targeting ARMv5 (dubbed armeabi as opposed
to armeabi-v7a)
Task-number: QTBUG-33507
Change-Id: Id78e08e888df8f8075d5655e15bb754cede70638
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Lars Knoll [Wed, 18 Sep 2013 11:29:38 +0000 (13:29 +0200)]
Correctly convert an invalid QDateTime to JS
Task-number: QTBUG-33539
Change-Id: I645db2e12e3b46731c0bef04e2d48abb71650974
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Mitch Curtis [Wed, 18 Sep 2013 13:53:38 +0000 (15:53 +0200)]
Temporarily disable tst_QJSEngine tests to allow qtbase dev integration
Temporarily disables:
- tst_QJSEngine::dateConversionJSQt()
- tst_QJSEngine::dateConversionQtJS()
so that https://codereview.qt-project.org/#change,65560 can merge.
Change-Id: I415daf1c5bd137e1905773f88fe5ebaaab1e0a06
Reviewed-by: John Layt <jlayt@kde.org>
Topi Reinio [Fri, 13 Sep 2013 12:26:40 +0000 (14:26 +0200)]
Doc: Reintroduce docs for Qt Quick Models and Views examples
The .qdoc files/images for these examples were lost during
modularization. This change adds them back and fixes related
links.
Change-Id: Id5260daad1c38284e3aa8178ae82d24067f4e88c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Lars Knoll [Mon, 16 Sep 2013 13:27:16 +0000 (15:27 +0200)]
Fix handling of empty Values
Make things consistent between 32 and 64 bit again
Adjust test results after the changes
Almost all uses of Value::empty() will get removed
in the future, but for now this gets all our tests
to pass again.
Change-Id: I44784a43432e78febbdfe78115c9be2a3e3ece76
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Lars Knoll [Wed, 18 Sep 2013 06:08:04 +0000 (08:08 +0200)]
Skip unstable tests
We can't test GC reliably due to our GC being conservative
currently. Once we moved over to an exact GC, we can re-enable
the test.
Change-Id: I6778ed9bee3b41372705f6b41c1379d224335e53
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Lars Knoll [Mon, 16 Sep 2013 18:30:04 +0000 (20:30 +0200)]
Fix regression with isNaN and isInf
We use std::isnan and std::isinf to determine whether a number is
NaN or Inf. Unfortunately some versions of these methods seem to
return int instead of bool, breaking the Encode() call.
Change-Id: Iec58eb3a5f344373a389ddbc7f6ee81cdead2726
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Lars Knoll [Mon, 16 Sep 2013 12:57:58 +0000 (14:57 +0200)]
Initialize variables
They could end up being used uninitialized otherwise.
Change-Id: I169f0023a8079f32b42508d39f7655985eba5d6b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Lars Knoll [Sun, 15 Sep 2013 13:46:36 +0000 (15:46 +0200)]
Refactor our NaN boxing to be more efficient
* Use a unified way to store all Managed objects inside
a Value, instead of distinguishing between strings
and other objects.
* On 64 bit we store pointers as pointers, so accessing them
through Scoped<> objects is cheap. This implies that doubles
are now stored in a mangled form (xor'ed with a mask).
Change-Id: I582e0fb167a62c0c527c6bfa3452550e37944069
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Lars Knoll [Sat, 14 Sep 2013 13:08:11 +0000 (15:08 +0200)]
Optimize some runtime methods
This prings performance up by ~25% again.
Change-Id: I680466e11b722b2eac0edda0fe4199b717d23855
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Lars Knoll [Sat, 14 Sep 2013 09:25:02 +0000 (11:25 +0200)]
Convert more methods to return a Returned<>
Change-Id: If294c9c4f574824c308b63a11da1337226180105
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Lars Knoll [Fri, 13 Sep 2013 19:54:21 +0000 (21:54 +0200)]
Convert some methods to use Returned<>
Change-Id: I631606cb5ab3b35b72104e70092a5200dd235fbc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Lars Knoll [Fri, 13 Sep 2013 15:07:44 +0000 (17:07 +0200)]
Convert a few more methods in ExecutionEngine to use protected pointers
Change-Id: I2e6b1b9dff52bbd16f35a00152c9ac557f8346eb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Lars Knoll [Fri, 13 Sep 2013 14:19:22 +0000 (16:19 +0200)]
Convert methods in qv4runtime to use Returned<X>
Change-Id: I1f68ecb298b049f3fa90de26b4b39233d48fb8e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Lars Knoll [Fri, 13 Sep 2013 12:11:55 +0000 (14:11 +0200)]
Extend the ReturnedValue mechanism to pointers to Managed objects
Add a Returned<T> that we can return instead of raw pointers
to Managed objects.
Start using the Returned<T> for a few methods.
Also clean up all our classes to use the Q_MANAGED macro instead
of manually defining their vtable.
Change-Id: I0a2962e47f3de955cd2cd8474f8f3fcc9e36d084
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>