Laszlo Agocs [Thu, 16 Apr 2015 10:47:42 +0000 (12:47 +0200)]
Avoid showing garbage when resizing the rendercontrol example
The threaded variant was working well since that triggers a render
when resizing. The single threaded version lacked this and this
resulted in showing garbage on OS X at least since the new FBO had
undefined contents. Avoid this.
Task-number: QTBUG-45613
Change-Id: Ibb3d3f7640bab5da913df1c0c63cc3a3aaafb140
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Simon Hausmann [Mon, 27 Apr 2015 13:18:05 +0000 (13:18 +0000)]
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Simon Hausmann [Mon, 27 Apr 2015 07:52:51 +0000 (09:52 +0200)]
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
Change-Id: I715b8a78b74cbe0dcaf599367fd6e08af4858e11
Aaron Kennedy [Thu, 29 Jan 2015 13:56:00 +0000 (14:56 +0100)]
Only heap allocate binding bits storage if needed.
For samegame, this has the following change on the total bytes allocated:
Startup (main page):
Before: 1636
After: 1072
Difference: 564 bytes (-34%)
Actual game (single player):
Before: 14120
After: 10432
Difference: 3688 bytes (-26%)
Done-with: Robin Burchell <robin.burchell@viroteck.net>
Change-Id: I10fd1e9f1440dcff93aed06e2c77c2912bc7dd39
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
(cherry picked from commit
54a19db8d00b67044861c8ffd1d5b1e646658609)
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Gabriel de Dietrich [Thu, 23 Apr 2015 09:12:08 +0000 (11:12 +0200)]
Instantiator: Make asynchronous mode work
This patch proceeds in two steps. First, and the most trivial,
we make sure not to offend the Instantiator's objects container
since asynchronous creation also means the objects can be created
in any order. We do so by ensuring the objects container has
always the necessary size.
The second step is to make sure the objects don't get destroyed by
the delegate model when their incubation tasks are asynchronous.
We force to keep an extra reference calling the object() function
on the instance model, but only if the creation was asynchronous.
However, it's not enough to check for the Instantiatior async value
since the incubation tasks in QQmlDelegateModel are async-if-nested.
Therefore, we need to keep track of the object index requested to
the model and see if it matches when the createdItem() signal gets
emitted.
Task-number: QTBUG-36410
Change-Id: I180b03b6a7468d6521827a9631755577e9e6d357
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Simon Hausmann [Sat, 25 Apr 2015 15:40:39 +0000 (17:40 +0200)]
Merge remote-tracking branch 'origin/5.4.2' into 5.4
Change-Id: Ie0987bcaeae5ee06e01f06ac27f0d161272720b0
Simon Hausmann [Wed, 22 Apr 2015 15:15:30 +0000 (17:15 +0200)]
Prospective fix for flakey "network" related QML tests
Replace hard-coded server ports with dynamically allocated ports.
Change-Id: Iab8f9a88343a9f2c49af3cd700c954c13c3bf121
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Shawn Rutledge [Fri, 24 Apr 2015 06:39:19 +0000 (08:39 +0200)]
Add list of changes for 5.4.2 relative to 5.4.1
Change-Id: I9f64f0ff3d10ced8ddc7a4aafac1c77680e3f30e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Nico Vertriest [Tue, 21 Apr 2015 11:02:50 +0000 (13:02 +0200)]
Doc: corrected error on return value qmlRegisterType
Task-number: QTBUG-45584
Change-Id: I97508aabe47c49d8e27329a7856dd921ee0505dd
Reviewed-by: Martin Smith <martin.smith@digia.com>
Robert Griebl [Wed, 15 Apr 2015 11:57:51 +0000 (13:57 +0200)]
Fix a memory leak in the material shader cache.
There were multiple problems in the implementation of the shader cache:
1) it was not thread-safe
2) nothing was ever removed from the hash
3) since the keys into the hash are the actual shader source code, problem
#2 would lead to serious memory consumption over time
Change-Id: I20d1fb2074932e23f89edddba12e68ab8adcbff0
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Simon Hausmann [Wed, 22 Apr 2015 11:39:06 +0000 (13:39 +0200)]
Fix regression with nested objects served by custom parsers
The following piece of code used to work and broke with Qt 5.3:
ListModel {
property var conn: Connection {
...
}
}
When validating the properties of the ListModel we would not validate
the Connection sub-object here, which meant the custom parser for the
connection object was never called.
We need to extend the logic for sub-object validation to recursive into
sub-objects when this is either an attached property (Component.onComplete on a
list model for example) or the object is assigned to an _existing_ property,
i.e. a property not deal with by the custom parser. In this case that's a
custom declared property.
Change-Id: Ic99f746f08771460cc6424a9e8a839c78a7eafd9
Task-number: QTBUG-45735
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Eirik Aavitsland [Tue, 14 Apr 2015 11:30:36 +0000 (13:30 +0200)]
Make the scenegraph_lancelot test work on Mac
Grabbing the window after every frame is needlessly expensive and
would overload a less powerful Mac. Rewrote the grabber to just do the
necessary grabs.
Make the hostinfo script not output the unneeded '[undefined]' value
for unset environment variables, as the braces would upset the paths
in the html report.
Change-Id: I76104235c15eafd5e7f92f2ec01c84f5b11b55a6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Konstantin Ritt [Mon, 20 Apr 2015 08:07:18 +0000 (12:07 +0400)]
[labs.settings] Minor optimization
Prefer clear() over subsequent erase() and remove duplicated check.
Change-Id: Ibc70c665972e2f972763e7a0088263815792a997
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Pasi Petäjäjärvi [Wed, 22 Apr 2015 12:28:21 +0000 (15:28 +0300)]
V4: include alloca private header as alloca is used unconditionally.
Change-Id: I9d0f63c41609c4aaef272fabafd5b1272853a099
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
J-P Nurmi [Mon, 20 Apr 2015 13:59:08 +0000 (15:59 +0200)]
QtQml.Models: bump up the import version number to 2.2
The latest version is 2.2 since
4ca9be5.
Change-Id: I19014c26301a67f2ce2ef93d7bab124a65337b59
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
J-P Nurmi [Mon, 20 Apr 2015 12:56:36 +0000 (14:56 +0200)]
Add plugins.qmltypes for QtQml.Models
Task-number: QTBUG-43229
Task-number: QTCREATORBUG-13780
Change-Id: Ice39a26809eb433a01205bae5cea9cfdc0699c27
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Shawn Rutledge [Wed, 18 Feb 2015 08:23:32 +0000 (09:23 +0100)]
add manual tests for touch interaction
So far there are manual tests for Flickable and
MultiPointTouchArea. It can be expanded later.
Change-Id: Ifa838b68f137a49647a208dc15f22c90f1e02d1f
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Mitch Curtis [Tue, 21 Apr 2015 11:41:33 +0000 (13:41 +0200)]
XCB: respect QPlatformDrag::ownsDragObject().
In a Qt Quick application on X11, QDrag events were deleted before
their data could be passed to an external application. There was a
function introduced recently to account for this problem, so we should
use that instead.
Change-Id: If74dd32bb8c7aa7c2e3160448af546d2e8640528
Task-number: QTBUG-45604
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Marco Benelli [Tue, 17 Mar 2015 15:33:14 +0000 (16:33 +0100)]
qmlplugindump: add dependencies
Change-Id: I53b2a394ba1f6c8a7a88f7456fba8646cdf35bf4
Task-number: QTBUG-41079
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Rolf Eike Beer [Wed, 4 Feb 2015 12:24:53 +0000 (13:24 +0100)]
QML: do not check stack size if stack grows up
On architectures where the stack grows upwards (i.e. HP PA-RISC) the
stack limit calculation fails because the variables used to check the
offset are usually close to the bottom of the stack, which is in this
case the origin of the stack grows. Since these machines are a rare
obscurity simply assume that everything is fine on these machines. The
few people that are indeed running QML on such machines will probably
be able configure their stack size properly by default.
Task-number: QTBUG-44268
Change-Id: Ia83a39179a0f6e0602ba7a5032d386e12d8d1ba3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Simon Hausmann [Mon, 13 Apr 2015 11:46:40 +0000 (13:46 +0200)]
Eliminate remaining property cache string lookups upon object instantiation
Even for the id property binding we can use the property data cache and
therefore avoid string hashing.
Change-Id: Id9a4ca3159cdfe5ba93060f1bc8626e70140daa1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 10 Apr 2015 08:13:04 +0000 (10:13 +0200)]
Speed up instantiation of objects that are assigned to list properties
For example massive amount of Item{} objects that are "children" of another
item and thus get assigned to the default data list property. Instead of
repeatedly retrieving that list property via a meta-call, we can do that only
once and re-load if necessary.
Change-Id: Ia7d10b84b3c7dca58d9f0b4b2138bd6f916c128d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Thu, 9 Apr 2015 08:23:17 +0000 (10:23 +0200)]
Speed up property binding initialization on object creation
Avoid repeated string hashing and lookups in the property cache in order to
retrieve the property details when initializing literal and script bindings.
Instead we now cache the property data at type validation time, similar to how
the property data was encoded in the VME instructions in the old engine.
Change-Id: I3957c7c4c3e26dfa97c4880b23940a3755ee90e4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Lars Knoll [Mon, 20 Apr 2015 11:38:31 +0000 (13:38 +0200)]
Always return a proper Value from JIT generated code
When throwing an exception, we ended up having junk data in
the return value register. That could end up being written
onto the JS stack when returning from the function, and then
causing crashes in the garbage collector afterwards.
Fix it by returning undefined in case we throw an exception.
Change-Id: Ice380f2de673b179c1e2c98fbeb87e47347ef520
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Oswald Buddenhagen [Mon, 20 Apr 2015 10:27:43 +0000 (12:27 +0200)]
Bump version
Change-Id: Ifd5bf3e424ee0d0fe7218414c6f95c7a4c2a5d81
Holger Hans Peter Freyther [Tue, 31 Mar 2015 18:23:27 +0000 (20:23 +0200)]
Address uninitialized pointer variables
Coverity CID 10721, 84861, 86705, 85424, 85422,
85259, 84863, 84857
Change-Id: Ia86970b5ac4e0be9de01b79b618d33011da6a328
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Alexandr Rekunkov [Mon, 30 Mar 2015 10:29:52 +0000 (13:29 +0300)]
fix model leak in QQmlInstantiator
Change-Id: Ieb6ef229bc999f1a35adc2a157bd42a38908f7d7
Task-number: QTBUG-45271
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Sze Howe Koh [Tue, 14 Apr 2015 23:45:03 +0000 (07:45 +0800)]
Doc: Expand on QJSEngine exception handling
- List the properties provided by the Error object. They consist of the
standard properties and a subset of the Mozilla extensions.
- Add QJSValue::property() usage to the example code.
- Add cross-referencing.
- Some rephrasing for clarity and conciseness.
Change-Id: I1eb6943899fee2bd81851ccb03660a7a474a975d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Nico Vertriest [Mon, 30 Mar 2015 08:27:35 +0000 (10:27 +0200)]
Doc: corrected some language issues
Task-number: QTWEBSITE-628
Change-Id: I608c4fe5e18f6494cc03377080a536a01be232ca
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Friedemann Kleint [Fri, 17 Apr 2015 06:46:11 +0000 (08:46 +0200)]
Fix forward declaration of QQmlSourceLocation.
Fix warning:
qtdeclarative/src/qml/qml/qqmljavascriptexpression_p.h(55) : warning C4099: 'QQmlSourceLocation' : type name first seen using 'struct' now seen using 'class'
Change-Id: Id441502913180631fe09c2f256498063c8f144b1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Shawn Rutledge [Thu, 16 Apr 2015 07:52:53 +0000 (09:52 +0200)]
rename manual test dir shorcuts -> shortcuts
Change-Id: Icdd494fb6c561b15d3cccb925b84990163c77bf2
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Liang Qi [Thu, 16 Apr 2015 18:27:44 +0000 (18:27 +0000)]
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Simon Hausmann [Fri, 10 Apr 2015 13:17:51 +0000 (15:17 +0200)]
Speed up composite type instantiation with lots of IDs
We don't need to convert from a QHash to a QVector in order to populate the
property name cache in QQmlContextData.
Change-Id: Ifa8e4f64a1e174907e92684b2d38abaf0a4a705c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 10 Apr 2015 13:17:36 +0000 (15:17 +0200)]
Speed up object creation
Avoid copying url and file name twice into the context every time we
instantiate an object.
Change-Id: I1c76b80b9c44f95512af5899d760151f6dcd7bb5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 10 Apr 2015 12:56:24 +0000 (14:56 +0200)]
Speed up object creation with lots of id name objects
In the common case when objects are referenced by id, we don't need the
QQmlContextData's property name cache for the lookup. Instead of bindings
we resolve the id to an integer at type compilation time. Therefore we can
delay the population of the QQmlContextData's propertyNames until we need it
and therefore safe time on startup.
Change-Id: I2e8eeb51b1ac92f230059be3467f9a1e00fdbbef
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Thu, 9 Apr 2015 13:50:55 +0000 (15:50 +0200)]
Speed up script binding initialization
Don't spend any time repeatedly building the same internal class for the simple
binding functions. We can do that once at engine construction time.
Change-Id: I3777b5bd15ad4a8aaf78ae13bee27e8d8cadc2ee
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Thu, 9 Apr 2015 10:33:13 +0000 (12:33 +0200)]
Avoid strict mode for the surrounding QML call contexts
The strict mode is not necessary from a correctness point of view but comes
with the extra cost that for each script binding additional caller and
arguments accessor members are a installed on the internal class.
Change-Id: I13b688bc8344ee2f027679821586ca7670d17cc5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Laszlo Agocs [Wed, 15 Apr 2015 16:14:15 +0000 (18:14 +0200)]
Support sRGB for text with QQuickWidget
Otherwise we get visually different results with QQuickWindow
and QQuickWidget on OS X.
Task-number: QTBUG-42861
Change-Id: Icbf6f6e980129f5de73a88e7be7bef4f592e875e
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Simon Hausmann [Thu, 9 Apr 2015 14:07:08 +0000 (16:07 +0200)]
Speed up creation of objects without script bindings
Avoid the creation of the QML binding wrappers if we don't need it, by
moving the creation into a function that creates it on demand.
Change-Id: I1af6a8507a114c1a0b83374704981b7ed4c4a3fc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 10 Apr 2015 12:22:58 +0000 (14:22 +0200)]
Speed up copying of value types in bindings
When a binding results in a value type reference and the destination property
is of the same time, then we can avoid a heap allocation and just allocate
the value type memory on the stack, construct, copy and destruct.
Change-Id: If71ef82b0ced85c1b962c5e44147d6c07edd1440
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 10 Apr 2015 10:34:46 +0000 (12:34 +0200)]
Speed up value type binding creation
* Avoid calling QMetaType::construct/destruct(typeId, ...) as that requires
repeated lookups in the type registry. Instead cache the constructor/destructor/etc.
function addresses in the QQmlValueType singletons as QMetaType
* Allocate memory for the gadget pointer lazily, to accommodate the common case of
a value type binding by property reference.
Change-Id: I98a3ac73453b8f80027c06401b4f29a9707949d2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Mon, 13 Apr 2015 14:01:59 +0000 (16:01 +0200)]
Changed QML type locking
Replace the use of QReadWriteLock with a plain QMutex. At this point
QReadWriteLock adds a lot of overhead due to its internal QHash and otherwise
offers little over a recursive mutex, especially given that there is most
of the time only one reading thread and one writing thread.
Change-Id: I0a91e4a64cff5d25e4a133ed46b08912e81bb055
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 10 Apr 2015 13:53:02 +0000 (15:53 +0200)]
Speed up creation of objects that don't import scripts
In the common case of no 'import "Foo.js" as Bar' we can avoid the creation of
the JS array that holds the script references.
Change-Id: I6704bd9efaf8681f939a148b2cb0a1de2cb22d80
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Fri, 10 Apr 2015 10:34:36 +0000 (12:34 +0200)]
Speed up binding evaluation
Don't spend any cycles of determining the location of the binding (file, line,
column) unless we really need that information. That's the case when the profiler
is active or an error happens.
Change-Id: Iae97808d500b88fed6a813e8b224aa6ebe04d3b6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Liang Qi [Thu, 16 Apr 2015 10:29:42 +0000 (12:29 +0200)]
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro
tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro
Change-Id: I76d87e3df97ebdba902ca3d7488c1582eca2a83c
Gunnar Sletta [Tue, 24 Mar 2015 06:58:39 +0000 (07:58 +0100)]
Fix regressed atlas texture log output. Broken since:
a49b0ad786
Change-Id: I5df32609b45047666ea8bde500cf771736c396e5
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Gunnar Sletta [Wed, 1 Apr 2015 12:45:30 +0000 (14:45 +0200)]
Make sure we have enough precision to run animations for years.
Task-number: QTBUG-45358
Change-Id: I4af0da937253f3ae578333c659dcbb132312a9cc
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Robert Griebl [Tue, 24 Mar 2015 21:28:34 +0000 (22:28 +0100)]
Unregister types in the QMetaType system on unload.
This patch will enable the unregistering of previously registered
QMetaTypes, when the corresponding Qml type is dead.
The API for this was added to QtBase with
b00201b.
Change-Id: I96d4a3004d8da59ee8edf7cfd6d2fef3a5410807
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Valery Kotov [Wed, 25 Mar 2015 18:17:08 +0000 (20:17 +0200)]
QML Engine: Share data for ArrayBuffer created from QByteArray.
ExecutionEngine performs shallow copy of internal data for ArrayBuffer
created from QByteArray.
Change-Id: I514cd9708a7fbe9a989937fac62d00b464d7362d
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Valery Kotov <kotov.valery@gmail.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Julien Brianceau [Tue, 14 Apr 2015 16:15:54 +0000 (18:15 +0200)]
V4 JIT: cosmetic change
Since
4377d44fb7399751ed4f284bb4be7ece494aff6d, we can avoid one
generateFunctionCallImp bounce.
Change-Id: I2e92578dbc26a614f7626d2c28a2d9b28dd06b6b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Albert Astals Cid [Tue, 14 Apr 2015 14:02:43 +0000 (16:02 +0200)]
Protect the RegExp against early garbage collection
Backported from Qt 5.5
Change-Id: Ice9fd8061fac0c35d787e1603873c69f8ef7e10b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Daniel Teske [Thu, 15 Jan 2015 15:34:53 +0000 (16:34 +0100)]
Use qt_subtract_from_timeout instead of duplicating qt_timeout_value
The same function was duplicated 5 times in qtbase, so create one copy
to rule them all and use it also in QtDeclarative.
Change-Id: I4e39a7ee0541ce4fe9710cea344e537ee011bbe9
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Simon Hausmann [Wed, 8 Apr 2015 13:55:34 +0000 (15:55 +0200)]
Simple speed-up for binding setup during object instantiation
We use stringAt() to retrieve the name of the id property of an object but all
we do with that string is check if it has a length. So if an id is set, we
allocate memory and copy the string data into a new QString, and if it's not
set then we get a default constructed QString. Either way the string isn't used
and we can simply check for whether the id is set by checking if the idIndex is
non-zero.
Change-Id: Ib84fb05ed31c59f7e85dac72ab61b4d3bc9c902b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Wed, 8 Apr 2015 12:49:41 +0000 (14:49 +0200)]
Cleanup: Fix const'ness of the property binding validator code
The property validator is supposed to validate the proposed property bindings
and abort type compilation if necessary. As such it is a read-only pass through
the data structures and therefore we make it const. However it does have a
side-effect of collecting some state, which however is "write-only" and
therefore marked as mutable. Those variables are written to, but not read
during this pass.
Change-Id: I6a3655fedbd6691b7498cf82ca1c8e21dd635bd3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Simon Hausmann [Wed, 8 Apr 2015 12:09:14 +0000 (14:09 +0200)]
Cleanup
Avoid re-using the same variable for different purposes, so just pull in the
first use into the tight scope and the second "property" variable close to
the loop it is used with.
Change-Id: I3a325478f9e56413b65dea9c7e05566497fbc6cf
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Julien Brianceau [Mon, 13 Apr 2015 15:00:34 +0000 (17:00 +0200)]
V4 JIT: fix typo in Binop::int32Binop
Change-Id: I68f073ab512b482c9b3b1ad7860f4c759245298e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Christian Strømme [Mon, 30 Mar 2015 12:14:00 +0000 (14:14 +0200)]
Match the offscreen windows position to the QQuickWidget position.
The position of the offscreen window would always be set to 0,0,
making it impossible to get the actual position of the scene.
With this change, it will be possible for child windows or items
in the scene to correctly calculate their global position.
Change-Id: Ibd3ff03880209047776e86ad889b40cbf79c3e6e
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Frederik Gladhorn [Mon, 30 Mar 2015 22:21:58 +0000 (00:21 +0200)]
Fix a few typos
Change-Id: Ia00949757a6f47babc1748f27e32a9644d6cc608
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Laszlo Agocs [Mon, 13 Apr 2015 08:18:22 +0000 (10:18 +0200)]
Avoid running anims at 3x speed on Windows
When there is no render pending, renderWindow() is not called and so
there is no blocking for vsync. Advancing the animations without any
sleep is wrong in this case and results in animations running at 3x
speed in case there is no change in the scenegraph contents.
To solve this, import the threaded render loop's sleep call.
Task-number: QTBUG-42699
Change-Id: I3658a827af12d4bc2ac05c7b0b29c65e9fc99675
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Caroline Chao [Wed, 8 Apr 2015 12:13:28 +0000 (14:13 +0200)]
Tests: Use blacklist instead of insignificant for tst_qquickanimations
Remove the insignificant_tests CONFIG option in favor of a BLACKLIST file.
Blacklist the relevant tests, the tests that have been found flaky in CI.
Change-Id: I4c3ce430e654886ceea8b6f714710ebe2374e4db
Task-number: QTBUG-45466
Task-number: QTBUG-29062
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Caroline Chao [Thu, 9 Apr 2015 12:22:31 +0000 (14:22 +0200)]
Tests: Use blacklist instead of insignificant for tst_qquickflickable
Remove the insignificant_tests CONFIG option in favor of a BLACKLIST file.
Blacklist the relevant tests, the tests that have been found flaky or
failing in CI.
Change-Id: If145b9bc413e4c9dbf1c3c06c1596647c707770e
Task-number: QTBUG-36804
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Albert Astals Cid [Wed, 1 Apr 2015 14:20:19 +0000 (16:20 +0200)]
Do not stall loading of local images if network is slow
Without this patch it can happen that we're
loading IMAGEREQUEST_MAX_REQUEST_COUNT http based images,
if the next image to load is a local file it wouldn't be processed
until one of the http ones finishes, which makes not much sense
Change-Id: I515306005192a20722f0c4588a1db1241348407c
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Eskil Abrahamsen Blomfeldt [Wed, 8 Apr 2015 11:09:24 +0000 (13:09 +0200)]
Fix TextEdit when vertical alignment != AlignTop
When the TextEdit's alignment was either AlignBottom or
AlignVCenter, several things would be broken: First of all
the position of all non-dirty nodes would not be updated,
so if you e.g. added text to the end of the document, it
would overlap with the previously added text.
Also, the frame decorations were always aligned to the top, since
the basePosition was not accounted for in the node for this.
The fix is to translate the root node to the base position instead
of baking this into the position of the text nodes. This also
automatically fixes frame decorations since it's already aligned
to the top of the root node.
[ChangeLog][TextEdit] Fixed issues with using other vertical
alignments than AlignTop.
Change-Id: I11f73eab21a28658a5cbf00292fd519efd0f3e7f
Task-number: QTBUG-45032
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Caroline Chao [Wed, 8 Apr 2015 12:41:23 +0000 (14:41 +0200)]
Tests: Make qquickcustomparticle significant again
The test is passing in CI and it seems it was temporarily
made insignificant in
5a4eebbc.
Change-Id: Ic53d45b842c9a9c431a43cb6d5cbd3849e5729ed
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Caroline Chao [Wed, 8 Apr 2015 13:00:06 +0000 (15:00 +0200)]
Tests: Make qquicktrailemitter significant again
The test is now passing in CI.
Change-Id: Iad7dc46e7819ba9e9f604ed39ab9bc53f123b119
Task-number: QTBUG-33421
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Caroline Chao [Wed, 8 Apr 2015 13:16:15 +0000 (15:16 +0200)]
Tests: Make qqmldebugjs significant again
The test is now passing in CI.
Change-Id: I9414e05d40fe373878afa43121fcfa7cf95fcbdf
Task-number: QTBUG-28263
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Caroline Chao [Tue, 7 Apr 2015 12:58:27 +0000 (14:58 +0200)]
Tests: Make qquickgridview significant again
The qquickgridview tests are passing in CI
Change-Id: Idaf5a9d9df06a28c9ff5162b7bb00e4d677c3a0b
Task-number: QTBUG-33017
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Caroline Chao [Wed, 8 Apr 2015 07:32:24 +0000 (09:32 +0200)]
Tests: Make qquicktext, qquicktextedit and qquickpathview significant
The tests are now passing in CI for OS X.
The test qquicktextedit is also passing on win32.
Make qquicktext, qquicktextedit and qquickpathview significant again.
Change-Id: I778cc90aff0d1e76b66b6f8ae5150d3113e6fc68
Task-number: QTBUG-27740
Task-number: QTBUG-32540
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Julien Brianceau [Fri, 3 Apr 2015 07:13:17 +0000 (09:13 +0200)]
[mips] Handle properly unaligned halfword load.
This patch improves YarrJIT efficiency on mips platforms.
Cherry-picked from qtwebkit (
ea22657d17a934b04c8621dc8891a1d4d80510e3)
Change-Id: I83eca9716e4d6e9e1dd4d8ceb76c3da380502ce7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Ulf Hermann [Wed, 8 Apr 2015 14:07:46 +0000 (16:07 +0200)]
Remove outdated V8 profiler test
Change-Id: I296a3f94d16c4e7a6f89e566893f627c50b66ba3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Mitch Curtis [Wed, 8 Apr 2015 08:04:25 +0000 (10:04 +0200)]
Return the correct type from Item::mapToItem/Item::mapFromItem.
Previously we were returning a JavaScript object with x/y/width/height
properties, instead of a point/rect. This meant that the type couldn't
be converted to a point/rect because we don't support duck typing,
where we would deduce the type based on the properties.
One example of a broken use case that this patch fixes is when QML is
unable to convert the return type to a point in a property declaration:
property point p: mouseArea.mapToItem(child, mouseArea.mouseX, mouseArea.mouseY)
Another is using the result of the function to pass to another function:
child.contains(mouseArea.mapToItem(child, mouseArea.mouseX, mouseArea.mouseY))
Change-Id: I3ce82f10175f904dd02c8af6b5e42cee14b2ebb2
Task-number: QTBUG-41452
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Richard Moe Gustavsen [Wed, 8 Apr 2015 12:10:28 +0000 (14:10 +0200)]
tst_qquickapplication: change test case 'state' to be more stable
Qt-5.4 integration can sometimes fail on this test. We have not
succeeded reproducing it, but from reading the test code, it seems
likely that the problem might come from already pending state
events queued before the test starts. Since the test cannot know if
the platform will queue state events while spinning the event loop
(waitForEvents), this patch will instead only flush already queued
events, which should be less prone to side effects.
Change-Id: I134f98ba35faa4d9213ee658ebcbe76b390b5516
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Julien Brianceau [Fri, 3 Apr 2015 07:09:28 +0000 (09:09 +0200)]
[mips] Fix or32 implementation in macro assembler.
Cherry-picked from qtwebkit (
0546c8656a3728bf4375da39027e096beba4f111)
Change-Id: I924661dc51bee334c6f26557e765a3a1e8ec0bce
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Julien Brianceau [Fri, 3 Apr 2015 07:11:44 +0000 (09:11 +0200)]
[mips] Fix branchTruncateDoubleToUint32 implementation in macro assembler.
Cherry-picked from qtwebkit (
2d9ed318a21f6102dddc0b91de2698908a9b8efc)
Change-Id: I88d961e89d046b20329bc1fcfc10bfceb21d737b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Caroline Chao [Tue, 7 Apr 2015 12:43:05 +0000 (14:43 +0200)]
Tests: Make qquickloader tests significant again
The qquikcloader tests are passing in CI.
Change-Id: I472e20cdeb76f867b9cb02e3bcfdc447825d4d14
Task-number: QTBUG-30721
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Friedemann Kleint [Tue, 31 Mar 2015 12:40:20 +0000 (14:40 +0200)]
Improve debug formatting of QAbstractAnimationJob and related classes.
- Output the state.
- Add output to QQuickAnimatorJob.
- Add a private export to the debug operator for use by
QQuickAnimatorProxyJob to format its contained job.
Task-number: QTBUG-45220
Change-Id: Ic64bb5d949864de1c4fb322d53acc3e253977e5d
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Friedemann Kleint [Wed, 1 Apr 2015 09:46:33 +0000 (11:46 +0200)]
Improve debug operator for QQuickItem.
Use new formatting helpers and output name, z only when necessary.
For example,
QQuickRectangle_QML_4 (this = 0xb380e0 , name= "" , parent = 0xa4a290 , geometry = QRectF(0,0 320x480) , z = 0 )
becomes:
QQuickRectangle_QML_4(0xb380e0, parent=0xa4a290, geometry=0,0 320x480)
Change-Id: I5d4a8cf9f435995754f875a928fa36978418e4bf
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Aaron McCarthy [Tue, 10 Mar 2015 05:40:44 +0000 (15:40 +1000)]
Add note clarifying return value of Qt.openUrlExternally()
On some platforms (notably wayland and xcb) the Qt.openUrlExternally()
call returns as soon as the request is passed to the underlying system.
The call may still fail, but this status is not reported to the
application.
Change-Id: I66936440f162154f08ab5abcf5b449844930a81b
Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Marko Kangas [Wed, 1 Apr 2015 09:55:01 +0000 (12:55 +0300)]
Fix Text item linkColor update
Changed linkColor to update node correctly when link color is changed.
Change-Id: I056811053e2287c93ba9c0afb5ceddef939f46ce
Task-number: QTBUG-45356
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Kai Koehne [Mon, 20 Oct 2014 13:24:47 +0000 (15:24 +0200)]
Avoid parallel reading/writing of RegExpJitTables.h
RegExpJitTables.h is created in the build directory at compilation time.
This creates problems if debug and release targets are built
in parallel: They might overwrite each other's results, letting the
compiler see intermediate content.
Avoid this by using separate directories for the debug and release build.
Change-Id: I54fee7cb727a1c1777af8e0d5d19a71fdc3aac68
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Liang Qi [Wed, 1 Apr 2015 06:59:17 +0000 (06:59 +0000)]
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Liang Qi [Tue, 31 Mar 2015 13:45:45 +0000 (15:45 +0200)]
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I54e66e992f5e5d441b8b5394e7a03ec5352e7bf3
Eskil Abrahamsen Blomfeldt [Tue, 31 Mar 2015 11:50:31 +0000 (13:50 +0200)]
Android: Work around bug on Samsung Galaxy Tab 3 10.1
After installing the Android 4.4.2 upgrade on Samsung Galaxy Tab 3 10.1,
one of the vertex shaders in Qt Quick stopped compiling.
The issue seems to be that this particular shader triggers a
bug in the driver, and a simple work-around is to replace the
ternary conditional operator with a simple if-statement.
[ChangeLog][Android] Fixed a vertex shader compilation issue on
certain OpenGL drivers.
Change-Id: I2f878215a753a7e222c46c0f85a84b0bc81d523a
Task-number: QTBUG-43515
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Friedemann Kleint [Mon, 30 Mar 2015 15:18:26 +0000 (17:18 +0200)]
Add inheritance documentation markup to animator classes.
Task-number: QTBUG-45220
Change-Id: Ie817275897f860b0d6c4dcac2f92a4f3469a4611
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Friedemann Kleint [Wed, 25 Mar 2015 14:34:03 +0000 (15:34 +0100)]
Fix some qdoc warnings.
qtdeclarative/src/qml/qml/qqmlinfo.cpp:46: warning: Cannot find 'qmlInfo(...)' in '\fn' QQmlInfo qmlInfo(const QObject *object)
qtdeclarative/src/qml/qml/qqmlexpression.cpp:366: warning: Undocumented parameter 'column' in QQmlExpression::setSourceLocation()
qtdeclarative/src/qml/doc/src/qmlfunctions.qdoc:176: warning: Undocumented parameter 'reason' in qmlRegisterExtendedUncreatableType()
qtdeclarative/src/qml/doc/src/qmlfunctions.qdoc:176: warning: No such parameter 'message' in qmlRegisterExtendedUncreatableType()
Change-Id: Iec801b33b11bd57abadd968a90c49f8eba1280d5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Andy Shaw [Thu, 12 Mar 2015 14:01:48 +0000 (15:01 +0100)]
Don't send deferred delete events from windowDestroyed()
This is a follow-up to
657766f19b31d83f361fd3c9ad717b207e1dff8c which
removed it from the destructor itself. This goes one step further and
removes the calls from the windowDestroyed() calls which also sends the
deferred deletes.
Task-number: QTBUG-40920
Change-Id: I491b79bb600914575ba5565d2862d041726217e8
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Jason Erb [Tue, 24 Mar 2015 01:58:09 +0000 (21:58 -0400)]
Improved QML test robustness and logging.
Added logging to quick_test_main and reordered for robustness
(e.g. moved "wait for load" to before error check).
Change-Id: Ifd48b5bdd1efee4301e5c4e571241762dca176ad
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Albert Astals Cid [Mon, 16 Mar 2015 16:46:57 +0000 (17:46 +0100)]
Always remove reply from replies when processing cancelled
Otherwise we if we leave the entry in replies later
QQuickPixmapReader::networkRequestDone
will give a potentially already deleted pointer in replies.take(reply)
which will then crash when trying to post something to it
Change-Id: I157a58e3ebe0a3fd6422742843eafbbdc58a7801
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Frederik Gladhorn [Mon, 30 Mar 2015 15:53:47 +0000 (17:53 +0200)]
Blacklist QQuickWindow::testWindowVisibilityOrder for OS X
The failing test is a regression introduced by
5bf9528b9164bd888e991552b66d6237e84a7ee2.
Since that patch had several side effects, we will not revert it but
blacklist the test function for now.
Task-number: QTBUG-45318
Change-Id: I3e28a21c8b056c1c8f2fd5d6d3ffe32d5f44b0e5
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Kai Uwe Broulik [Tue, 17 Mar 2015 13:26:35 +0000 (14:26 +0100)]
Honor setFocusOnTouchRelease in QQuickTextInput
[ChangeLog][QtQuick][TextInput] SetFocusOnTouchRelease is honored
Change-Id: I0c5150465effadb7b1221250875aedf16a83bb2c
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Shawn Rutledge [Mon, 9 Mar 2015 16:16:34 +0000 (17:16 +0100)]
add qt.quick.touch.target logging category
qt.quick.touch produces a lot of output. This instead tracks only
the changes to the itemForTouchPointId hash: which touchpoints are
being sent to which items.
Change-Id: I5119b4716a43fb35fd6c6712bf7d4ec46d762a9f
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Paul Olav Tvete [Fri, 27 Mar 2015 14:32:16 +0000 (15:32 +0100)]
Update the shader when devicePixelRatio changes
Task-number: QTBUG-45076
Change-Id: I03de20da2e3f436339dcf48fc7d7d3d11a509577
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Ulf Hermann [Fri, 27 Mar 2015 14:07:32 +0000 (15:07 +0100)]
Guard profiler service test against unusual clock behavior.
Apparently a monotonic timer can return the exact same timestamp
multiple times in a row. In this case the events may be sorted in a
different way than we expect. By scanning all events with equal
timestamps for the one we're looking for, we can still keep the test
useful.
Change-Id: I08e1d7ed8d74359a127ac34ebc077375aa70f492
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Giuseppe D'Angelo [Thu, 26 Mar 2015 20:34:42 +0000 (21:34 +0100)]
QQuickWidget: expose the underlying QQuickWindow
There's a number of APIs (such as all the scenegraph-related
signals) that are currently missing from QQuickWidget.
Instead of duplicating every API in QQuickWidget, simply expose
the underlying offscreen QQuickWindow.
Task-number: QTBUG-45260
Change-Id: I1a89fe600ce675963ea24ee6dd56d6ca4fea9cd2
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Laszlo Agocs [Thu, 19 Mar 2015 15:18:16 +0000 (16:18 +0100)]
Fix flushing QQuickWidget
Like it was done for QOpenGLWidget.
Task-number: QTBUG-45106
Change-Id: I69c11f53f781f57ceebb9b7ed95a2753bff31492
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Thiago Macieira [Thu, 18 Dec 2014 03:37:18 +0000 (19:37 -0800)]
Remove the old headersclean unit test
We have configure -headersclean now
Change-Id: If48fb86c9f130450d8ffa94a9e52584141a2d793
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Robert Griebl [Mon, 23 Mar 2015 13:40:03 +0000 (14:40 +0100)]
Fixing yet another memory leak
Change-Id: I1c083a488f963f8dd40f3bd6db5a46ac9db66ffb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Robert Griebl [Mon, 23 Mar 2015 12:38:28 +0000 (13:38 +0100)]
Another fix to avoid detaching the m_windows list.
Just like commit
310fd3ed, this fixes another unnecessary detach.
Change-Id: I5108ea5112a4b0e877f86d06868375abb9a80409
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Robert Griebl [Mon, 23 Mar 2015 12:28:49 +0000 (13:28 +0100)]
Fixed a memory-leak when changing property bindings in states.
Bindings that were still stored in the revert-list when the state
was destructed were not deleted before. This could lead to considerable
memory leaks in big applications.
Change-Id: I73250f7d03a42c25ca729c18082125fd8f3c8989
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Ulf Hermann [Mon, 23 Mar 2015 14:53:23 +0000 (15:53 +0100)]
Fix profiler adapter documentation
Update it to include the features arguments and mark it as internal.
Change-Id: If0324d413c60d3d4bb203fb383dcd20e50db0e88
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>