platform/upstream/qtdeclarative.git
11 years agoAdd currentColor property to ColorDialog.
Mitch Curtis [Fri, 23 Aug 2013 13:14:33 +0000 (15:14 +0200)]
Add currentColor property to ColorDialog.

QColorDialog has this property. This patch effectively means that
the color property will be set when the dialog closes, instead of
whenever the current color in the dialog changes, so pressing cancel
will revert the color to what it was before the dialog was opened.

[ChangeLog][QtDeclarative][ColorDialog] Added currentColor property.

Change-Id: I2ef6b32954342cd2469cf1552d53f9e2fbf3420b
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
11 years agofixed warnings in dialog module when PURE_QML_ONLY is defined
Shawn Rutledge [Mon, 16 Sep 2013 09:07:35 +0000 (11:07 +0200)]
fixed warnings in dialog module when PURE_QML_ONLY is defined

There are a couple of unused parameters in that case.

Change-Id: Ica81621e7d74474cbfa0b54c20501ecc72661c08
Reviewed-by: Liang Qi <liang.qi@digia.com>
11 years agoAdd qml tool
Alan Alpert [Fri, 21 Dec 2012 23:42:47 +0000 (15:42 -0800)]
Add qml tool

This tool simply runs QML files using a QQmlApplicationEngine.

It is configurable so as to behave, by default, like qmlscene in
that it will automatically place non-Window QtQuick 2 Items inside
a QQuickWindow with the size of the root item. The configuration
is extensible so that other GUI scenes can also use it by altering
the configuration files in their installation.

On OS X, it is an app bundle, and handles the QFileOpenEvent so that
it can be the tool with which qml files are usually launched by
double-clicking.  (This does not break the ability to use it on the
command line too: the options still work, you just have to give the
path to the executable inside the bundle.)

Change-Id: I6bac813ce188be54842a78d7b532fcf2d54dc443
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
11 years agoSkip failing tests
Alan Alpert [Mon, 16 Sep 2013 21:14:05 +0000 (14:14 -0700)]
Skip failing tests

Rendering seems to have changed for some reason. Unblocking CI while it
is investigated.

Task-number: QTBUG-33517
Change-Id: Ieb7fdf2bbe151fc46fbdee64a2b5786349f9fbe8
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
11 years agoSkip failing test for now
Alan Alpert [Mon, 16 Sep 2013 21:12:04 +0000 (14:12 -0700)]
Skip failing test for now

It's been difficult to reproduce locally and is blocking CI. Skipping
test while we look into the error.

Task-number: QTBUG-33516
Change-Id: I77f00a024143e12d19526d0b52593cc2d128cedf
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
11 years agoMerge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Sergio Ahumada [Fri, 13 Sep 2013 20:08:13 +0000 (22:08 +0200)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

11 years agoExpose drag threshold in MouseArea
Jens Bache-Wiig [Thu, 22 Aug 2013 15:20:52 +0000 (17:20 +0200)]
Expose drag threshold in MouseArea

In several cases such as for creating a Slider, it is useful to  have a
0 pixel threshold in order to initiate a drag operation. We have
previously hardcoded this to a platform dependent (usually 10 pixel)
value for MouseArea.

Note that we have no way of indicating the version/revision number
in a grouped property for documentation at the moment.

In addition we deliberately had to remove the REVISION from the
property because it is blocked by QTBUG-33179. However, since
this is not a user-creatable type it should not cause any
issues in practice.

This patch adds MouseArea.drag.threshold in order to improve on this.

Change-Id: Ia4871e64fab39e30c4494f00be99ad38cdd630df
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoMerge remote-tracking branch 'origin/stable' into dev
Sergio Ahumada [Fri, 13 Sep 2013 14:42:55 +0000 (16:42 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I6fc67bf30a901f8078a5b99a9e290190b3f64b81

11 years agosystemdialogs example bug fix: don't allow clicking through tabs
Shawn Rutledge [Wed, 11 Sep 2013 12:21:20 +0000 (14:21 +0200)]
systemdialogs example bug fix: don't allow clicking through tabs

For example on Font Dialogs tab of
examples/quick/dialogs/systemdialogs/systemdialogs.qml
it was possible to open the color dialog by clicking slightly below
the open button, because the color dialog tab was behind the
current one.

Change-Id: If9917e2baef7cfd49a0d01acd73ffa69dfcee088
Reviewed-by: Liang Qi <liang.qi@digia.com>
11 years agoV4: Fix SSA decomposition when no regalloc is used.
Erik Verbruggen [Sun, 1 Sep 2013 13:45:53 +0000 (15:45 +0200)]
V4: Fix SSA decomposition when no regalloc is used.

Add scheduling for moves generated by removing phi nodes by re-using the
MoveMapping class from the register allocator. This change applies to
both the JIT when no register allocator is used, and the interpreter.

Change-Id: I38eac5b13759c7790132d1ef07fa17fcb53187e3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoqmlplugindump: Add support for composite types
Caroline Chao [Tue, 3 Sep 2013 12:03:21 +0000 (14:03 +0200)]
qmlplugindump: Add support for composite types

Task-number: QTBUG-33106

Change-Id: I80fc817eb59256e860f3fdd591104930688ef84c
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
11 years agoRemove qStableSort usages from declarative
Giuseppe D'Angelo [Thu, 12 Sep 2013 09:06:59 +0000 (11:06 +0200)]
Remove qStableSort usages from declarative

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I57912f2d1f36053055ea36b1699f704a675dc8b0
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoRemove qLowerBound usages from declarative
Giuseppe D'Angelo [Thu, 12 Sep 2013 09:06:59 +0000 (11:06 +0200)]
Remove qLowerBound usages from declarative

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I85df32525af0c5706c631555a06b66ef3484d797
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoRemove qCopy usages from declarative
Giuseppe D'Angelo [Thu, 12 Sep 2013 09:06:59 +0000 (11:06 +0200)]
Remove qCopy usages from declarative

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: Id410f20cba2abb4724351ebb29e20b7a8f784ede
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoRemove qSort usages from declarative
Giuseppe D'Angelo [Thu, 12 Sep 2013 09:06:59 +0000 (11:06 +0200)]
Remove qSort usages from declarative

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I8fa7d0186cc8f0ba562695974829e37f1eb87f2f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix ReturnedValue support on ia32 and arm
Simon Hausmann [Wed, 11 Sep 2013 10:25:07 +0000 (12:25 +0200)]
Fix ReturnedValue support on ia32 and arm

The 64-bit value is passed in eax:edx and r0:r1

Change-Id: I9a8a7d8ae41f14780958351ecedea2d117f77d85
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoConvert ReturnedValue into a primitive (typedef to quint64)
Lars Knoll [Wed, 11 Sep 2013 09:28:27 +0000 (11:28 +0200)]
Convert ReturnedValue into a primitive (typedef to quint64)

ReturnedValue is used to return values from runtime methods
The type has to be a primitive type (no struct or union), so that
the compiler will return it in a register on all platforms.

They will be returned in rax on x64, [eax,edx] on x86 and [r0,r1] on arm.

Change-Id: I38433e6fad252370dda5dc335d9c5be8f22e8c76
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoFix __qmljs_init_closure to use ReturnedValue
Lars Knoll [Mon, 9 Sep 2013 20:34:47 +0000 (22:34 +0200)]
Fix __qmljs_init_closure to use ReturnedValue

Change-Id: I777a63db32857a6a326839e3fcdb99657dc80e7f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoChange binops to use ReturnedValue
Lars Knoll [Mon, 9 Sep 2013 20:23:10 +0000 (22:23 +0200)]
Change binops to use ReturnedValue

Change-Id: I068b1af5c352fc84793079e5bccbe3482b04cafa
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoConvert unary operations and some other runtime methods
Lars Knoll [Mon, 9 Sep 2013 19:35:37 +0000 (21:35 +0200)]
Convert unary operations and some other runtime methods

Change-Id: I985876ade37efd24e1d4f8360a6472282cf44f8b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoUse ReturnedValue for more runtime methods
Lars Knoll [Mon, 9 Sep 2013 19:17:01 +0000 (21:17 +0200)]
Use ReturnedValue for more runtime methods

Change-Id: I6e92dccf4c3c1a9e4c23128ced41b6e19da1e490
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoRemove unused code to generate post increment and decrement expressions
Lars Knoll [Mon, 9 Sep 2013 18:34:30 +0000 (20:34 +0200)]
Remove unused code to generate post increment and decrement expressions

We generate lower level code in codegen and don't use these
runtime methods anymore.

Change-Id: If1023ce5295431305f4528839bcf2a3031fa7ad2
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoUse ReturnedValue for some more runtime methods
Lars Knoll [Mon, 9 Sep 2013 18:32:01 +0000 (20:32 +0200)]
Use ReturnedValue for some more runtime methods

Change-Id: I68c7d321f8d17b32110ee050aa48fae5735e63ad
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoUse QV4::ReturnedValue in the runtime API
Lars Knoll [Mon, 9 Sep 2013 13:10:03 +0000 (15:10 +0200)]
Use QV4::ReturnedValue in the runtime API

This makes function calls from the JIT/Moth into the
runtime significantly nicer.

Change-Id: Ie7d7123984d65c0bee0525d3d28c643a76b394c4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoUse a ReturnedValue when converting to String or Object
Lars Knoll [Mon, 9 Sep 2013 12:33:28 +0000 (14:33 +0200)]
Use a ReturnedValue when converting to String or Object

Also rename Value::toQString() to Value::toQStringNoThrow(),
and add a throwing toQString() method for JS use.

Change-Id: I821b33fc61abb7d08839df965fd337685f61a545
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoFix passing of exception table pointers to ARM runtime on unwinding
Simon Hausmann [Wed, 11 Sep 2013 09:26:32 +0000 (11:26 +0200)]
Fix passing of exception table pointers to ARM runtime on unwinding

Our synthetic exception unwind table for ARM is located at

    (char *)codeStart + function->codeSize;

This relies on function->codeSize to contain the number of bytes of
instructions the function has, not the size of the MacroAssemblerCodeRef
(which contains the size of the entire area).

This patch fixes the calculation of function->codeSize and also replaces
the QHash for the IR::Function* -> CodeRef mapping in the masm backend
with a simple vector that's perfectly sufficient.

Bug spotted by Petr Nejedly

Change-Id: I78a53599085c613c6d97aa2490922f54e0bb4f63
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoV4: fix variable collection for assignment to non-temporaries.
Erik Verbruggen [Tue, 3 Sep 2013 09:19:02 +0000 (11:19 +0200)]
V4: fix variable collection for assignment to non-temporaries.

Change-Id: Ie1de760824d8927cf10cbc1e02145f40d812e8ee
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoV4 JIT: add env. var. QV4_NO_REGALLOC.
Erik Verbruggen [Fri, 30 Aug 2013 15:45:51 +0000 (17:45 +0200)]
V4 JIT: add env. var. QV4_NO_REGALLOC.

If set to anything, no register allocation will be performed.

Change-Id: Ibe11ad8c8ac6dacd898bc4a4d5296476ca6ddb14
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoV4: add counters for built-in function invocations.
Erik Verbruggen [Thu, 29 Aug 2013 17:42:50 +0000 (19:42 +0200)]
V4: add counters for built-in function invocations.

When enabled, counters for the number of invocations of built-in runtime
functions are dumped when the application exits normally.

Note: this gives a penalty on execution speed. It is not meant to be
super light-weight, but as a tool to have an indication which functions
get called most, thereby helping to indicate which code-paths to
optimize.

Change-Id: Ica701f36a578affcce5ee8414532259972e5ede5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoV4 IR: fix Temp equality, and its use in type inference.
Erik Verbruggen [Thu, 29 Aug 2013 14:08:10 +0000 (16:08 +0200)]
V4 IR: fix Temp equality, and its use in type inference.

Change-Id: Ibf14d8835517981eda41ee768446da49965248be
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoAllow QtQuick private headers to be used with QT_NO_KEYWORDS.
Jocelyn Turcotte [Mon, 9 Sep 2013 13:55:04 +0000 (15:55 +0200)]
Allow QtQuick private headers to be used with QT_NO_KEYWORDS.

This is necessary for the QtWebEngine module.

This also adds an empty nokeywords test using the same mechanism
as qtbase/tests/auto/tools/moc/no-keywords.h to find conflicts
at compile time.

Change-Id: I9df541720797dd61f078178c2af68ead18ff8bfe
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoExport QQuickDefaultClipNode for modules using quick-private.
Jocelyn Turcotte [Mon, 9 Sep 2013 13:54:52 +0000 (15:54 +0200)]
Export QQuickDefaultClipNode for modules using quick-private.

Change-Id: Ia79d53dcb5a2ce4e91820c88e2dada666c6d7841
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoV4 JIT: change the stack layout.
Erik Verbruggen [Thu, 12 Sep 2013 09:32:43 +0000 (11:32 +0200)]
V4 JIT: change the stack layout.

The saved register area (used to store values in registers that need to
be passed by reference in a function call) is now right behind the
callee saved register area. This means that the stack now has two
"parts": a JavaScript part with the function call arguments and the
locals, and a "C++" part that holds saved registers which do not need to
be garbage collected.

This also fixes a bug where the size of the CallData was not taken into
account when calculating the offset for the saved registers.

Change-Id: If0af072f3299176c54ad33710e7d15bc9d26ae8b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoV4 regalloc: correct life-time hole handling.
Erik Verbruggen [Thu, 29 Aug 2013 12:46:31 +0000 (14:46 +0200)]
V4 regalloc: correct life-time hole handling.

When a life-range is active, but does not cover a position, it means
that it is inactive. When going from active to inactive (or vice-versa),
a (un-)spill is only needed when there is a stack-slot allocated to the
range. It is valid to not have a stack slot: when no call is done, or
when the register pressure does not push the end of the hole onto the
stack.

Change-Id: I5f5a05181c8cb384f031538dbefd7d11de682b8d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoV4 regalloc: fix cycle scheduling in resolve phase.
Erik Verbruggen [Thu, 29 Aug 2013 11:43:04 +0000 (13:43 +0200)]
V4 regalloc: fix cycle scheduling in resolve phase.

When resolving differences in register/spill-slot assignment between
basic-blocks, dependency cycles can occur. Those cycles have to be
scheduled after non-cyclic dependencies.

This also removes a assertion that only held when the cycle was 2 long,
but would incorrectly fire for longer cycles.

Change-Id: I519fd43bbf117d3480e4169ff363e97a9ec450f8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQquickimageparticle: Simplify code
Tobias Hunger [Thu, 29 Aug 2013 11:48:34 +0000 (13:48 +0200)]
Qquickimageparticle: Simplify code

Clang nags about perfLevel < 9999 being always true.

Change-Id: I09f46a8cd81f0f7eecdbd5eabd52f8f7ff4603c1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoDefaultColorDialog bugfix: binding color to a TextField
Shawn Rutledge [Wed, 11 Sep 2013 13:14:28 +0000 (15:14 +0200)]
DefaultColorDialog bugfix: binding color to a TextField

The text field shows the hex value of the currently selected color,
but the color to string conversion is not implicit.

Change-Id: I914033d6358696b4014ca48bf3ae435c98b5be33
Reviewed-by: Liang Qi <liang.qi@digia.com>
11 years agoV4 JIT: fix visitRet for UInt32 temps.
Erik Verbruggen [Thu, 29 Aug 2013 08:03:51 +0000 (10:03 +0200)]
V4 JIT: fix visitRet for UInt32 temps.

Change-Id: Ia104cc50523f6aef348ecbe0b597b79c1817390a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoV4 JIT: finish swapValues.
Erik Verbruggen [Thu, 29 Aug 2013 08:01:38 +0000 (10:01 +0200)]
V4 JIT: finish swapValues.

Change-Id: I92b2a84128714927d61c9879c5ddb584631ea2ce
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agotst_qquicktextinput/data::maxLength(): Fix assert about zero-width window.
Friedemann Kleint [Tue, 10 Sep 2013 13:28:24 +0000 (15:28 +0200)]
tst_qquicktextinput/data::maxLength(): Fix assert about zero-width window.

Occurring with ANGLE-builds.

Task-number: QTBUG-32541
Change-Id: Ib48f0c802dd3242a227f8c5d7fda2fccca71403a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoV4 JIT: generate code for binary expressions.
Erik Verbruggen [Wed, 28 Aug 2013 13:05:24 +0000 (15:05 +0200)]
V4 JIT: generate code for binary expressions.

Change-Id: If32ee3528fa0b6a2d04263d6c6abe1d34053d658
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoFix return type checks in test.
Erik Verbruggen [Wed, 11 Sep 2013 08:00:43 +0000 (10:00 +0200)]
Fix return type checks in test.

Same problem as 3dbc7a72c7e38b2a34df3a9ef496547c795420af fixed in
another test. Same solution.

Change-Id: Ib476239e567c43e4657487c34cfc7157a1f5d33f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoContinue conversion to using scoped values
Lars Knoll [Mon, 9 Sep 2013 11:38:10 +0000 (13:38 +0200)]
Continue conversion to using scoped values

This converts all methods in qv4runtime_p.h to not
use raw values in arguments anymore.

The conversion of return values will be done in a separate
commit.

Change-Id: Ie6e8f3bed459d09cb831f7f87920b7eada161502
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoMore work on converting calling conventions to fit the new GC scheme
Lars Knoll [Mon, 9 Sep 2013 09:07:21 +0000 (11:07 +0200)]
More work on converting calling conventions to fit the new GC scheme

Change-Id: I4283cc85ad599b62a8efbe9268680287cf74097e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoStart adapting function signatures in the qv4runtime
Lars Knoll [Mon, 9 Sep 2013 08:46:06 +0000 (10:46 +0200)]
Start adapting function signatures in the qv4runtime

Move the signatures over to something that will enforce
the exact GC later on.

Change-Id: I2e1a472aea296cc1862c76c1e6dab5d0d2f5177c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoAdd ValueRef classe and use it to make things GC safe
Lars Knoll [Sun, 8 Sep 2013 19:02:07 +0000 (21:02 +0200)]
Add ValueRef classe and use it to make things GC safe

The ValueRef class holds a reference to a Value that
is already known to the GC. ValueRef's should be
used to pass Value arguments to methods.

As a first step us the class to make unary
operations GC safe

Change-Id: Ie13e332ed95b2908df9a201a3f757db864c05ca9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoRemove unusued method
Lars Knoll [Fri, 6 Sep 2013 12:00:32 +0000 (14:00 +0200)]
Remove unusued method

Change-Id: I76233198e01d853637bd09b12f73ba3b45104e70
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoProperly unwind the js stack for generated code
Lars Knoll [Fri, 6 Sep 2013 11:48:33 +0000 (13:48 +0200)]
Properly unwind the js stack for generated code

Surround all calls into generated code with a
try {} catch {} statement that resets the jstack
to the correct position.

Like this we properly unwind the js stack in all cases, and
can also use stricter assertions in our ScopedCallData, etc.
classes to check that the stack is healthy.

Change-Id: I7ca03e06ea55007be683305d9c2a6898cf5fc689
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoChange signature of call/construct() to take a pointer to a CallData
Lars Knoll [Fri, 6 Sep 2013 10:44:12 +0000 (12:44 +0200)]
Change signature of call/construct() to take a pointer to a CallData

Change-Id: I5467aadba083e4b01fb0a7170946695207033680
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoGenerate CallData structures directly in the instruction selection
Lars Knoll [Thu, 5 Sep 2013 12:49:55 +0000 (14:49 +0200)]
Generate CallData structures directly in the instruction selection

Like this we can hand the CallData through the runtime methods
without any need to modify them. This simplifies the code in there,
and should also speed them up to some degree.

Change-Id: Ibd92ff4a8f279a5c4a054c5678646f658cfed5ca
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoMove CallData onto the JS stack
Lars Knoll [Thu, 5 Sep 2013 11:22:23 +0000 (13:22 +0200)]
Move CallData onto the JS stack

Change-Id: I22e853acfd2da337344b581bb0412c5f9930c510
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoAdd ScopedValue and ScopedValueArray classes
Lars Knoll [Wed, 4 Sep 2013 14:05:34 +0000 (16:05 +0200)]
Add ScopedValue and ScopedValueArray classes

Use these classes to hold Values on the stack. They
are known by the GC and very fast to create and destroy.

Change-Id: Idacf639485295ff446f290c5b0e149465354720e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoCreate a stack for JS values and use it in the interpreter
Lars Knoll [Tue, 3 Sep 2013 10:40:07 +0000 (12:40 +0200)]
Create a stack for JS values and use it in the interpreter

First step towards being able to do an exact GC.

Create a stack for JS Values that is separate from the C++
stack.

Use the stack for generated methods (masm and moth).

Change-Id: I80ac0e5b5d86439dda5e9ea2b21fa0c57d8aef22
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoQQuickWindow: Quieten warning about unused variable
Tobias Hunger [Thu, 29 Aug 2013 11:47:17 +0000 (13:47 +0200)]
QQuickWindow: Quieten warning about unused variable

Clang nags about this.

Change-Id: I4b1b3123ef526a4692b08af7211ecb6cae6835d8
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
11 years agoV4: add environment variable QV4_FORCE_INTERPRETER
Erik Verbruggen [Mon, 9 Sep 2013 14:07:01 +0000 (16:07 +0200)]
V4: add environment variable QV4_FORCE_INTERPRETER

By setting this variable, the interpreter will always be used, even when
the JIT is available.

Change-Id: I66a439b649fd22e0d10be4f07f1e7be392b012f5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoEnable -Werror for qtdeclarative
Alan Alpert [Wed, 4 Sep 2013 22:52:43 +0000 (15:52 -0700)]
Enable -Werror for qtdeclarative

This allows CI to screen for warnings in src and tools code. It does
not apply to examples or tests.

This is the same as commit 7012db159bc4196444ace26991b24a31e3fba495 in
qtbase.

Change-Id: I0ea00fbd4b45156dedabfd16a3cb3e5f6170f23f
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoV4: Fix build in release with forced asserts
Konstantin Ritt [Tue, 10 Sep 2013 08:58:29 +0000 (11:58 +0300)]
V4: Fix build in release with forced asserts

Change-Id: I7419b10223ebb28cc54cbb595818509a7384ac6a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoAdd Q_UNUSED for reserved fields.
Alan Alpert [Tue, 10 Sep 2013 07:38:55 +0000 (00:38 -0700)]
Add Q_UNUSED for reserved fields.

Prevents the following compiler errors with Clang

src/quick/scenegraph/coreapi/qsggeometry.h:183:10: error: private field
      'm_reserved_bits' is not used [-Werror,-Wunused-private-field]
    uint m_reserved_bits : 25;
         ^
 src/quick/scenegraph/util/qsgsimplerectnode.h:66:11: error: private field
      'reserved' is not used [-Werror,-Wunused-private-field]
    void *reserved;
          ^
 src/quick/items/qquickclipnode_p.h:66:10: error: private field 'm_reserved' is not
      used [-Werror,-Wunused-private-field]
    uint m_reserved : 31;
         ^
 src/quick/scenegraph/coreapi/qsgmaterial.h:143:11: error: private field
      'm_reserved' is not used [-Werror,-Wunused-private-field]
    void *m_reserved;
          ^
 src/quick/scenegraph/coreapi/qsgnode.h:267:10: error: private field 'm_reserved'
      is not used [-Werror,-Wunused-private-field]
    uint m_reserved : 31;

Change-Id: I0ea00fbd4b45156dedabfd16a3cb3e5f6170f2ff
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoV4: Constant binary expression evaluation.
Erik Verbruggen [Mon, 19 Aug 2013 08:54:42 +0000 (10:54 +0200)]
V4: Constant binary expression evaluation.

Statically calculate binary expressions which have two constants as
operands. Currently only for add/subtract/multiply/divide and
comparisons.

Change-Id: Ia8c7222d45bbba956025fe349fc1494015a3e74f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoV4 debugger: change agent API to work on all debuggers.
Erik Verbruggen [Tue, 10 Sep 2013 10:24:37 +0000 (12:24 +0200)]
V4 debugger: change agent API to work on all debuggers.

From a client point of view, there is no way to know which engine is
executing which script. So, instead of passing in a debugger for a
specific engine, have the agent set breakpoints on all debuggers.

Change-Id: I53b8cbc1bdc02c7705042f2ac3a99a041992c134
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoMake it possible to handle pointers to QObject derived in QML.
Stephen Kelly [Thu, 12 Jan 2012 19:01:15 +0000 (20:01 +0100)]
Make it possible to handle pointers to QObject derived in QML.

This way, properties of QObject derived types can be read in QML
code for example:

 Q_PROPERTY(MyObject* obj READ obj CONSTANT)

Previously, only QObject* types could be read by QML:

 Q_PROPERTY(QObject* obj READ obj CONSTANT)

This meant that multiple properties and methods had to be created
for classes which were relevant to both QML and non-QML code.

This patch lifts that restriction.

As a consequence, we can also remove a Q_EXPECT_FAIL from
the qqmllanguage unit test. That test was introduced in
commit 92562eacbc3c (Allow signal parameters which are custom QML
object-types, 2012-07-13) to document knowledge of the limitation
while fixing it as much as possible.

Task-number: QTBUG-26662

Change-Id: Ic85fa73c6f3655189438ec509765bae2eab9993a
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoV4 regalloc: loading this never needs/needed a call.
Erik Verbruggen [Tue, 3 Sep 2013 19:44:34 +0000 (21:44 +0200)]
V4 regalloc: loading this never needs/needed a call.

Change-Id: Ibf95a5fe7634094386ba103b01b4e7e9f2c183e8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoChange access mode for functions declared in qml
Caroline Chao [Wed, 4 Sep 2013 13:13:53 +0000 (15:13 +0200)]
Change access mode for functions declared in qml

Give the method a QMetaMethod::Public access instead
of a QMetaMethod::Protected one. This is valid
and is also needed when using the qmlplugindump tool
with composite types.

Change-Id: Ie1660716d8767cdc949f04a2f324799f2d2fe6c5
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoFix warning by ICC: function without return value
Thiago Macieira [Thu, 5 Sep 2013 00:45:29 +0000 (17:45 -0700)]
Fix warning by ICC: function without return value

Yes, it can't be reached due to the Q_UNREACHABLE(). ICC expands that to an
__assume(0), which I guess isn't strong enough.

qv4isel_util_p.h(94): error #1011: missing return statement at end of non-void function "QQmlJS::convertToValue"

Change-Id: I41d9fd7382a41fe0e753812fc1d71fdc802ef854
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoTrigger rebuild when xform of alpha nodes change.
Gunnar Sletta [Fri, 6 Sep 2013 08:35:26 +0000 (10:35 +0200)]
Trigger rebuild when xform of alpha nodes change.

When transforms change, overlaps may have changed, so we
need to rebuild all batches under the current root.

Instead of adding taggedRoots logic for rebuilding
batches only, we reuse the existing tagged roots for render
lists. This one is slightly more expensive, but for now
I believe the reduced code complexity outweights the tiny
overhead.

Change-Id: I1bd0efc18e5628f404d6d4dce38c725436e87ce5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoFix partial rebuilds and geometry changes.
Gunnar Sletta [Thu, 5 Sep 2013 12:12:53 +0000 (14:12 +0200)]
Fix partial rebuilds and geometry changes.

When we do partial rebuilds, we need to update the render order
for the entire subtree unconditionally. The previous logic
was to reuse existing render orders beneath batch roots, which
caused overlapping orders to be used.

When geometry of an alpha batch changes, we need to rebuild
everything under the current root. Otherwise, we might end
up with previously batched content which incorrectly
overlaps the changed geometry.

Change-Id: I7b6de5ce34a02434294ac5ae29ae1b87eb3c4464
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoMake tiled images not use atlas.
Gunnar Sletta [Thu, 5 Sep 2013 09:13:08 +0000 (11:13 +0200)]
Make tiled images not use atlas.

The imagenode has two code paths, one fast path relying on
GL_REPEAT and one slower based on one quad per internal tile.
The quad path is very costly and should be avoided at all cost
so extract the texture from the atlas when we have tiling.

Task-number: QTBUG-33310
Task-number: QTBUG-29786

Change-Id: I952749e86dc407db43b168db3ab880eb93329a7a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoConvenience function for resetting the OpenGL state.
Gunnar Sletta [Fri, 30 Aug 2013 10:18:42 +0000 (12:18 +0200)]
Convenience function for resetting the OpenGL state.

Change-Id: I222930c74b9153c4d6d2b62afe0cc2906afb61fa
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoAdd support for external drag and drop in Quick items.
Chris Meyer [Mon, 26 Aug 2013 23:15:23 +0000 (16:15 -0700)]
Add support for external drag and drop in Quick items.

Add dragType enums with values of None, Automatic, Internal (default).
Setting to Automatic allows startDrag to be called automatically.
Setting to Internal (default) retains old behavior.

Add mimeData to Drag item to enable external drags.

Call startDrag to start drag manually or change from internal drag to
external drag. Added events dragStarted and dragFinished that get
invoked from startDrag.

Mime data must be specified in the mimeData property as
mime-type / data pairs.

Moved QQuickDrag from qquickmousearea* files to qquickdrag* files to
reduce header interdependencies that caused linking errors in other
modules and also to improve code organization.

Allow DropArea to receive and process external data.

Introduced new variable containsDrag to QQuickDropAreaPrivate. This
replaces mimeData which was previously being used to determine if a
drop operation was currently occurring. The problem was that mimeData
was being externally destructed.

Also introduced accessor methods for getting color, html, image, text,
and urls out of the drop. This facilitates dropping of external data of
those types onto a DropArea.

Added example quick/externaldraganddrop.

Task-number: QTBUG-27498
Change-Id: I1420df7c161ea3399e49a23305273e106baa246f
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
11 years agoTests: Re-enabled tests for access type of QMetaObject::Signal
Caroline Chao [Mon, 9 Sep 2013 06:51:40 +0000 (08:51 +0200)]
Tests: Re-enabled tests for access type of QMetaObject::Signal

QMetaMethod::Signal access is now QMetaMethod:Public in qtbase.

Change-Id: If1a3e76889bd25fb20ba6ed1e3b8206053acd8d9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoV4: temporarilly disable the optmizer/regalloc.
Erik Verbruggen [Mon, 9 Sep 2013 09:57:00 +0000 (11:57 +0200)]
V4: temporarilly disable the optmizer/regalloc.

There are two bugs for which patches are pending. In order to unblock
qtquickcontrols, this code is disabled until those pending patches are
merged.

Change-Id: I2362bf3db0614ef8c6f45a1506838f227ea17b59
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoFix return type checks in test.
Erik Verbruggen [Mon, 9 Sep 2013 13:52:06 +0000 (15:52 +0200)]
Fix return type checks in test.

When calling into JavaScript, the specific type of the return value can
differ if that return value is a number. This is not only the case for
non-integral numbers, or numbers that do not fit into the (signed)
integer range, but it also depends on which optimizations are run. to
check if the return value is of a number type, use this method instead
of checking against a specific userType.

Change-Id: I0464c062bd617c83b7a1e887f7853aa5cd8f43e4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoPolish items on screen change.
Morten Johan Sørvig [Mon, 26 Aug 2013 08:52:38 +0000 (10:52 +0200)]
Polish items on screen change.

The window device pixel ratio may change. Repaint
all items.

Change-Id: I09b782800c15ec6290bf79cb7c7a5d6e6c08b528
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoMake sure we update texture parameters when using atlas textures.
Gunnar Sletta [Fri, 6 Sep 2013 13:47:57 +0000 (15:47 +0200)]
Make sure we update texture parameters when using atlas textures.

The QSGTexture class tracks filter and wrap states internally
and only updates when new states have been set. When atlas
textures are used, multiple QSGTexture instances share the
same OpenGL texture id and the state will get out of sync.

Change-Id: Iaf6ba9764a67acf25d0a6b0a2fb18170122e3325
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoTests: Disabled temporarily access type tests of QMetaMethod::Signal
Caroline Chao [Mon, 9 Sep 2013 06:47:25 +0000 (08:47 +0200)]
Tests: Disabled temporarily access type tests of QMetaMethod::Signal

Change in qtbase to make the QMetaMethod signals access Public instead
of Protected.

Change-Id: I2de17fdc7edb896eb82ae8f467919e4636904cf6
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoAdd missing file to qquickflickable test
Martin Jones [Fri, 23 Aug 2013 23:06:10 +0000 (09:06 +1000)]
Add missing file to qquickflickable test

Change-Id: I69014a85f61bbf1958daa1e4b6cda59534c04a83
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoFix build on iOS: define GL_DOUBLE
Richard Moe Gustavsen [Fri, 6 Sep 2013 11:19:00 +0000 (13:19 +0200)]
Fix build on iOS: define GL_DOUBLE

This patch will fix the build error:

qsgbatchrenderer.cpp:1844: error: use of undeclared identifier
GL_DOUBLE

Change-Id: I7981e303e4743bb610822633c7da433238de4683
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoV4 JIT: Change function call generation with registers.
Erik Verbruggen [Tue, 27 Aug 2013 11:02:32 +0000 (13:02 +0200)]
V4 JIT: Change function call generation with registers.

When generating a function call where arguments are passed by reference,
first save all arguments that are in registers to the stack, and only
then put the references into the outgoing positions (stack or register).

Change-Id: Iaec4db6836e33627723eb4709fd6dad2b4ea8a1d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoV4: fix inferred types of 30&&true and 30||true.
Erik Verbruggen [Thu, 29 Aug 2013 09:13:04 +0000 (11:13 +0200)]
V4: fix inferred types of 30&&true and 30||true.

The type was incorrectly inferred as double instead of var.

Fixes ch10/10.5/10.5-7-b-3-s

Change-Id: I93a43318a94a820a1a2e05c7b670a08915b99723
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoDocument TextInput property displayText as read-only
Jeremy Katz [Wed, 4 Sep 2013 03:38:00 +0000 (20:38 -0700)]
Document TextInput property displayText as read-only

Change-Id: Iff30a548fc2ef8ecf2fa6393832943f365cb0fa3
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoRemove variables that aren't being used right now
Thiago Macieira [Thu, 5 Sep 2013 00:34:56 +0000 (17:34 -0700)]
Remove variables that aren't being used right now

Found by ICC.

 src/quick/items/qquicktextcontrol.cpp(78): error #2415: variable "fullWidthSelection" of static storage duration was declared but never referenced
 src/quick/items/qquicktextinput.cpp(2696): error #2415: variable "textCursorWidth" of static storage duration was declared but never referenced
 src/quick/items/qquicktextinput.cpp(2697): error #2415: variable "fullWidthSelection" of static storage duration was declared but never referenced
 src/quick/scenegraph/qsgthreadedrenderloop.cpp(164): error #2415: variable "WM_LockAndSync" of static storage duration was declared but never referenced
 src/quick/scenegraph/qsgthreadedrenderloop.cpp(181): error #2415: variable "WM_UpdateLater" of static storage duration was declared but never referenced

Change-Id: I60b5cce79d7be5f909b690f97ffa93ea00d3c044
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agowince: Build fix, creating stack traces is not available on this platform
Sérgio Martins [Thu, 29 Aug 2013 11:11:54 +0000 (12:11 +0100)]
wince: Build fix, creating stack traces is not available on this platform

Keep the windows.h include as the first one.
Change-Id: I8e605159bd441ab56be6310644f4aa7c7ecb6abf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoRemove insignification of the test on Windows.
Friedemann Kleint [Fri, 6 Sep 2013 14:13:40 +0000 (16:13 +0200)]
Remove insignification of the test on Windows.

The failing test is excluded by
adba828504c498944d244c5d17576f4542dd0c15 .

Task-number: QTBUG-32664

Change-Id: I5030fbbe8d1c2bc93da9649b22223a6278b71ea0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoExport qsgnode_set_description.
Gunnar Sletta [Fri, 6 Sep 2013 07:14:35 +0000 (09:14 +0200)]
Export qsgnode_set_description.

We want to use it from Controls.

Change-Id: Ia825cb7373139f070f20b3ff73cbe71e1c6428ad
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoPrefer multisample antialiasing when we have a msaa context
Gunnar Sletta [Fri, 30 Aug 2013 06:38:24 +0000 (08:38 +0200)]
Prefer multisample antialiasing when we have a msaa context

Task-number: QTBUG-32699
Change-Id: Id4382c154954cb114af2cc29b075ddab8df9f387
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoMerge "Merge branch 'stable' into dev" into refs/staging/dev
Sergio Ahumada [Fri, 6 Sep 2013 08:23:23 +0000 (10:23 +0200)]
Merge "Merge branch 'stable' into dev" into refs/staging/dev

11 years agoMerge branch 'stable' into dev
Sergio Ahumada [Thu, 5 Sep 2013 13:31:08 +0000 (15:31 +0200)]
Merge branch 'stable' into dev

Conflicts:
src/qml/debugger/qv8debugservice.cpp
src/qml/qml/v8/qv8engine.cpp
tests/auto/quick/qquickitem/qquickitem.pro

Change-Id: Ic4a1dcdd8b8a84155d2f2abefdf1da5c3a56af31

11 years agoStabilize tst_QQuickMultiPointTouchArea.
Friedemann Kleint [Fri, 30 Aug 2013 08:38:34 +0000 (10:38 +0200)]
Stabilize tst_QQuickMultiPointTouchArea.

Center windows on screen, introduce QScopedPointer.

Change-Id: Ia9205f74211eba1f2d2250ff1c76f54618ed7d79
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoFix a warning about not using a set variable
Laszlo Papp [Thu, 29 Aug 2013 06:09:52 +0000 (07:09 +0100)]
Fix a warning about not using a set variable

6a36bcb7945109daebd6464ee6d0a3f6724fb18b fixed similar warnings, but apparently
the tools folder was left out.

Change-Id: If7f889e404264688fa6208afcd3bfdba5a161714
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoRemove large, unused function in QtQuick 2
Thiago Macieira [Thu, 5 Sep 2013 04:51:42 +0000 (21:51 -0700)]
Remove large, unused function in QtQuick 2

qquickcontext2dcommandbuffer.cpp(187): warning #177: function "drawRepeatPattern" was declared but never referenced

Change-Id: If3d6a2d30f1782f640876f03de0ee8f901e23347
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
11 years agoDisable the isPowerOfTwo functions that are only used with OpenGL ES 2
Thiago Macieira [Thu, 5 Sep 2013 04:50:27 +0000 (21:50 -0700)]
Disable the isPowerOfTwo functions that are only used with OpenGL ES 2

Found by ICC 14. This warning is not made an error because ICC is too
chatty when it comes to detecting unused functions. In this case,
however, it is right.

qsgtexturematerial.cpp(49): warning #177: function "isPowerOfTwo" was declared but never referenced
qsgtexture.cpp(84): warning #177: function "isPowerOfTwo" was declared but never referenced
qsgdefaultimagenode.cpp(368): warning #177: function "isPowerOfTwo" was declared but never referenced

Change-Id: I6c96dad3e1236fd33a02232f886ca33fa2b21258
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoFix rendering errors in Qt Quick Controls gallery
Gunnar Sletta [Wed, 4 Sep 2013 12:08:41 +0000 (14:08 +0200)]
Fix rendering errors in Qt Quick Controls gallery

First, when doing a partial rebuild, we need to mark
all elements for orphaning, not just those without a batch,
as the renderlist should at all times contain everything
that is rendered on screen.

Second, we had a small bug with material changes where we
would overwrite the rebuild state instead of adding to it.
This led to the render lists not being rebuilt from scratch
in some scenarios.

Third, after the shadow nodes rewrite, we didn't mark
for a full rebuild when clips were added.

Change-Id: I6707ebfa2908fcedd7fb636fb25b844be15fdea1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoOff-by-one error in batch recylcing lead to leaks and no recycling
Gunnar Sletta [Wed, 4 Sep 2013 06:26:06 +0000 (08:26 +0200)]
Off-by-one error in batch recylcing lead to leaks and no recycling

Change-Id: Ic6b126bbc929c2062fd3e77253ad8bba60376a50
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoFix qqmllocale test to use correct spec and time zone
John Layt [Tue, 3 Sep 2013 18:40:49 +0000 (20:40 +0200)]
Fix qqmllocale test to use correct spec and time zone

By including the +10:00 offset in the date strings the test is actually
creating Qt::OffsetFromUTC datetimes, not QT::LocalTime datetimes. The
only reason the test currently passes is due to a bug in the QLocale
datetime formatter which uses the current system daylight time
abbreviation in all cases regardless of the datetime spec or if
daylight or standard time.  Change 61774 fixes this bug but cannot
be merged as this test now fails.  This change fixes the bug by
removing the offset, causing Qt:LocalTime datetimes to be created
which pass the test both before and after change 61774.

See https://codereview.qt-project.org/#change,61774

Change-Id: I1642ab7c8aa516b703216f3791e2fc60866d1895
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoRemoved the static intialized boolean of qquickitemsmodule.
Dominik Holland [Thu, 27 Jun 2013 07:41:18 +0000 (09:41 +0200)]
Removed the static intialized boolean of qquickitemsmodule.

This prevents a reregistration of the all QQuick2 types when
qmlClearTypeRegistrations() is called

Task-number: QTBUG-32078
Change-Id: I33b4c069183d6344a2f14b4147eaa7056c3b72b9
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoFix qmlClearEnginePlugins() to clear engine plugins.
Dominik Holland [Thu, 27 Jun 2013 07:42:39 +0000 (09:42 +0200)]
Fix qmlClearEnginePlugins() to clear engine plugins.

Task-number: QTBUG-32078

Change-Id: I2d3aeb6b91ffdb9b8c70ad93d1e43daada84fb7f
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
11 years agoFix crash tst_qqmllanguage
Dominik Holland [Mon, 1 Jul 2013 20:28:06 +0000 (22:28 +0200)]
Fix crash tst_qqmllanguage

qmlClearTypeRegistrations() shouldn't be called when instances of
QQmlEngine are still open. This can lead to unexpected behavior.

For the qmlClearTypeRegistrations() function there is separate
autotest

Task-number: QTBUG-32078
Change-Id: I32612bc82602593d902bbffc58911e427b50524f
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoFix tons of reference errors in tst_qquickpositioners
J-P Nurmi [Wed, 4 Sep 2013 12:51:31 +0000 (14:51 +0200)]
Fix tons of reference errors in tst_qquickpositioners

Due to missing context properties:
ReferenceError: fooBar is not defined

Task-number: QTBUG-33018
Change-Id: Ibba95ab688a8d5cadc94bdeb30d0ec087ffe3c0c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
11 years agoFix qv4jsir_p.h warnings
J-P Nurmi [Wed, 4 Sep 2013 08:56:00 +0000 (10:56 +0200)]
Fix qv4jsir_p.h warnings

Apparently CONST is not defined on MSVC 2010, so the unbalanced
push/pop macro usage leads to tons of such warnings:

qv4jsir_p.h(922) : warning C4602: #pragma pop_macro : 'CONST' no
previous #pragma push_macro for this identifier

Change-Id: Ia34ef00e79b4f7a3abf682e1e78dfa3193e30838
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoFix compiler warning about unused variable
Kai Koehne [Tue, 27 Aug 2013 11:39:56 +0000 (13:39 +0200)]
Fix compiler warning about unused variable

Change-Id: I2dda2462170658a678a35a6fafdb5d39a8d8e9f4
Reviewed-by: Alan Alpert <aalpert@blackberry.com>