4 years agoAvoid direct GL calls in Quick
Laszlo Agocs [Tue, 8 Apr 2014 13:05:21 +0000 (15:05 +0200)]
Avoid direct GL calls in Quick

Change-Id: I9b8673fb3292c9d5ad2f9e8e63f56dc661699be6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 years agoMerge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Simon Hausmann [Thu, 22 May 2014 17:59:58 +0000 (19:59 +0200)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

4 years agoV4: fix disassembler address printing for 64bit.
Erik Verbruggen [Fri, 16 May 2014 10:06:23 +0000 (12:06 +0200)]
V4: fix disassembler address printing for 64bit.

Platforms and/or compilers have different opinions on the type of
uint64_t, so with a bit of casting and using the biggest possible
format, the warnings will hopefully disappear.

Change-Id: I1e128eaf8bc53771a517490292f52084046574dd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoBe conservative with atlas allocation for Cover windows.
Gunnar Sletta [Mon, 7 Apr 2014 10:11:45 +0000 (12:11 +0200)]
Be conservative with atlas allocation for Cover windows.

These are usually small and require a very small amount of textures.

Change-Id: I51a1d2965c37ac39c1f1f70d9bb6d7baf41e0562
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
4 years agoV4 IR: change datastructure of the worklist used by type inference.
Erik Verbruggen [Thu, 10 Apr 2014 14:22:00 +0000 (16:22 +0200)]
V4 IR: change datastructure of the worklist used by type inference.

No sets, no cry, and no mallocs of QHashNodes.

QBitArray is not used on purpose: good STL implementations specialize
std::find for std::vector<bool>, with a significant speed gain.

Change-Id: Ic986bbd746e96eb494496f0508acb17318f4f0fb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Simon Hausmann [Thu, 22 May 2014 05:48:30 +0000 (07:48 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I0dd91626837276f5811e4830f4a4e9f89bf1e1bd

4 years agoRe-enable qquicktextinput test on Mac OS X
Simon Hausmann [Fri, 25 Apr 2014 11:15:52 +0000 (13:15 +0200)]
Re-enable qquicktextinput test on Mac OS X

Fixed in qtbase with commit 40b195d0f9ee7ef1b917a635bb073fa108b2ed40

Change-Id: I4af6080dde9c6356c11f09a6ded86ce9ce28b6e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
4 years agoV4: replace debug macro by compile time constant.
Erik Verbruggen [Fri, 25 Apr 2014 13:29:22 +0000 (15:29 +0200)]
V4: replace debug macro by compile time constant.

By having all code "enabled" all the time, it will be checked by the
compiler and visible for refactoring. The compiler will optimize it away
when debugging is turned off.

Also fixes the code where previous refactoring changes were not applied.

Change-Id: I634ac85570125b533adce93ca347c4be3d60aa83
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoV4 IR: change IR printing to use a visitor.
Erik Verbruggen [Wed, 16 Apr 2014 11:22:28 +0000 (13:22 +0200)]
V4 IR: change IR printing to use a visitor.

This allows for overriding methods to customize the printing of nodes.
It also removes some duplicate code.

Change-Id: Ieb9eec2fa7d4e211932d7772586a1d62b119a90a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFix failing assertion inside MSVC STL in debug builds
Simon Hausmann [Tue, 29 Apr 2014 12:45:13 +0000 (14:45 +0200)]
Fix failing assertion inside MSVC STL in debug builds

When using FunctionObject's call() method, we use std::copy to copy the
arguments over to the new call context. Unfortunately std::copy has an
assertion in there to check that we're not copying out of bounds.  What the STL
doesn't know is that the Value args[1] array is dynamically allocated and
easily expands beyond just one entry.

Fall back to copying by hand to work around this issue.

Task-number: QTBUG-38195
Change-Id: I6e254b1c893ccf5cad2358179cda1b07b00228e0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoFix Number.toExponential with parameter
Simon Hausmann [Tue, 29 Apr 2014 15:15:55 +0000 (17:15 +0200)]
Fix Number.toExponential with parameter

The fractionDigits parameter was unfortunately ignored, due to an accidental
double variable declaration, the latter in a narrower scope shadowing the
former in the correct scope.

Task-number: QTBUG-38577
Change-Id: I28f35466d2d744e84b86a3ca6b3371eb86869b55
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoDon't crash on Android
Paul Olav Tvete [Wed, 21 May 2014 12:10:02 +0000 (14:10 +0200)]
Don't crash on Android

If the platform plugin does not support the features needed
for QQuickWidget, then don't try to use it. This is a minimal
change to stop applications from crashing: it does not give
the application a way to find out if QQuickWidget is supported,
since that would mean new API, which we can't do in a patch

Task-number: QTBUG-38268
Change-Id: I975a03b105b1d5c21a1d8ae440a5802ce8c1967b
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
4 years agoFix copy and paste error
Frederik Gladhorn [Wed, 14 May 2014 11:39:16 +0000 (13:39 +0200)]
Fix copy and paste error

Fix error 14 identified by static analysis from

Change-Id: I5f0fa6bd1f14db8e4a86c27610666df6dfd60b1c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoFix copy and paste error
Frederik Gladhorn [Wed, 14 May 2014 11:25:23 +0000 (13:25 +0200)]
Fix copy and paste error

Fix error 10 identified by static analysis from

Change-Id: I42ba9caa43c2c4925774bdc6aa7942a83cb37ba5
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
4 years agoIntroduce TextInput::ensureVisible(int position)
J-P Nurmi [Fri, 16 May 2014 12:35:23 +0000 (14:35 +0200)]
Introduce TextInput::ensureVisible(int position)

This is required for TextField to be able to implement text selection
handles. TextField needs to be able to ensure that the appropriate
character position becomes visible when the handles are moved around.

[ChangeLog][QtQuick][TextInput] Added TextInput::ensureVisible(int pos)
method to be able to control the scrolling position of a TextInput that
has automatic scrolling enabled.

Task-number: QTBUG-38934
Change-Id: Id77eafcda6324d10868e0798519e5b712a0d33ed
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoFocus event fix for QQuickWidget
Paul Olav Tvete [Wed, 21 May 2014 08:49:07 +0000 (10:49 +0200)]
Focus event fix for QQuickWidget

Relay focus in/out events to the offscreen QQuickWindow, and also
make the offscreen window believe it has the focus when the
render window has it.

Task-number: QTBUG-39033
Change-Id: Ib50b134e635833ad3813693ca272f04607c525b8
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
4 years agoMake a pro file based project out of the photoviewer example
Niels Weber [Mon, 12 May 2014 11:27:24 +0000 (13:27 +0200)]
Make a pro file based project out of the photoviewer example

Having a .pro file project is necessary to be able to deploy to
Android. Further patches for Android support will be needed, but
this is the base.

Task-number: QTBUG-38122
Change-Id: I878ec1df50d7375ae9153f8a34f763b5678d7774
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
4 years agoFix tst_qquicktextinput::copyAndPaste() for asynchronous clipboard notification.
Friedemann Kleint [Wed, 21 May 2014 08:45:05 +0000 (10:45 +0200)]
Fix tst_qquicktextinput::copyAndPaste() for asynchronous clipboard notification.

Change qtbase 6a61a00ddb21e79412e82069dfef50192bfd724d for Windows uses
new clipboard notification API that results in asynchronous clipboard

Task-number: QTBUG-39145
Task-number: QTBUG-38670
Task-number: QTBUG-33492
Change-Id: I0de78ecba5c67bf6a66f07e59312667f6ce6bf88
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
4 years agoMerge remote-tracking branch 'origin/release' into stable
Iikka Eklund [Tue, 20 May 2014 10:26:14 +0000 (13:26 +0300)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I939d6b9d10b3f50d9024b80d7a215b8fd04e8d56

4 years agoFix improper antialiasing property behavior
Oleg Shparber [Mon, 19 May 2014 07:53:39 +0000 (00:53 -0700)]
Fix improper antialiasing property behavior

For components antialiased by default the property was returned
as false if default true value was set to true again.

Task-number: QTBUG-39047
Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
4 years agoFix tst_qquicktextedit::cursorRectangle_QTBUG_38947()
J-P Nurmi [Sat, 17 May 2014 10:42:43 +0000 (12:42 +0200)]
Fix tst_qquicktextedit::cursorRectangle_QTBUG_38947()

Fix the uninitialize variable and make sure the test creates
a window that has a sensible (200x200) size.

Change-Id: I02616ab3c832276921e84ae98b7ed926d8fc5f5e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
4 years agoFix crash with running animators on re-shown windows.
Gunnar Sletta [Thu, 15 May 2014 19:01:06 +0000 (21:01 +0200)]
Fix crash with running animators on re-shown windows.

The non-threaded render loops would clean up the nodes for a window
when it was hidden, but the animators kept running and had a reference
to the deleted nodes. This was not a problem for the threaded render
loop as it would wipe the animator controller as well which would
clean the jobs.

Fix it by triggering a reset of all nodes in the animators when the
window is told to clean up. If an animator is ticked when it doesn't
have a node, it will simply do nothing. When the window is made visible
again, we call initialize on all animators to find the new node.

Task-number: QTBUG-37995
Change-Id: Ie5609d95db29f4b2b30ca5bf641dce901e528389
Reviewed-by: Michael Brasser <michael.brasser@live.com>
4 years agoTextEdit: fix cursor rectangle positioning
J-P Nurmi [Mon, 12 May 2014 16:09:08 +0000 (18:09 +0200)]
TextEdit: fix cursor rectangle positioning

QQuickTextControl::cursorRectangleChanged() wasn't emitted as
appropriate when dragging mouse => The cursor delegate was stuck
in wrong position under certain circumstances, especially when
selecting multiple lines.

Task-number: QTBUG-38947
Change-Id: Ib5b0d2f6ea2a1b3712fbaba4a7ad1865d2b0a74e
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
4 years agoAccessibility: add focus action
Frederik Gladhorn [Tue, 13 May 2014 15:45:17 +0000 (17:45 +0200)]
Accessibility: add focus action

This at least implements the focus action for items with activeFocusOnTab
which works with most controls. VoiceOver for example uses this action.

Task-number: QTBUG-38870
Change-Id: I3bdaacec6b07e9baf020499e2e4826e42fe316f0
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
4 years agoDoc: Polish property binding explanations
Sze Howe Koh [Tue, 13 May 2014 23:59:18 +0000 (07:59 +0800)]
Doc: Polish property binding explanations

- Minor rearrangements
- Express things more clearly and/or concisely
- Add links

Change-Id: If1ed639609e39ed1a2c12aed3971da3ee2c8f8a0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
4 years agoDoc: Describe property bindings in terms of relationships
Sze Howe Koh [Wed, 14 May 2014 14:33:34 +0000 (22:33 +0800)]
Doc: Describe property bindings in terms of relationships

- This patch aims to help readers think about bindings more
  "declaratively" by introducing a new (albeit very leaky) level of
  abstraction: Treat bindings as finitary relations, rather than mere
  JavaScript expressions.

- In essence, property bindings are for describing relationships between
  properties. The fact that the QML engine reactively updates a
  property's value when its dependencies change, and the fact that
  arbitrarily complex expressions are valid bindings, are simply
  implementation details.

- Discourage the use of side effects in property bindings. They are not
  essential for the main purpose of property bindings, they break the
  finitary relation model, and their use can reduce code

- Discourage complex property bindings for similar reasons.

Change-Id: I5a0a03bd02768d4c504797a0f86569f3ac066e96
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
4 years agoFix typo in Image documentation.
Mitch Curtis [Thu, 15 May 2014 11:31:16 +0000 (13:31 +0200)]
Fix typo in Image documentation.

Change-Id: Ifa01f3e464c170e5f4739cea4380f1b08eeccc7e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
4 years agoV4 IR: change BasicBlockSet::const_iterator to use std::find.
Erik Verbruggen [Thu, 8 May 2014 10:14:09 +0000 (12:14 +0200)]
V4 IR: change BasicBlockSet::const_iterator to use std::find.

When the storage in the BasicBlockSet is a std::vector<bool>, the
begin() iterator and the ++operator now use std::find. Good STL
implementations have an optimized version specifically for
std::vector<bool> that is a lot faster than the iterating that was used
before. The change also makes the code more readable.

Change-Id: Ic37bac694c133c597b3d61a91b04a0b758516dc3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoMerge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Frederik Gladhorn [Wed, 14 May 2014 19:48:44 +0000 (21:48 +0200)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

4 years agoSupport smooth for AnimatedSprite
Gunnar Sletta [Mon, 12 May 2014 08:38:58 +0000 (10:38 +0200)]
Support smooth for AnimatedSprite

Task-number: QTBUG-38923
Change-Id: I1cb9ac434aa729ee390e17deced9ed470895549d
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
4 years agoDon't adjust the position of transitioning list items.
Jan Arve Saether [Fri, 2 May 2014 13:46:12 +0000 (15:46 +0200)]
Don't adjust the position of transitioning list items.

Adjusting the position of list items only makes sense for items that
belongs to the layout.

Task-number: QTBUG-38229
Change-Id: I7a05f7a3591620cce3cd9ab84cfecbe325e5e93c
Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
4 years agoIntroduce MouseArea.drag.smoothed
Kevin Funk [Wed, 7 May 2014 17:01:19 +0000 (19:01 +0200)]
Introduce MouseArea.drag.smoothed

[ChangeLog][QtQuick] Added property MouseArea.drag.smoothed for toggling
whether the drag target is moved to the current mouse position after a
drag operation has started.

Task-number: QTBUG-38539
Change-Id: I989b51bc83fc24c64b84ac8e9a50b352e674e8f8
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agoFix regression in QJSValueIterator::next() since Qt 5.1.1
Gunnar Sletta [Wed, 14 May 2014 07:30:37 +0000 (09:30 +0200)]
Fix regression in QJSValueIterator::next() since Qt 5.1.1

Iteration on the form "while (next) { .. }" would skip
the last element.

Change-Id: I50692a5a75e23e423e82b7a39e1892f505e4c612
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Tue, 13 May 2014 20:12:48 +0000 (22:12 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I24827851643247b938b3a1b7182864293e5c3fe7

4 years agoDoc: add docs for Photo Surface demo
Leena Miettinen [Wed, 7 May 2014 13:44:17 +0000 (15:44 +0200)]
Doc: add docs for Photo Surface demo

Change-Id: Id6f40b1b769fdd103cfb2afda172b1daf9b1a105
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
4 years agoMinor: Remove unneeded include from qquickitem.h
Kevin Funk [Sat, 10 May 2014 10:12:18 +0000 (12:12 +0200)]
Minor: Remove unneeded include from qquickitem.h

Clean up after 0cb12e9e01b8309320706fab219945f0ff159413

Change-Id: I7e7f0c1f7e3b9bb994bc8fd50e1c9ba462e99e28
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
4 years agoImplement proper support for layoutChange in QQmlDelegateModel
Daniel Vrátil [Wed, 16 Apr 2014 16:33:24 +0000 (18:33 +0200)]
Implement proper support for layoutChange in QQmlDelegateModel

Current implementation is treating model layoutChange the same way as modelReset,
which causes problems when using ListView on top of a QSortFilterProxyModel. The
model emits layoutChanged whenever a data within sorting column change. Treating
it as modelReset leads to poor performance on large models and caused UI issues,
because the scrolling position is reset every time.

This patch implements proper handling for layoutChanged signals by first handling
all items moves and then simulating dataChange for all items.

This fixes regression from Qt 5.1 introduced by Change I16b859d9

Task-number: QTBUG-37983
Task-number: QTBUG-34391
Change-Id: I6d3873b7b87e7f0e8fc0c1ed5dc80c6f8fdf6c22
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Michael Zanetti <michael.zanetti@canonical.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
4 years agoDoc: Fix invalid cross-reference
Kevin Funk [Sun, 11 May 2014 16:55:39 +0000 (18:55 +0200)]
Doc: Fix invalid cross-reference

Change-Id: Ib344215f240705100da8d949ac86b57af26a97ef
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 9 May 2014 14:25:58 +0000 (16:25 +0200)]
Merge remote-tracking branch 'origin/stable' into dev


Manually adjusted for TestHTTPServer constructor change:

Change-Id: I5e58a7c08ea92d6fc5e3bce98571c54f7b2ce08f

4 years agoFix QJSEngine::evaluate using the wrong execution context v5.3.0
Simon Hausmann [Mon, 5 May 2014 13:45:54 +0000 (15:45 +0200)]
Fix QJSEngine::evaluate using the wrong execution context

In contrary to what the documentation says, QJSEngine in Qt 5.x executes
in the context of the global object (QScriptIsolate always called enter
on the QV8Engine's "root" context, thus making it current). The v4
implementation unfortunately did what the documentation said and used
the current context, which is wrong in many ways. For example it completely
breaks the optimization of stack allocated contexts, because when a C++
callback is called from within a JS function with a stack allocated context
and that C++ code calls QJSEngine::evaluate and creates new closures, the
stack context would become an outter context and cause crashes during GC.

This patch restores the behavior of Qt 5.0/5.1 and fixes the documentation.

Task-number: QTBUG-38530
Change-Id: Ie6481f02e676954cc94b188a1c87c88e7c56dafa
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoFix crash on host/target word size mismatches
Simon Hausmann [Wed, 7 May 2014 11:51:26 +0000 (13:51 +0200)]
Fix crash on host/target word size mismatches

When compiling on a 64-bit host and using the QV4::CompileData on a 32-bit
target, the size of QArrayData is different. Therefore we cannot use it in
the QV4::CompiledData and have to resort to storing only the characters in
there. We can at least still use fromRawData when extracting strings, but the
QStringData will have to be allocated now.

Change-Id: Ia9dab1722ed72186451b65ba74457051c6ce3155
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoFix some typos in usage string.
Jeff Tranter [Thu, 8 May 2014 20:37:14 +0000 (16:37 -0400)]
Fix some typos in usage string.

Fix some spelling errors in the command usage string.

Change-Id: Iee94987d0a3dff78e39f588b4c21415ed40a514c
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
4 years agoFix tst_textedit.qml
Bernd Weimer [Tue, 29 Apr 2014 06:51:58 +0000 (08:51 +0200)]
Fix tst_textedit.qml

On platforms that have QT_NO_CLIPBOARD defined copy/paste/cut functions
are not available.

Change-Id: Ia2c82d0d3910f89642b1c3ef719caee88da3999e
Reviewed-by: Damian Jansen <damian.jansen@gmail.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
4 years agoRemove V8 profiler service
Ulf Hermann [Wed, 7 May 2014 09:21:40 +0000 (11:21 +0200)]
Remove V8 profiler service

It's broken and useless and it sends confusing data to the profiler

Task-number: QTCREATORBUG-12188
Change-Id: I944cf19a78ee4378d5773e7aa80876f199a0f03b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
4 years agoV4 IR: remove unused fields from BasicBlock
Erik Verbruggen [Thu, 8 May 2014 08:52:00 +0000 (10:52 +0200)]
V4 IR: remove unused fields from BasicBlock

Also reserve maximum used size for the in/out edge vectors.

Change-Id: I227a2aa0a5211a6425da3aa7318daa120eadfd6c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoRe-fix the warning from cached-powers.cc
Thiago Macieira [Thu, 8 May 2014 06:58:01 +0000 (23:58 -0700)]
Re-fix the warning from cached-powers.cc

This file is now getting included in a different module. See also
60aed669345be33b916c44556555b922aa3ed928, and

Change-Id: Ic886bdf823d5dd6d9ae3df64608d8bb9d901661f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoAndroid: Add support for new input method query API
Paul Olav Tvete [Wed, 7 May 2014 13:02:29 +0000 (15:02 +0200)]
Android: Add support for new input method query API

Change 93fd268d implemented the new API, but missed the final
piece that actually made use of it.

Task-number: QTBUG-38824
Change-Id: Iea28f2cbb8c6d749d781dcf7437552597977f9ac
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoMake item.layer and item.layer.effect work inside positioners.
Gunnar Sletta [Sat, 3 May 2014 08:06:09 +0000 (10:06 +0200)]
Make item.layer and item.layer.effect work inside positioners.

Task-number: QTBUG-31269
Change-Id: Ic3bb76ea5a5055df614f2eaacd3031445f118ca7
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agoDocument that MouseArea::enabled is not the same thing as Item::enabled.
Robin Burchell [Wed, 7 May 2014 15:49:30 +0000 (17:49 +0200)]
Document that MouseArea::enabled is not the same thing as Item::enabled.

This might change in the (long) future, but not yet.

Task-number: QTBUG-38364
Change-Id: Ia424d6b5d54dff88f67b39e4521b5ecc3121fd07
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agoItem views: prevent negative cache buffer
J-P Nurmi [Tue, 6 May 2014 10:22:32 +0000 (12:22 +0200)]
Item views: prevent negative cache buffer

A negative cache buffer does not make much sense, and the item views
would go crazy and start creating/destructing delegates endlessly.

Task-number: QTBUG-38725
Change-Id: I1fbba1f3130a99af67fbc4c2aba4d3199d0554a9
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agoUse correct matrix for render nodes.
Gunnar Sletta [Tue, 6 May 2014 12:54:52 +0000 (14:54 +0200)]
Use correct matrix for render nodes.

Change-Id: I8c137383fa32a64ba64ffb4ed48aa123d0ebf000
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
4 years agonest quickwidgets into the opengl conditional
Oswald Buddenhagen [Wed, 9 Apr 2014 12:23:28 +0000 (14:23 +0200)]
nest quickwidgets into the opengl conditional

the qtHaveModule(quick) could have of course not worked at this point.

Task-number: QTBUG-38202
Change-Id: Id0270d445b9b82731209d69a9dc1950c03c26781
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFix typo in QQuickText documentation.
Mitch Curtis [Tue, 6 May 2014 12:04:27 +0000 (14:04 +0200)]
Fix typo in QQuickText documentation.

Change-Id: Ic2e96e881fe13bcac11e7c172963e2c1e9928256
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agoQWindowsFontEnginge uses GetGlyphOutline which seems to fail
Jørgen Lind [Wed, 30 Apr 2014 08:44:55 +0000 (10:44 +0200)]
QWindowsFontEnginge uses GetGlyphOutline which seems to fail

for fonts containing embedded bitmaps.

Change-Id: I035df24d16f1c9707fff54b0920c8139fda3ddec
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoDoc: add docs for Calqlatr example
Leena Miettinen [Fri, 2 May 2014 15:07:58 +0000 (17:07 +0200)]
Doc: add docs for Calqlatr example

Describe the QML and Qt Quick features that the
example illustrates.

Change-Id: I9a3656873ac1a5a8cdf31b1f85528b1bf081df79
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
4 years agoRemove references of QML as a 'declarative' language
Kai Koehne [Tue, 29 Apr 2014 08:10:03 +0000 (10:10 +0200)]
Remove references of QML as a 'declarative' language

Though the core of QML is declarative, it incorporates JavaScript, a
multi-paradigm language on its own. It's therefore correct to call it
a multi-paradigm language, too.

Change-Id: Ia72acedafefb68ea8c49b9f6ab195ca9e73dad5f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoQQmlPlatform: use QStringLiteral instead of QLatin1String
J-P Nurmi [Tue, 6 May 2014 11:37:40 +0000 (13:37 +0200)]
QQmlPlatform: use QStringLiteral instead of QLatin1String

Change-Id: I83fb44c0bb7d57bc68c6ac54379d5bb0c7ec9715
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
4 years agoNotify about the focus reason
Berthold Krevert [Fri, 2 May 2014 13:18:25 +0000 (15:18 +0200)]
Notify about the focus reason

KeyNavigation sets the focus reason always to Qt::OtherFocusReason. This
should be changed at least for tab and backtab navigation.

Change-Id: I27c654a202e2a80449dd5420460e413ca9cff75e
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
4 years agoBe more verbose about actual results in tst_qqmlprofilerservice
Ulf Hermann [Tue, 6 May 2014 10:09:07 +0000 (12:09 +0200)]
Be more verbose about actual results in tst_qqmlprofilerservice

QCOMPARE and QVERIFY2 are clearly superior to QVERIFY when comparing
values in tests.

Change-Id: Ia860d6f087680066fbe0ffa311b5557e77f1720c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
4 years agoReturn "winphone" and "winrt" for Qt.platform.os when appropriate
Andrew Knight [Mon, 5 May 2014 17:18:56 +0000 (20:18 +0300)]
Return "winphone" and "winrt" for Qt.platform.os when appropriate

Task-number: QTBUG-38532
Change-Id: I33b4fe5bb61baf9df3ca472424ca631172bf70fb
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
4 years agoStore information about focus reason in QQuickWindowPrivate
Berthold Krevert [Wed, 30 Apr 2014 18:33:07 +0000 (20:33 +0200)]
Store information about focus reason in QQuickWindowPrivate

QtQuickControl's Desktop style needs to know whether the last focus change
was requested by keyboard or not. With this information the Desktop style
is able to set the QStyleOption accordingly. Without the flag, some of
the QStyles (QFusionStyle, QGtkStyle) don't render a focus rectangle.

This patch is needed by #change,84389 in QtQuickControls

Change-Id: Ia06f56b018cd35eea933892a4c50e0aa7328042d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
4 years agoUpdate qmltypes files
Alan Alpert [Thu, 1 May 2014 21:08:42 +0000 (14:08 -0700)]
Update qmltypes files

Additionally, fixes some revisioning errors which a manual inspection
of the qmltypes files diffs revealed.

-mipmapChanged signal is new
-windowTitleChanged signal is new
-Matrix4x4 made 5.3, but was revisioned for 5.4

Task-number: QTBUG-29806
Change-Id: I4cb8bca6ac6fe8040871734c88aabcd392c1d696
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
4 years agoAndroid: Fix crash in String.replace() in release builds v5.3.0-rc1
Eskil Abrahamsen Blomfeldt [Mon, 5 May 2014 13:01:10 +0000 (15:01 +0200)]
Android: Fix crash in String.replace() in release builds

When enabling optimizations in the compiler, it produces bogus
code for the regExp->value deref in the line

nMatchOffsets += regExp->value->captureCount() * 2

This is a random refactoring to work around the compiler bug.
The only line that actually needs to be touched is the one mentioned
above, but I replaced all uses of regExp->value so that it
wouldn't look too weird.

Task-number: QTBUG-38692
Change-Id: Ib33a523a86ce51ebc6c7095a803fedaebcaa8e63
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFix revision.
Gunnar Sletta [Sat, 3 May 2014 09:56:34 +0000 (11:56 +0200)]
Fix revision.

QQuickItem is at revision 2 for QtQuick 2.4.

Change-Id: Ic21d878489e8b002b6975a46453631562be3daf6
Reviewed-by: Michael Brasser <michael.brasser@live.com>
4 years agoqmlplugindump: Fix platform plugin specification.
Friedemann Kleint [Mon, 5 May 2014 10:40:03 +0000 (12:40 +0200)]
qmlplugindump: Fix platform plugin specification.

Fix warning:
Project WARNING: CONFIG+=qpa_minimal_plugin is deprecated. Use QTPLUGIN.platforms=qminimal instead.

Change-Id: I81f92f86bd699854253b4e3fb7d0ae6eeab4aafc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agofix copying of qmldir file to build dir
Oswald Buddenhagen [Fri, 2 May 2014 16:49:31 +0000 (18:49 +0200)]
fix copying of qmldir file to build dir

Task-number: QTBUG-36252
Change-Id: Icbd956daf707105a5616d057c11b9aa1f55ff5d2
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agoQQuickRenderControl: Fix compilation with MSVC compiler
Louai Al-Khanji [Mon, 5 May 2014 06:22:02 +0000 (09:22 +0300)]
QQuickRenderControl: Fix compilation with MSVC compiler

MSVC fails to parse the pointer correctly, thinking that the */* pattern
attempts to close a comment.

Change-Id: Iac26d7fe9cb6f8aaa855d86ef8d6c2b9f85d6840
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoCompress touch events in QQuickWindow.
Gunnar Sletta [Thu, 3 Apr 2014 11:16:42 +0000 (11:16 +0000)]
Compress touch events in QQuickWindow.

Instead of sending multiple touch updates per frame, we
store the last one and flush the pending events just before
we enter into the scene graph sync phase.

[ChangeLog][QtQuick] QQuickWindow will compresses touch events
and delivers at most one touch event per frame.

Done-with: Robin Burchell <robin.burchell@jollamobile.com>
Change-Id: Ia0169bc4a3f0da67709b91ca65c326934b55d372
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
4 years agoInvalidate text painting nodes when document text block is updated
Sarunas Valaskevicius [Sun, 9 Feb 2014 18:50:42 +0000 (18:50 +0000)]
Invalidate text painting nodes when document text block is updated

The commit fixes text repainting when only formatting of the text is
changed by invalidating the affected blocks which will be repainted
on the next update.

Task-number: QTBUG-36743
Change-Id: I03ba747f9d08a9f49d0a012b8349c89c20dc6b55
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
4 years agoStocQt demo improvement
Mika Salmela [Fri, 2 May 2014 11:14:55 +0000 (14:14 +0300)]
StocQt demo improvement

Along with general demo improvements, this task implements the new layout
to the StocQt demo. Also few bugs on the functionality are corrected, like
drawing the stock graph on right way and initial values reset on stock
model when changing active stock.

Task-number: QTBUG-38254
Change-Id: I9d3387ed0e3f23512b8e60c70246589c10237818
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
4 years agoAlways implement text input "canPaste" property
Bernd Weimer [Mon, 14 Apr 2014 07:50:41 +0000 (09:50 +0200)]
Always implement text input "canPaste" property

This is needed for TextField control for instance.
If QT_NO_CLIPBOARD is defined, canPaste will always return false.
Fixes dialogs auto test when QT_NO_CLIPBOARD is defined.

[ChangeLog][QtQuick][Platform Specific Changes] Added canPaste
property to TextInput element also on platforms that don't support
a clipboard (QT_NO_CLIPBOARD is defined).

Change-Id: Ia85205672ba59c1fce70852458c514b03d332de6
(cherry picked from commit c2d802049e48d1d6f0bce6eb0972fb26dc4d6ce3)
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
4 years agodoc: class QQuickCloseEvent added to module QtQuick
Martin Smith [Wed, 23 Apr 2014 11:12:29 +0000 (13:12 +0200)]
doc: class QQuickCloseEvent added to module QtQuick

The wrong qdoc command had been used to add it to the
QML module QtQuick.Window. This caused a link to the
QML module to be not found by qdoc. The correct command
and C++ module name are now used.

Task-number: QTBUG-38529
Change-Id: I810f179d8f70dc8fb4d359ac3d4b192ef63ca429
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
4 years agoAdd [ChangeLog] tags to qtdeclarative changelog.
Alan Alpert [Thu, 24 Apr 2014 04:04:52 +0000 (21:04 -0700)]
Add [ChangeLog] tags to qtdeclarative changelog.

Change-Id: Ia235b6b2397cfaeb20f0c7ea0d6196c603b2aaaa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agoOpt-in that QSGSimpleTextureNode can own the texture.
Gunnar Sletta [Thu, 1 May 2014 14:04:14 +0000 (16:04 +0200)]
Opt-in that QSGSimpleTextureNode can own the texture.

Having to subclass just to delete the texture is a bit

Change-Id: I26c7e0b5c053ba70e004949ead748e50756d9b39
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
4 years agoSay hello to QQuickItem::grabToImage().
Gunnar Sletta [Mon, 28 Apr 2014 11:30:04 +0000 (13:30 +0200)]
Say hello to QQuickItem::grabToImage().

[ChangeLog][QtQuick][Item] Added functions QQuickItem::grabToImage()
and Item::grabToImage() to allow grabbing of items into
system-memory images.

Change-Id: I76cd73bb62f7440569c6fce63d63528559845721
Reviewed-by: Michael Brasser <michael.brasser@live.com>
4 years agoMake sure we rebuild batches properly after a Blending material change.
Gunnar Sletta [Fri, 25 Apr 2014 14:21:00 +0000 (16:21 +0200)]
Make sure we rebuild batches properly after a Blending material change.

If a node sent DirtyGeometry and DirtyMaterial in the same round and
DirtyGeometry triggered its batch to be invalidated, we would take the
no-batch code path which did set the rebuild state to BuildBatches. This
looks ok on screen, but if the node changed from alpha to opaque, it
would not be put into an opaque batch. For things like full screen
rectangles, this can potentially hurt performance.

To prevent doing a full rebuild on any material change on batchless
items (aka all Rectangle nodes), we store the blend state of the material
in the element and do a full rebuild only when blend state changes.

Change-Id: Ifdf06fb72ef02ca47a135c821ddbcbe0d164ca29
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
4 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Thu, 1 May 2014 10:44:51 +0000 (12:44 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I996a85744753598bb48c7e0d7954049202f4f037

4 years agoUpdate tst_qquickapplication to support OS X ApplicationState handling
Samuel Gaist [Thu, 1 May 2014 07:21:05 +0000 (09:21 +0200)]
Update tst_qquickapplication to support OS X ApplicationState handling

This patch modifies tst_qquickapplication so that it tests correctly
against OS X's new ApplicationState handling

Task-number: QTBUG-10899
Change-Id: Iea20b0137daabe03fdddf98435dc2626e122741f
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
4 years agoQQuickStyledText: do not insert an extra blank line in the beginning
J-P Nurmi [Tue, 29 Apr 2014 12:56:47 +0000 (14:56 +0200)]
QQuickStyledText: do not insert an extra blank line in the beginning

Do not insert an extra line-separator when the document begins with
an element such as <p> or <h1> that causes an implicit line break.

Task-number: QTBUG-38531
Change-Id: Ib1da9df9a4a767cf11c63a4e2845f334cd69df69
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agov4: ignore quiet bit for NaNs in 32 bit value encoding
Fawzi Mohamed [Tue, 15 Apr 2014 22:42:40 +0000 (00:42 +0200)]
v4: ignore quiet bit for NaNs in 32 bit value encoding

on iOS x % 0 generates a NaN with the silent bit set, i.e.
0x7ffc_0000_0000_0000 which was interpreted as a null managed object
which crashed the interpreter.

Task-number: QTBUG-36859
Change-Id: Idf31ad9f0454f83d321b49b2f76bdbc2ee906189
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoDoc: Remove references to the unimplemented 'time' type
Sze Howe Koh [Fri, 25 Apr 2014 14:47:47 +0000 (22:47 +0800)]
Doc: Remove references to the unimplemented 'time' type

Task-number: QTBUG-32295
Change-Id: Iedd61d0494aeebd6d99a39f4eb81e7461c20a079
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
4 years agov4: assert when an unsupported double value is stored in a value
Fawzi Mohamed [Tue, 29 Apr 2014 10:13:08 +0000 (12:13 +0200)]
v4: assert when an unsupported double value is stored in a value

we assume that just few NaN values can be generated by the HW
(currently 0x7ff800..00 and 0x7ffc00..00), and we use the other values
to encode js values.
If uninitialized memory is interpreted as double or another NaN is
explicitly constructed and feed to the interpreter, it might crash
(later when actually accessing that value).
Adding an assertion to catch those values when assertions are active
for the 32 bit encoding (64 bit already has it).

Task-number: QTBUG-36859
Change-Id: I7ac7b2619f286ba19066729836af718014a515a6
Reviewed-by: Johannes Matokic <johannes.matokic@microchip.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoFix qmltest/animators/tst_on.qml
Bernd Weimer [Fri, 25 Apr 2014 16:16:25 +0000 (18:16 +0200)]
Fix qmltest/animators/tst_on.qml

Change-Id: Ief27b20de100cc7517edab03d752e8eb4299a538
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
4 years agoV4 regalloc: optimize fixed interval creation.
Erik Verbruggen [Tue, 15 Apr 2014 13:34:03 +0000 (15:34 +0200)]
V4 regalloc: optimize fixed interval creation.

Instead of creating ranges for all caller saved registers one at a time,
create a single template for all of them. Then change the template for
a (all) specific registers. So, instead of building the ranges every
time for all registers, do it once, and re-use the array. We currently
treat all registers as caller saved, so the ranges can actually be

Change-Id: I39111ba88be5c49bbab8fe4f2f8c5ad1c89ef282
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoV4 IR: more copy removal.
Erik Verbruggen [Tue, 15 Apr 2014 13:30:12 +0000 (15:30 +0200)]
V4 IR: more copy removal.

Change-Id: Ie86bf5902328ad105fb07eb3e2809db21ff024d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoMark material as dirty after changing color's opacity in Rectangle.
Gunnar Sletta [Fri, 25 Apr 2014 13:34:55 +0000 (15:34 +0200)]
Mark material as dirty after changing color's opacity in Rectangle.

Change-Id: I8037908bb2ba494001c516e2c7606c3bb54a14d8
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
4 years agoEliminate a static global QString in qquickpath.cpp
J-P Nurmi [Tue, 29 Apr 2014 09:50:37 +0000 (11:50 +0200)]
Eliminate a static global QString in qquickpath.cpp

Change-Id: Iad3838f1d215c02555be0acd5f313eaefd4f90a0
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agoV4 IR: replace QSets with QBitArray and QVector.
Erik Verbruggen [Tue, 15 Apr 2014 13:33:27 +0000 (15:33 +0200)]
V4 IR: replace QSets with QBitArray and QVector.

Change-Id: I565e0a22d4e94495eb427b85a59a62733a815527
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoAdd dependency check for quickwidgets
Zhang Xingtao [Tue, 29 Apr 2014 00:36:27 +0000 (08:36 +0800)]
Add dependency check for quickwidgets

If not, there will be an error when building with -no-opengl option:
"Project ERROR: Unknown module(s) in QT: quick-private"
The quickwidgets module depends on qt quick module, and qt quick
module depends on opengl.

Change-Id: If74b5582bdd96ed19ec10dbc534d02146717bc08
Reviewed-by: Liang Qi <liang.qi@digia.com>
4 years agoEnsure RGB32 images are not converted on upload to atlas.
Michael Brasser [Wed, 23 Apr 2014 02:10:58 +0000 (21:10 -0500)]
Ensure RGB32 images are not converted on upload to atlas.

Fixes "Typo No.12" reported at http://www.viva64.com/en/b/0251/

Change-Id: Ifa4d57df68b9515c76a8fb94f87d0a70ba3b5faf
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
4 years agoFix linking of qmlimportscanner in MSVC debug builds.
Friedemann Kleint [Mon, 28 Apr 2014 11:41:34 +0000 (13:41 +0200)]
Fix linking of qmlimportscanner in MSVC debug builds.

Qt5QmlDevToolsd.lib(qqmlirbuilder.obj) : error LNK2019: unresolved external symbol "__declspec(dllimport) public: __cdecl QmlIR::CompiledFunctionOrExpression::CompiledFunctionOrExpression(void)"

Use Q_QML_PRIVATE_EXPORT so that it does not have effect when building

Change-Id: I138fe9cba518829d7ec1d0bfe9d4a9d657446c7d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFix translations in states causing failing assertions
Simon Hausmann [Sat, 26 Apr 2014 12:42:39 +0000 (14:42 +0200)]
Fix translations in states causing failing assertions

This is a smaller fix suitable for the release branch, merely adding support
for translations to the bytearray compilation step for states and ensuring a
consistent error message when qsTr is used in list models.

The proper fix will be done in dev that eliminates the entire intermediate
QByteArray storage for custom compilers.

Task-number: QTBUG-38492
Change-Id: If5171f16eb742c718e48b8bbcb265b0c241cd5e7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoFix packaging builds
Simon Hausmann [Mon, 28 Apr 2014 08:08:36 +0000 (10:08 +0200)]
Fix packaging builds

In order to access the js parser in release builds, we need to export
these symbols (althoug they remain private API).

Change-Id: Id534bfc8027f9a6feab53b09e7397d920e59e3f8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoFix marking of prototype objects in internal class pool
Simon Hausmann [Wed, 16 Apr 2014 07:36:38 +0000 (09:36 +0200)]
Fix marking of prototype objects in internal class pool

As per reported bug, we have to protect ourselves against potential loops
and can mark the internal classes much simpler by just walking through
the memory pool they were allocated in.

Task-number: QTBUG-38299
Change-Id: I3ae96e8082e76d06f4321c5aa6d2e9645d2830a0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoFollow QOpenGLContext API renaming
Laszlo Agocs [Thu, 24 Apr 2014 15:14:41 +0000 (17:14 +0200)]
Follow QOpenGLContext API renaming

Task-number: QTBUG-38564
Change-Id: Ice1170339f7d650fcb6accfccf325471629343d6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
4 years agoDon't forcibly accept touch events if mouse event synthesis is disabled
Giuseppe D'Angelo [Thu, 24 Apr 2014 14:46:28 +0000 (16:46 +0200)]
Don't forcibly accept touch events if mouse event synthesis is disabled

Instead of always accepting touch events, do that only if we are
generating mouse events for non accepted ones. This enables
QQuickWindow subclasses to detect if a touch event was indeed
handled by QQuickWindow.

Change-Id: I73512fb3597131c2296d6cdc7b3d5c8454b159b6
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
4 years agoRemove unneeded ;
Albert Astals Cid [Thu, 24 Apr 2014 14:15:45 +0000 (16:15 +0200)]
Remove unneeded ;

Warnings returned by pedantic

Change-Id: Ic2caba475db9064bf302790299d92a217436d0ee
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoSkip qquicktimeline auto test
Bernd Weimer [Wed, 23 Apr 2014 13:47:10 +0000 (15:47 +0200)]
Skip qquicktimeline auto test

On platforms where casting qreal value infinity to int yields a
positive value the test will fail. Test will be skipped on those

Change-Id: I9f373a9598ffd72e857c96edce3df216070326c9
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
4 years agoGetting the render window of an offscreen window
Paul Olav Tvete [Wed, 23 Apr 2014 07:58:32 +0000 (09:58 +0200)]
Getting the render window of an offscreen window

When using a QQuickWidget, the QQuickWindow is hidden and the contents
are displayed in another window. Some components need to query the actual
window, e.g. when positioning a popup.

Task-number: QTBUG-38116
Change-Id: I34452be2179ccc9e216e4d89264dc700e0cf42a0
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
4 years agoV4 regalloc: fix register spill choice under high pressure.
Erik Verbruggen [Wed, 23 Apr 2014 13:13:56 +0000 (15:13 +0200)]
V4 regalloc: fix register spill choice under high pressure.

When a register is needed for an input parameter of an operation, and
all registers are already in use, do not select a register for spilling
when it is also used in the current operation.

Task-number: QTBUG-38451
Change-Id: I4a8f28cbaadce2dbb9d0c450ccac0ed572936c24
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>