platform/upstream/qtdeclarative.git
10 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Frederik Gladhorn [Wed, 12 Feb 2014 15:43:10 +0000 (16:43 +0100)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

10 years agoFix wrong calculation of viewPort for transitions
Florian Hänel [Wed, 5 Jun 2013 17:23:32 +0000 (19:23 +0200)]
Fix wrong calculation of viewPort for transitions

Viewport is calculated wrong for horizontal layout in a second instance

Task-number: QTBUG-29944
Task-Number: QTBUG-31546
Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Florian Hänel <florian.haenel@basyskom.com>
10 years agoDoc: Added information about classname in qmldir
Venu [Wed, 29 Jan 2014 11:46:05 +0000 (12:46 +0100)]
Doc: Added information about classname in qmldir

QML modules that depend on C++ plugins must provide
the plugin class name information in their qmldir
to support statically built Qt Quick applications.

Task-number: QTBUG-35369
Change-Id: I15432fec4f8a72be4f851da061ac0c091696d8c9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
10 years agoExpose Qt Quick gradient conversion code privately.
Mitch Curtis [Fri, 7 Feb 2014 11:45:15 +0000 (12:45 +0100)]
Expose Qt Quick gradient conversion code privately.

Rectangle is currently the only item that supports gradients, but other
items have been introduced (within Qt Quick Enterprise Controls) which
need QQuickGradient => QLinearGradient conversion, and it doesn't make
sense to duplicate the gradient stop conversion code.

The QQuickGradient and QQuickGradientStop classes need to be privately
exported so that modules that use private Qt API can use the classes
with quick-private.

Change-Id: I8b130ff5384d9481d3f29510b3de61f7d8f775e2
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
10 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Tue, 11 Feb 2014 08:17:22 +0000 (09:17 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I5ac68cc3ad3926190817f0d3d5b4526e70badff6

10 years agoWarn when attaching Keys to an invalid item
Frederik Gladhorn [Wed, 29 Jan 2014 16:23:23 +0000 (17:23 +0100)]
Warn when attaching Keys to an invalid item

Using Window { Keys.onPressed: ... } does not work because window is not
a QQuickItem. Warn at least.

Change-Id: Ibd472f7b551ff2089cbc39ba43da27e6f8e0e97f
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
10 years agoFix memory leak in test
Frederik Gladhorn [Mon, 10 Feb 2014 09:59:17 +0000 (10:59 +0100)]
Fix memory leak in test

Change-Id: I026ce85a6e593d5eccecdf032ee2f0763a2bef87
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
10 years agoFix origin for short reversed item views
John Brooks [Sun, 9 Feb 2014 09:34:25 +0000 (02:34 -0700)]
Fix origin for short reversed item views

Reversed (BottomToTop and RightToLeft) item views would report an
impossible positive value for origin when contentHeight < height. The
correct value will be effectively equivalent to the position of the
footer, and always negative.

Match other logic using lastPosition() by negating its value for
reversed views.

This fixes a bug with content disappearing in a Controls ScrollView on
a BottomToTop view.

Change-Id: Ieedbb64ce8fc7c0fb36e5256e437ddeb3e757761
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
10 years agoDoc: note about visible and enabled in PropertyChanges
Frederik Gladhorn [Tue, 21 Jan 2014 15:05:27 +0000 (16:05 +0100)]
Doc: note about visible and enabled in PropertyChanges

Change-Id: I0928737f1651fa98213a84dc4f8b5225d5239502
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
10 years agoFix exception thrown in slot without Qml Engine
Simon Hausmann [Fri, 7 Feb 2014 11:23:17 +0000 (12:23 +0100)]
Fix exception thrown in slot without Qml Engine

Don't crash when an exception is thrown in a JS slot but we don't have
a Qml engine.

Change-Id: I1530d5c1c8cb9b9b33b9fdd0d45639fd4a0516f7
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoUpdated documentation for QML Locale.measurementSystem
Anders Gunnarsson [Tue, 12 Nov 2013 13:58:44 +0000 (14:58 +0100)]
Updated documentation for QML Locale.measurementSystem

Added documentation for ImperialUSSystem and ImperialUKSystem.

Change-Id: I1a628121dce4a7566bd8769843c487e28f3dd6fe
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
10 years agoFix scenegraph backend API for material shaders.
Michael Brasser [Wed, 5 Feb 2014 21:55:23 +0000 (15:55 -0600)]
Fix scenegraph backend API for material shaders.

Without this change, it is not possible to implement a custom renderer
(it has no way to compile or initialize material shaders).

Change-Id: Ie8778f739f3551f88f0d44ccb9769063a87ff276
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
10 years agoDoc: Merge duplicated example directories
Sze Howe Koh [Thu, 6 Feb 2014 14:09:03 +0000 (22:09 +0800)]
Doc: Merge duplicated example directories

examples/quick/customitems contains all the examples found in
examples/quick/ui-components, plus 2 more (maskedmousearea and
painteditem). There are some very minor differences between the
duplicated files, regarding the "smooth" property. Apart from that, the
examples are identical.

The only file that is unique to examples/quick/ui-components is
example-slideswitch.qdoc. Moving it does not change the generated HTML
filename. The other examples do not produce any documentation.

Change-Id: I507d9064a60fd1f3a1469c1e423d4c0a72c7dc41
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
10 years agoAvoid renderlist rebuilds in the scene graph renderer.
Gunnar Sletta [Tue, 28 Jan 2014 19:53:01 +0000 (20:53 +0100)]
Avoid renderlist rebuilds in the scene graph renderer.

Transform, material, opacity and geometry changes all used to trigger
full rebuilds, which meant that very little geometry could be retained
between frames. For instance, a rotating spinner on top of a gridview
this would cause a full rebuild where nothing is retained.

This change introduces new concept to the renderer: partial rebuilding
based on render order ranges. Since the render order of nodes is
strictly defined by their position in the tree and nothing else, we
should use that for the majority of rebuilds. When a change comes in
for a node, we invalidate its batch and all batches which it has
overlapping render orders with.

Render order rebuilds only happen when nodes are added and removed.

Change-Id: Ib4cb284164892b409e3fff5c492a54d60a5de2d7
Reviewed-by: Michael Brasser <michael.brasser@live.com>
10 years agoFix alignment exception in newCallContext on ARM
Samuli Piippo [Thu, 6 Feb 2014 08:42:00 +0000 (10:42 +0200)]
Fix alignment exception in newCallContext on ARM

CallContext::locals was not at multiple of 8, which caused
an alignment exception on ARM. Size for the context is
also increased.

Change-Id: I136418f89945cd3fec74463659107c6dab7cad0a
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoImprove Scene Graph - Simple Material example documentation.
Mitch Curtis [Thu, 6 Feb 2014 09:20:36 +0000 (10:20 +0100)]
Improve Scene Graph - Simple Material example documentation.

Change-Id: I5b77f7590c9f2cea9305014b8a9d4ab3a387eaa3
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
10 years ago[Regression] Fix lazy binding evaluation
Simon Hausmann [Tue, 28 Jan 2014 13:04:58 +0000 (14:04 +0100)]
[Regression] Fix lazy binding evaluation

Commit 04774bb14c81688f86a2b31b8624bde8ebf59062 long time ago introduced the
concept of fixed order binding initialization with lazy evaluation, where a bit
is reserved for each binding that indicates whether it's been initialized the
first time or not. When reading a property on a QObject, we'd check if the
corresponding binding for the property has been initialized or not and flush
(i.e. execute) the binding if necessary.

As part of the V4/V8 clean-up, commit 1eb41200948ab414f1c47d93123b41c547a993df
removed the StoreV8Binding instruction, which made the call for setting the
this-binding-is-not-evaluated-yet bit. Nowadays we only use StoreBinding, for
which this optimization was never implemented (and not needed really). Now that
we have a unified JS code path, we need to set the pending binding bit and also
make sure that we call flushPendingBinding for any JS side property access
(accelerated or not).

Also flushPendingBindingImpl had two bugs:

   * In an attempt of trying to find the binding to flush, it could happen that
     we'd try to flush a previously destroyed binding (m_mePtr is null), so
     the b variable would remain the first binding in the object and we'd flush
     the wrong one (instead of none). Added a missing check to verify that the
     property index matches.
   * Also resetting the mePtr must be done through clear(), to ensure that the
     pointer in bindValues in the VME is also cleared, to avoid re-enabling the
     same binding again in complete();

Task-number: QTBUG-36441

Change-Id: Icdb0c8fb036051fd5d6c4d33b10cd0c0ed9a9d5c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoAvoid out-of-bound accesses in Qt Quick example code
hjk [Tue, 4 Feb 2014 13:02:16 +0000 (14:02 +0100)]
Avoid out-of-bound accesses in Qt Quick example code

Task-number: QTBUG-36197

Change-Id: I5545c36a1ce9ea6c2451c92e0e79f65e5ab26c68
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
10 years agoFix backend API, broken since 5.2.0
Gunnar Sletta [Thu, 30 Jan 2014 18:18:16 +0000 (19:18 +0100)]
Fix backend API, broken since 5.2.0

Without this change, it is not possible to implement a custom context
without also implementing a renderloop.

Change-Id: Iac2aa732251cdf7221b28f665394cdd336a3d846
Reviewed-by: Michael Brasser <michael.brasser@live.com>
10 years agoRevert "Skip unstable test"
Liang Qi [Mon, 27 Jan 2014 13:51:56 +0000 (14:51 +0100)]
Revert "Skip unstable test"

This reverts commit 8e0c5b59f57b51a0dc80d3d8274202776c6e03df.

This test doesn't fail any more.

Task-number: QTBUG-23976
Change-Id: I77704e7811c4c335cb5836ba7645a8804c13e12d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
10 years agoV4 regalloc: fix interval splitting when register pressure is high.
Erik Verbruggen [Thu, 30 Jan 2014 12:48:31 +0000 (13:48 +0100)]
V4 regalloc: fix interval splitting when register pressure is high.

When a register is needed for an interval, but none is available, one
of the used registers will be chosen and spilled to the stack (meaning
it will be split) before the current position. However, if a register
is used at the current position for an incoming parameter, its interval
has to be split after the current position. This patch adds/fixes the
latter case.

This fixes crypto.js on x86. The specific problem there was that the
result of an operation needed a register, and chose the one from one
of the incoming parameters (which then should get spilled/split).
However, this interval was already split, and started exactly at that
the current position. So splitting before the current position did
nothing, resulting in it staying alive and using the same register as
the result. So any subsequent use of would have the invalid value.

Task-number: QTBUG-36430
Change-Id: I228fc210b009aa0b16b08a374fc955fabfbb6d12
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoV4: fix range sorting
Erik Verbruggen [Thu, 30 Jan 2014 12:15:52 +0000 (13:15 +0100)]
V4: fix range sorting

When a life-time interval is split from another interval, it has to come
before an interval that starts at the same position but is not split.

This also means that a means that the all ranges in a split interval
are uses, which is important for allocation: all incoming parameters for
an operation need to be allocated before allocating a register for the
result as the result will only start its life "at the end" of the
operation.

This patch fixes a problem register allocation is done in a function
where register pressure is high (e.g. on platforms that have few
registers to start with). Specifically, crypto.js on x86 triggered it.

Change-Id: Iee3e5d82a887b8de573dfc23513844143d0c8073
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoV4 JIT: save/restore ebx (GOT ptr) on linux/x86.
Erik Verbruggen [Mon, 27 Jan 2014 12:00:20 +0000 (13:00 +0100)]
V4 JIT: save/restore ebx (GOT ptr) on linux/x86.

On linux/x86, ebx is used to store the global offset table. When using
this register for temporary values, we have to save it at the entry of
a generated function, and restore it before doing calls and at the end.

Task-number: QTBUG-36289
Change-Id: I30194be3ce44f58b793ee52f6201906bcb68d46a
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix crash in header when regenerating view.
Michael Brasser [Tue, 28 Jan 2014 14:59:59 +0000 (08:59 -0600)]
Fix crash in header when regenerating view.

Unregister for geometry changes before reparenting, as
reparenting may trigger those changes.

Task-number: QTBUG-36481
Change-Id: Ia94f1f88880b232dd583b7e63e5da73fb338f7c6
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
10 years agoRemove static initialization of QObjects
Eskil Abrahamsen Blomfeldt [Wed, 29 Jan 2014 14:11:14 +0000 (15:11 +0100)]
Remove static initialization of QObjects

Statically initializing QObjects will cause e.g. the main
thread pointer in QCoreApplication to be set when the library
is loading. On Android, this is never the real main thread.
The effect was a warning about QApplication not being initialized
on main thread, and a race condition which sometimes caused
apps to hang on startup.

[ChangeLog][Android] Fixed possible hang on startup for Qt Quick
applications.

Task-number: QTBUG-36426
Change-Id: I7bd8a8f35ef1a2548949978563e3157f8dc854c7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoV4: remove unused field.
Erik Verbruggen [Mon, 27 Jan 2014 14:09:12 +0000 (15:09 +0100)]
V4: remove unused field.

Change-Id: Id1edc073db349cfc7e4b5a9dca045760016ebacf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
10 years agoDocs: add a working example to Text::fontSizeMode docs
J-P Nurmi [Fri, 17 Jan 2014 12:41:27 +0000 (13:41 +0100)]
Docs: add a working example to Text::fontSizeMode docs

It's easy to miss the maximum bound specified by either
the font.pointSize or font.pixelSize properties.

Task-number: QTBUG-30005
Change-Id: If1dadebd6673f0e945a1ca95b64521f27d30f5a9
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
10 years agoFix leak-on-exit of QSGRenderLoop::s_instance
Alex Montgomery [Wed, 18 Dec 2013 23:25:36 +0000 (15:25 -0800)]
Fix leak-on-exit of QSGRenderLoop::s_instance

s_instance is created with new and never deleted which causes several
destructors to never be called.

Task-number: QTBUG-35731
Change-Id: Icccb19186958f8bb74c5fd2b4b41165255debc46
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
10 years agoV4: Array.push() on QStringList should invoke putIndexed()
Alberto Mardegan [Tue, 28 Jan 2014 12:03:44 +0000 (14:03 +0200)]
V4: Array.push() on QStringList should invoke putIndexed()

Wrapped sequence types should cause putIndexed() method to be called
when Array.push() is used.
Fix suggested by Simon Hausmann.

[ChangeLog][QtQml] Fix JavaScript Array.push() not working on
QStringList properties.

Task-number: QTBUG-36491
Change-Id: Id04409dd7466a943d8ea8d57cd0514e8de732480
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoRevert "Disable quick autotests on mac until qtbase is fixed"
J-P Nurmi [Sat, 25 Jan 2014 17:51:48 +0000 (19:51 +0200)]
Revert "Disable quick autotests on mac until qtbase is fixed"

This reverts commit 08582091059d8ba805487eae5277bc9abdc3d4de.

Task-number: QTBUG-35344

Conflicts:
tests/auto/auto.pro

Change-Id: I9babc27c4c37900dd6603bd603e6bcf9e7f3d61f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
10 years agoRevert "Disable gui tests on Mac for now"
J-P Nurmi [Sat, 25 Jan 2014 17:41:37 +0000 (19:41 +0200)]
Revert "Disable gui tests on Mac for now"

This reverts commit 8ed38c70fd29680f7981d9d23581d46cf32139d0.

Task-number: QTBUG-35344

Conflicts:
tests/auto/auto.pro
tests/auto/qml/debugger/debugger.pro

Change-Id: I57bec5d7ede879e24ba2b0618333b4e4110c41df
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
10 years agoFlickable: fix crash in delayed press handling
J-P Nurmi [Wed, 22 Jan 2014 16:33:26 +0000 (18:33 +0200)]
Flickable: fix crash in delayed press handling

Task-number: QTBUG-31328
Change-Id: Ic87e9b4db09242b49f104a8f38e4e420c62db75c
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
10 years agoPositioners: fix layout mirroring
J-P Nurmi [Tue, 21 Jan 2014 21:40:50 +0000 (23:40 +0200)]
Positioners: fix layout mirroring

Listen to positioner geometry changes when the _effective_ layout
direction is RTL.

Task-number: QTBUG-35095
Change-Id: If06955c6bb04e5bed2126b05489229278c192173
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
10 years agoMark tst_qquickanimations as insignificant on MinGW
J-P Nurmi [Sat, 25 Jan 2014 14:35:18 +0000 (16:35 +0200)]
Mark tst_qquickanimations as insignificant on MinGW

tst_qquickanimations::pathInterpolatorBackwardJump() keeps constantly
failing in the CI on Windows MinGW builds.

Task-number: QTBUG-29062
Change-Id: I69511f8a45e98061ceb9a0f6782cc57940af3ce4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix tst_qquickflickable::stopAtBounds()
J-P Nurmi [Thu, 23 Jan 2014 22:08:48 +0000 (00:08 +0200)]
Fix tst_qquickflickable::stopAtBounds()

Change-Id: I7a6cc8ddb4cb4559498b74839bde57d12a3d68fd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoRevert "Re-enable mac tests"
J-P Nurmi [Thu, 23 Jan 2014 09:54:01 +0000 (11:54 +0200)]
Revert "Re-enable mac tests"

This reverts commit cc811f77fc4f48fb696784f0a51042bb736d7071.

GUI tests were temporarily disabled on Mac in 8ed38c7 and cc811f7 meant
to re-enable them, but in fact removed the GUI tests on every platform.
There is still plenty of instability in the tests, so we will first
restore GUI tests on non-Mac platforms, and then we'll try to properly
re-enable them on Mac, step by step.

Change-Id: Ic8ac32386cc9e7c5ea3172751d74138e30fa0fdf
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoFix QNX 6.6 build
Frank Osterfeld [Wed, 22 Jan 2014 11:14:51 +0000 (12:14 +0100)]
Fix QNX 6.6 build

The stdlib of the upcoming QNX 6.6 has this abs overload,
so check for the version when redefining it.

Change-Id: Ib5650226c65417b42d8d7a79fac7ca53d3f315f1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
10 years agoDont define CAN_BACKTRACE_EXECINFO when building on uClibc
Jorgen Lind [Thu, 23 Jan 2014 11:22:43 +0000 (12:22 +0100)]
Dont define CAN_BACKTRACE_EXECINFO when building on uClibc

Change-Id: I06314f0a3a7cf86e5e627c307a522069cf640f78
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
10 years agoDon't write into the callers stack frame
Lars Knoll [Fri, 24 Jan 2014 09:01:55 +0000 (10:01 +0100)]
Don't write into the callers stack frame

Never usee addressForArgument when arguments are passed
in registers, as it points into the callers stack frame.

The address was used as a temporary location when encoding
a unsigned return value. The code has now been rewritten to
only use registers instead.

Change-Id: Id85b668a5a74dbd6c41621a9672e53a1cb5f242b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Simon Hausmann [Fri, 24 Jan 2014 09:21:32 +0000 (10:21 +0100)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

10 years agoV4: fix life-time hole check.
Erik Verbruggen [Fri, 17 Jan 2014 15:13:08 +0000 (16:13 +0100)]
V4: fix life-time hole check.

This check was incorrect when a jump happened from before (or after) the
life-time interval into a life-time hole.

Change-Id: Idacf304a96d39f372249a48e18b00891531d9859
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoMerge remote-tracking branch 'origin/release' into stable
Simon Hausmann [Fri, 24 Jan 2014 09:20:48 +0000 (10:20 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I4b0f2d63aff78b50656a519c088afc4a076747f7

10 years agoFix compile error with clang 3.4
Lars Knoll [Wed, 22 Jan 2014 11:38:31 +0000 (12:38 +0100)]
Fix compile error with clang 3.4

Change-Id: Iaf43f0527142bb5615e8c97bb1a80faf7b8b2e00
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix warning about comparing double to boolean in js_equal().
Friedemann Kleint [Thu, 23 Jan 2014 09:22:10 +0000 (10:22 +0100)]
Fix warning about comparing double to boolean in  js_equal().

jsapi\qjsvalue.cpp(749) : warning C4805: '==' : unsafe mix of type 'double' and type 'bool' in operation

Change-Id: I06d0950ce932ea635c422d3fb42ca80e6725dda1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoQmlplugindump error messages are not written consistently
Daniel Pesch [Wed, 22 Jan 2014 18:19:54 +0000 (19:19 +0100)]
Qmlplugindump error messages are not written consistently

For errors in command line parameters qmplugindump uses cerr
but errors during plugin loading are logged using qWarning().
It would be better to log always to cerr in case of problem
because some platforms (BB10) have logging from Qt redirected.

Task-number: QTBUG-36378
Change-Id: I04506c2f12b87190966e66c482f4ac5aed44af05
Signed-off-by: Daniel Pesch <dpesch@blackberry.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
10 years agoUpdate changelog for 5.2.1
Thiago Macieira [Wed, 22 Jan 2014 21:02:33 +0000 (13:02 -0800)]
Update changelog for 5.2.1

Change-Id: I6e8d2dbf129092c53331c639a767ca4955212f77
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoV4: remove more superfluous spills.
Erik Verbruggen [Wed, 22 Jan 2014 12:02:09 +0000 (13:02 +0100)]
V4: remove more superfluous spills.

Spills for targets of phi-nodes are already inserted by the renumbering,
so they don't need to be added (again) while resolving edges.

This fixes a problem with crypto.js.

Change-Id: I4b1d79fc92236b4a6b0b6d6d30ada17c8581a093
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoQQuickText: fix layout mirroring
J-P Nurmi [Tue, 21 Jan 2014 12:22:10 +0000 (14:22 +0200)]
QQuickText: fix layout mirroring

Task-number: QTBUG-35095
Change-Id: I8550821e01ecc931788c1ed73366ba1ceed7a817
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
10 years agoOnly look at alpha to decide if rectangle has fill or not.
Gunnar Sletta [Wed, 22 Jan 2014 14:32:56 +0000 (15:32 +0100)]
Only look at alpha to decide if rectangle has fill or not.

Task-number: QTBUG-35606
Change-Id: Id403047e19e75d91ec3b3f8367166d8ec96ecaf8
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
10 years agoEnforce texture cleanup to happen at the end of the sync phase.
Gunnar Sletta [Wed, 22 Jan 2014 09:26:14 +0000 (10:26 +0100)]
Enforce texture cleanup to happen at the end of the sync phase.

This was ok for the threaded renderer, but for the single-threaded
renderers where the event loop was spinning we could run the risk
of scheduling a texture for deleteLater() and then cleaning it
up before we got around to the sync phase.

Task-number: QTBUG-35670
Change-Id: I92074294b427fd8ab2a1823ba79c7ac3b59094ec
Reviewed-by: Michael Brasser <michael.brasser@live.com>
10 years agoRevert QSGRenderNode to the old "in context" behavior
Gunnar Sletta [Tue, 21 Jan 2014 14:57:19 +0000 (15:57 +0100)]
Revert QSGRenderNode to the old "in context" behavior

There is already a lot of code out there that makes use
of the rendernode hook and some of it is not capable
of dealing with the render target being something other
than 0. (Mozilla in this case).

By forcing everything into the "alpha" code path, the
hit on the renderer should be fairly minimal as long as
render nodes are kept to a minimum, so reverting back
to the ugly old behavior is acceptable.

The API is still internal and highly discouraged.

Change-Id: Ie35484f52da6b0420257c95710fdda07a2be2c23
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
10 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Frederik Gladhorn [Wed, 22 Jan 2014 10:37:26 +0000 (11:37 +0100)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

10 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Wed, 22 Jan 2014 10:36:29 +0000 (11:36 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I2d9356cfb33f36f0b9167307b0c4fc6b71bb347a

10 years agoMake it possible to render without a depth buffer.
Gunnar Sletta [Tue, 21 Jan 2014 12:28:53 +0000 (13:28 +0100)]
Make it possible to render without a depth buffer.

Some GL implementations (especially on embedded) will give us an
OpenGL context without a depth buffer. In low memory scenarios, it
might also be feasible to request a non-depth buffer context to save
the depth buffer memory. The renderer deals with this by treating all
nodes as translucent, by not adjusting the shaders and by not creating
the extra z-order vertex attribute for merged nodes.

Change-Id: I8edc92d530daa3e2628df2ba52901b47d87eaf26
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
10 years agoEnsure Flickable bounds detection is executed at the end of animation.
Martin Jones [Tue, 21 Jan 2014 06:12:48 +0000 (16:12 +1000)]
Ensure Flickable bounds detection is executed at the end of animation.

In pixelAligned mode the content position when animating is rounded to
a whole pixel, so the contentItem may reach the bound before the
animation completes.

Ensure bounds detection is run on animation completion.

Task-number: QTBUG-36300
Change-Id: I083ff6a03a5d1b9ca9e2201487b602f1588002be
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Joona Petrell <joona.petrell@jollamobile.com>
10 years agoParse source location for signal handling functions
Ulf Hermann [Mon, 16 Dec 2013 14:30:22 +0000 (15:30 +0100)]
Parse source location for signal handling functions

Previously the source location of signal handlers was always line 0 and
column 0. This poses problems when trying to extract meaningful
profiling information. The change assigns the source location of the
statement declaring the function as the function's source location.

Task-number: QTCREATORBUG-11100
Change-Id: I4bb8682b35147a7cfe4ecec342d4a00623bb1e0d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoRetrieve detailed location information when profiling signal handlers
Ulf Hermann [Mon, 16 Dec 2013 15:19:56 +0000 (16:19 +0100)]
Retrieve detailed location information when profiling signal handlers

Use the Functions associated with signal handlers to find out
which exact code is being executed.

Task-number: QTCREATORBUG-11100
Change-Id: Idfae9d188b17977b55f551e6fe766042fe24e786
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoMake compile on DragonFly BSD.
Alex Blasche [Tue, 21 Jan 2014 09:55:18 +0000 (10:55 +0100)]
Make compile on DragonFly BSD.

[ChangeLog][Platform Specific Changes][BSD] Fixed compile errors on
DragonFly BSD and potentially FreeBSD.

Task-number: QTBUG-35867
Change-Id: Iea90b93672c34f8a4b56e9afc4dbfb82cc993548
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoqmplugindump is not able to dump all registered components
Daniel Pesch [Mon, 20 Jan 2014 17:37:32 +0000 (18:37 +0100)]
qmplugindump is not able to dump all registered components

This patch implements a new function QQmlMetaType::qmlAllTypes() used
by qmlplugindump that returns list of all registered components. Previous
implementation used QQmlMetaType::qmlATypes() call that returned only
components with defined QML name.

Task-number: QTBUG-36199
Change-Id: I85acba61cfa511973a004934cf0650f38cc46ed9
Signed-off-by: Daniel Pesch <dpesch@blackberry.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
10 years agoqmlplugindump: New component properties isCreatable and isSingleton
Daniel Pesch [Mon, 20 Jan 2014 15:40:30 +0000 (16:40 +0100)]
qmlplugindump: New component properties isCreatable and isSingleton

Qmlplugindump tool does not generate information about singleton status
and creatability from QML for a component. This patch adds two new boolean
properties that contain this information. It is used by Momentics IDE for
providing better code validation and could be used by QtCreator in future
in similar way.

Task-number: QTBUG-36139
Change-Id: If85374a1854aaa0727670b27df735d481cab5337
Signed-off-by: Daniel Pesch <dpesch@blackberry.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
10 years agoAdd support for deprecated RegExp (constructor) properties
Simon Hausmann [Mon, 20 Jan 2014 13:32:26 +0000 (14:32 +0100)]
Add support for deprecated RegExp (constructor) properties

These were apparently part of ancient EcmaScript specs, aren't even listed
anymore in any recent spec (not even as deprecated), but apparently they
are part of what the web supports as well as previous versions of Qml. So
this patch implements them.

Task-number: QTBUG-36244

Change-Id: I1b9ea7ea09fceb6a486f615837a71e41aae12de4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoRemove redundant button clicked handler in QQuickMessageBox
Berthold Krevert [Thu, 16 Jan 2014 18:13:16 +0000 (19:13 +0100)]
Remove redundant button clicked handler in QQuickMessageBox

Change c286b4fccb2d83fcc01b21913b95c5e4f21f2982 added the
QQuickAbstractMessageDialog::click() handler, which made the
QQuickMessageDialog::clicked() handler redundant.

Change-Id: Ifd770a3c67b35fd9a4929fc55b9e5298c36fb960
Task-number: QTBUG-35933
Reviewed-by: Liang Qi <liang.qi@digia.com>
10 years agoQQmlEngine - fix example in documentation
Kimmo Leppälä [Tue, 3 Sep 2013 06:59:34 +0000 (09:59 +0300)]
QQmlEngine - fix example in documentation

example_qjsvalue_singletontype_provider example code snippet
returns QJSValue instead of QJSValue*.

Change-Id: If4d5592fcee25ada9870602c8f92197980ef9b77
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
10 years agoFix uninitialized variable in debug builds
Simon Hausmann [Fri, 17 Jan 2014 15:09:25 +0000 (16:09 +0100)]
Fix uninitialized variable in debug builds

Initialize size to zero in both constructors. This should fix UMRs.

Change-Id: I6888f667b3dc6b2e72e58b54288c3c88df3ced71
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
10 years agoWork around missing BGRA texture format on Samsung Galaxy Tab 3
Eskil Abrahamsen Blomfeldt [Mon, 13 Jan 2014 10:56:59 +0000 (11:56 +0100)]
Work around missing BGRA texture format on Samsung Galaxy Tab 3

The GL driver on the Galaxy Tab 3 reports support for the BGRA8888
texture format, but does not actually support it. For this particular
device we disable support for that format.

Task-number: QTBUG-34984
Change-Id: Ie26ef0e815c1622b3425c37237a3fc320543b92c
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
10 years agoV4: fix range splitting when split is between intervals.
Erik Verbruggen [Fri, 17 Jan 2014 10:45:37 +0000 (11:45 +0100)]
V4: fix range splitting when split is between intervals.

Also added some "white-box" unit tests and sprinkled in a bit of
documentation. The case that went wrong is covered by the test
rangeSplitting_1: before the fix, the new interval would have
two ranges: [66-64],[70-71]. The first range is invalid and should not
be there at all.

Change-Id: If0742f4e6a96d98ea5d696f95126886ba66f92bb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoQQmlInstructionData: fix warning 'code' {is,might be} used uninit'ed
Marc Mutz [Wed, 4 Dec 2013 14:34:07 +0000 (15:34 +0100)]
QQmlInstructionData: fix warning 'code' {is,might be} used uninit'ed

This is a compile-error for -release -developer-build builds.

Change-Id: I7ea5363260ce35a013fbf6d1c538c763023a8dc0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoImprove Mac OS X touch event enabling.
Morten Johan Sørvig [Wed, 8 Jan 2014 10:20:19 +0000 (11:20 +0100)]
Improve Mac OS X touch event enabling.

Previously, the Qt Quick touch interaction items would
enable touch events on window change. On app startup
this would typically happen before the platform window
was created, and the call to registerTouchWindow would
then create the platform window.

registerTouchWindow in QtBase has now been changed
to not create the platform window since this has
unwanted side effects. Calling it at window change
time will then have no effect for the initial window
change.

Enable and disable touch events on hoverEnter/Leave
instead. This is similar to what QtWidgets does and
has an additional benefit: touch events can now be
enabled when the mouse cursor is hovering over a touch
item, reducing the chances of it interfering with
scroll events for other items.

Task-number: QTBUG-32988
Change-Id: Ic48dbec910f52299d5068f5ca7508be73cdc6f36
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
10 years agoMerge remote-tracking branch 'origin/release' into stable
Simon Hausmann [Thu, 16 Jan 2014 20:52:48 +0000 (21:52 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Id18709cb0a4d85ffdadffa28aef98323367292d4

10 years agoBump MODULE_VERSION to 5.2.2
Sergio Ahumada [Wed, 15 Jan 2014 21:58:28 +0000 (22:58 +0100)]
Bump MODULE_VERSION to 5.2.2

Change-Id: Id20a6043ba142c14cd2b1062181a399e93782179
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
10 years agoRe-enable mac tests
Alan Alpert [Mon, 16 Dec 2013 18:40:04 +0000 (10:40 -0800)]
Re-enable mac tests

Task-number: QTBUG-35344
Change-Id: Ifc4d5420c95a615b35f02ec585c324b2cc93c5e0
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
10 years agoV4: relieve more memory allocator pressure.
Erik Verbruggen [Thu, 16 Jan 2014 14:39:00 +0000 (15:39 +0100)]
V4: relieve more memory allocator pressure.

For _ZN13BenchmarkDemo11initPhysicsEv from the Octane testsuite, the
total allocated memory drops from 1.5GB to 51MB. Peak memory usage stays
at 29MB.

Again, slow implementations of malloc()/free() will see a performance
improvement.

Change-Id: I21bc2f0d3735de0980fc9b3745906016e2e48a61
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix usage of FileDialog.folder property in QtQuick
Tobias Koenig [Mon, 6 Jan 2014 08:45:37 +0000 (09:45 +0100)]
Fix usage of FileDialog.folder property in QtQuick

The content of the FileDialog.folder property has not been applied
to the native QFileDialog, so it was not possible to pre-select a
folder for the file dialog.

Change-Id: Iaadd6aa71bc37739c16a2e7c5bff2d0050f15f3a
Task-number: QTBUG-35973
Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
10 years agoQtQuick.Dialogs FileDialog: don't go astray into qrc:/ on Android
Shawn Rutledge [Mon, 13 Jan 2014 14:16:01 +0000 (15:16 +0100)]
QtQuick.Dialogs FileDialog: don't go astray into qrc:/ on Android

Was due to string->URL conversion when setting FolderListModel.folder.

Task-number: QTBUG-36006
Change-Id: Ia768d8a5473b3d4c22ef9be7c8b3cf28d3956f6f
Reviewed-by: Liang Qi <liang.qi@digia.com>
10 years agoFix failing context->next != 0x1 assertion
Simon Hausmann [Thu, 16 Jan 2014 12:08:37 +0000 (13:08 +0100)]
Fix failing context->next != 0x1 assertion

After commit bf173fe5da381c88343296ca33ef6b06389c6d20 context objects are
always on the GC heap and no more in that special linked list or stack
allocated, so the next pointer became dangling/uninitialized and asserting on
it was bound to fail randomly.

Since we no more allocate contexts on the stack, we can safely remove the
assertion.

Task-number: QTBUG-35917
Change-Id: I104bd129c6c32f46a6302052f563abdf926cb879
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
10 years agoV4 IR: do edge splitting after SSA transformation
Erik Verbruggen [Wed, 15 Jan 2014 09:45:28 +0000 (10:45 +0100)]
V4 IR: do edge splitting after SSA transformation

This reduces the work for the dominator tree/frontier calculations,
because there are less blocks to consider. All blocks inserted by
splitting the critical edges, have (by definition) no effect on the
dominator calculations. However, the immediate dominators for all new
blocks needs to be added, because this information is used by the block
scheduling.

This change reduces memory/time usage during optimization passes,
especially when processing excessively big switch statements.

Change-Id: Ia69882e9dabdddffa1c98b1079012d8d988e1e8f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoV4: lower memory allocator pressure.
Erik Verbruggen [Thu, 16 Jan 2014 13:55:41 +0000 (14:55 +0100)]
V4: lower memory allocator pressure.

Changes to datastructures and more re-using of locally used temporary
vectors. For the test regress-74474-002.js this lowers the total
allocated memory from 1.98GB to 158MB. Thse peak memory usage stays at
75MB. There is no functional change.

This should give a modest performance improvement which mainly depends
on the speed of malloc()/free().

Change-Id: I1877c1903e59a33ee79ff2b801ef6f2c1cee30a6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoV4 IR: update immediate dominators when purging unreachable basic-blocks
Erik Verbruggen [Wed, 15 Jan 2014 09:46:08 +0000 (10:46 +0100)]
V4 IR: update immediate dominators when purging unreachable basic-blocks

The basic block scheduling uses this information to place loops. When
the immediate dominator information is invalid, the scheduling can be
sub-optimal, or will sometimes forget to schedule some blocks.

Change-Id: Iaeb45f2b757b676310be25a658ceadc07d5722ec
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoMake sure the test window has focus
Albert Astals Cid [Thu, 16 Jan 2014 10:55:54 +0000 (11:55 +0100)]
Make sure the test window has focus

Some setups like xvfb-run under Linux do not focus windows
after showing them, this means that any focus based test will
fail since the windows itself is unfocused. This makes sure
the test window will be shown and focused.

Change-Id: I1903b7cdf88b772e1ca15acd4899695b49615712
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoIncrease the timeout for QPacketProtocol tests
Ulf Hermann [Thu, 16 Jan 2014 13:54:33 +0000 (14:54 +0100)]
Increase the timeout for QPacketProtocol tests

Recent failures when testing a completely unrelated one-line commit
(https://codereview.qt-project.org/74584) suggest that the timeout is
actually too small.

Change-Id: I9c3fd0b09c6be2d42f92485c3c223fe88bb8328e
Reviewed-by: Michael Brasser <michael.brasser@live.com>
10 years agoRevert "Support batching of rotated antialiased elements."
Gunnar Sletta [Mon, 13 Jan 2014 07:56:09 +0000 (08:56 +0100)]
Revert "Support batching of rotated antialiased elements."

This patch broke scaled text rendering

This reverts commit 6acaa1c42936f89d74324be9c0cce4873a9a565b.

Change-Id: I1f7a3ba0556f6d59bc1e28946631be2d9fc2b67d
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
10 years agoV4: remove unnecessary spills and order them correctly.
Erik Verbruggen [Wed, 15 Jan 2014 13:36:37 +0000 (14:36 +0100)]
V4: remove unnecessary spills and order them correctly.

When doing edge resolving, too many spills were generated, and the
dependency tracking of moves was not complete. Now we only insert spills
that are caused by phi-nodes (because any other spill would be generated
at the point a variable was defined). However, there can still be
multiple dependencies between the moves generated by the edge resolving.
Instead of only checking the first dependency, all of them are tracked.

The bug report was a case where an unneccesary spill was generated, that
got tracked, but "suppressed" the other (valid!) dependent move. The
randomness was caused by the hash seeding of QHash.

Task-number: QTBUG-35840

Change-Id: Ifbc3c8fc13de53c46a8b5859721b2497189921a3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoRemove the two default role names listed in cppmodels documentation.
Mitch Curtis [Wed, 15 Jan 2014 07:54:04 +0000 (08:54 +0100)]
Remove the two default role names listed in cppmodels documentation.

The list is incomplete, and they are now fully documented under
QAbstractItemModel::roleNames(). This saves us maintaining two lists
that can easily get out of sync.

Change-Id: I4895a8ba19a4f48c26b4077e8bf2eba8c4c8407c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
10 years agoMake sure that profiling can only be started if debugging is enabled.
Ulf Hermann [Wed, 15 Jan 2014 11:30:36 +0000 (12:30 +0100)]
Make sure that profiling can only be started if debugging is enabled.

Enabling the profiler doesn't make much sense if there is no debug
service as the messages can't be sent anywhere then. Furthermore, the
profiler instance is only properly initialized if debugging is enabled
and thus enabling profiling without debugging being enabled can cause
problems.

Change-Id: I784a110126d45a9a2bc9d9e14d9a22e2980c3a42
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
10 years agoAdd support for a separate index buffer
Laszlo Agocs [Sun, 5 Jan 2014 19:36:13 +0000 (20:36 +0100)]
Add support for a separate index buffer

The renderer binds same buffer both for vertex and index data.
This is allowed on desktop & ES but is forbidden in WebGL.
Add a compile-time flag to disable this optimization(?) and
force using a separate buffer for the index data.

Change-Id: I57c17c883a55e02513a8e4427efb202cafaaf37e
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
10 years agoFix some compiler warnings in tests and examples.
Christian Kandeler [Tue, 14 Jan 2014 11:31:39 +0000 (12:31 +0100)]
Fix some compiler warnings in tests and examples.

Change-Id: Ia739c995005635caf6fd0bd4e495ed8567350e83
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
10 years agoDo not crash if /proc is not mounted
Albert Astals Cid [Mon, 13 Jan 2014 10:09:34 +0000 (11:09 +0100)]
Do not crash if /proc is not mounted

When proc is not mounted pthread_getattr_np fails, so default
to 1MB stack in getStackLimit and to exactGC in MemoryManager

Change-Id: Ic7515fd420f2d39a656808d24a3915a657722891
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
10 years agoFix nodetest autotest.
Gunnar Sletta [Thu, 9 Jan 2014 08:18:44 +0000 (09:18 +0100)]
Fix nodetest autotest.

GL context was initialized with the wrong surface format resulting
in warnings, and we did not clean up the render context properly.

Change-Id: I19f748ca985a0becf1f7a6caa987f21567029cfd
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Alex Montgomery
10 years agoFix warning about cast from char* to QString
Thiago Macieira [Fri, 10 Jan 2014 06:10:21 +0000 (22:10 -0800)]
Fix warning about cast from char* to QString

Use QStringLiteral.

Change-Id: I201fc44b2a6bf0f7ff3ff1c9ea81ff3b64b2bba9
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
10 years agoOn Mac only editable ComboBox should receive tab focus
Frederik Gladhorn [Wed, 8 Jan 2014 15:15:21 +0000 (16:15 +0100)]
On Mac only editable ComboBox should receive tab focus

[ChangeLog][QtQuickControls] Mac: ComboBox will only get tab focus when it is
editable.

Change-Id: Ife04de67b2e3dea77ba878b247ad0b676c879c02
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
10 years agoMake qtdeclarative compile with QT_NO_TRANSLATION
Tasuku Suzuki [Mon, 30 Dec 2013 18:06:02 +0000 (03:06 +0900)]
Make qtdeclarative compile with QT_NO_TRANSLATION

Change-Id: I73efc8c568e2368bc804eacab9e8f9cced8a030b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
10 years agotst_qquickpathview: Use QCOMPARE instead of QVERIFY.
Friedemann Kleint [Wed, 18 Dec 2013 11:07:38 +0000 (12:07 +0100)]
tst_qquickpathview: Use QCOMPARE instead of QVERIFY.

Attempting to get some diagnostic output for the failues.

Task-number: QTBUG-35705
Change-Id: Iffebae89743c31e88125c0b1e21be172d3373b05
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
10 years agonot build QQmlSettings when QT_NO_SETTINGS is defined
Tasuku Suzuki [Mon, 30 Dec 2013 16:53:50 +0000 (01:53 +0900)]
not build QQmlSettings when QT_NO_SETTINGS is defined

The current implementation is based on QSettings.

Change-Id: I2e45070dabaf915b1c1b9f4e7c63b6c3e36e48a0
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
10 years agoSupport batching of rotated antialiased elements.
Gunnar Sletta [Wed, 4 Dec 2013 14:44:57 +0000 (15:44 +0100)]
Support batching of rotated antialiased elements.

Change-Id: I0522a23617c897aff01b7b50e0af98553374d792
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
10 years agoDoc: Fix current QtQuick module version.
Takumi Asaki [Thu, 19 Dec 2013 02:03:38 +0000 (11:03 +0900)]
Doc: Fix current QtQuick module version.

Change-Id: I8056757967ff2693f69b5a7afa11a00ca826ece0
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
10 years agoFix bad cast of virtual class to base class via reinterpret_cast
Thiago Macieira [Fri, 3 Jan 2014 22:59:43 +0000 (20:59 -0200)]
Fix bad cast of virtual class to base class via reinterpret_cast

Clang 3.4 found it:
qv4managed_p.h:202:9: error: 'reinterpret_cast' to class 'QQmlDelegateModelGroupChangeArray *' from its base at non-zero offset 'QV4::Managed *' behaves differently from 'static_cast' [-Werror,--Wreinterpret-base-class]

QV4::Managed and QV4::Object are non-virtual classes (they have no
virtual table). I'm not sure if they are (C++11) standard layout, but
they seem to fit the bill. However, QQmlDelegateModelGroupChangeArray
has virtual functions, so the QV4::Managed sub-object in that class does
not start at offset zero. That means reinterpret_cast'ing the base to
the derived class is *wrong*, even if we're just calling a static
function.

In any case, we're static_cast'ing in the next line anyway, so this
can't hurt.

Change-Id: Icc796f7ecf8f41f859ea5fc877f5db5c87799964
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
10 years agoDoc: QtTest - Fix documentation for TestCase and SignalSpy
Caroline Chao [Wed, 8 Jan 2014 12:55:37 +0000 (13:55 +0100)]
Doc: QtTest - Fix documentation for TestCase and SignalSpy

The property/methods documentation needs to be available in the
components qml file. Thus we now import those components from the
qml files directly instead of using fake header files.

Rename the Qt Quick Test page to Qt Quick Test Qml Types to be
consistent with the other submodules.

Task-number: QTBUG-33587

Change-Id: Ifb1df8e7d15f2e23b4b4268e5df138934e62fc42
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
10 years agoRemove redundant copies of enabled flag in QML profiler
Ulf Hermann [Thu, 2 Jan 2014 15:49:32 +0000 (16:49 +0100)]
Remove redundant copies of enabled flag in QML profiler

Task-number: QTBUG-35315
Change-Id: Idd35a330531722cb3d4e0d3e95cb3be6e5697688
Reviewed-by: Michael Brasser <michael.brasser@live.com>
10 years agoFix some typos in documentation.
Jeff Tranter [Tue, 7 Jan 2014 15:35:37 +0000 (10:35 -0500)]
Fix some typos in documentation.

Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code.

Change-Id: I2d91518900c9b60ee8e8a8f549c88a1d50632b3d
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
10 years agoUpdated the code to resize the text box on window resize
Venu [Thu, 9 Jan 2014 11:38:50 +0000 (12:38 +0100)]
Updated the code to resize the text box on window resize

Without the QQuickView resizeMode set to
QQuickView::SizeRootObjectToView the text box control
appears in the middle and blocks the squircle effect.

Task-number: QTBUG-35584
Change-Id: Ib8fc40f087a44d05062e900c33b9de5a620d1cc5
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>