platform/upstream/qtdeclarative.git
9 years agoRemove last asFoo() methods from Managed
Lars Knoll [Fri, 13 Feb 2015 13:08:33 +0000 (14:08 +0100)]
Remove last asFoo() methods from Managed

Also add some safety checks in case the heap pointer
inside the Value is 0.

Change-Id: I61d37410c10c34f197175dbbd9ea8fa8c95c12cd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoMove some methods from qv4value_inl_p.h to qv4value_p.h
Lars Knoll [Fri, 13 Feb 2015 13:02:09 +0000 (14:02 +0100)]
Move some methods from qv4value_inl_p.h to qv4value_p.h

Change-Id: If8fe9907ad1cc479f7615ceabd419e74b4da0d11
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoRemove now unused managed_cast template method
Lars Knoll [Fri, 13 Feb 2015 13:01:44 +0000 (14:01 +0100)]
Remove now unused managed_cast template method

Change-Id: Id8a5290848b65222cc9ebfe7a6d59f7994096e14
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoGet rid of asFunctionObject()
Lars Knoll [Fri, 13 Feb 2015 12:56:05 +0000 (13:56 +0100)]
Get rid of asFunctionObject()

Change-Id: Ib4858376dc0ec57fa473c80696abc66a570c90ec
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoMore cleanups
Lars Knoll [Fri, 13 Feb 2015 12:39:20 +0000 (13:39 +0100)]
More cleanups

Get rid of Value::asObject(), and pass const Managed pointers
into some more vtable methods.

Change-Id: Ia4f427d5fd8868f77b4015d1ce5424d32bfc2115
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoGet rid of asManaged()
Lars Knoll [Fri, 13 Feb 2015 11:19:04 +0000 (12:19 +0100)]
Get rid of asManaged()

Change-Id: I853417fdf1cc339f7d43a006c20e1626b6bfb288
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoGet rid of asNumberObject
Lars Knoll [Fri, 13 Feb 2015 10:47:25 +0000 (11:47 +0100)]
Get rid of asNumberObject

Change-Id: Ie6355beabce3de65c215514d9dc98294b5980c9d
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoStabilize QQuickWindow test
Simon Hausmann [Tue, 21 Apr 2015 08:48:29 +0000 (10:48 +0200)]
Stabilize QQuickWindow test

Various test functions use QTest::touch* and QTest::mouse* to synthesize
touch/mouse events. The synthetization relies on the QWindow to be globally
positioned (with regards to the window manager), as it performs a translation
of the supplied window coordinates to global coordinates. If this happens too
early in the window mapping process, we end up with wrong global coordinates,
that in turn mean that when the event is mapped back to the window coordinates
later, it has the wrong coordinates and not what the test expects.

qWaitForWindowActive tries to accommodate this case by waiting until the
positioning of the window is "complete", as opposed to qWaitForWindowExposed,
which returns as soon as we have a rendering surface.

The symptom in the CI system was that when this race condition hit, the y
coordinate of events was off by 28 pixels on Ubuntu machines, which appears to
be the height of the title or menu bar.

Therefore this patch changes test functions that synthesize events to use
qWaitForWindowActive.

Change-Id: Ia8ecff517f4eefb15068ca1c342ef6666681c362
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
9 years agoExtend blacklist
Simon Hausmann [Tue, 21 Apr 2015 07:35:00 +0000 (09:35 +0200)]
Extend blacklist

stopAtBounds also fails on 64-bit machines, as seen in
http://testresults.qt.io/logs/qt/qtdeclarative/aa44b0fe7e7a72ec4257b338938e1ec3b7aee1e1/windows8x86_64windows8x86_64msvc2013developer-build_release_build-examples/6da9f7a63d5f4ce18e85b7a72ff0e888f3446352/testlog.txt.gz

Change-Id: If8ac78bdb3b1e66106644efc19ef8fd018aac66e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoPrivately export QQuickPaintedItemPrivate.
Mitch Curtis [Fri, 17 Apr 2015 10:19:08 +0000 (12:19 +0200)]
Privately export QQuickPaintedItemPrivate.

We need it in Qt Quick Extras 2.0.

Change-Id: Ieafa4a860322615066c4569a59fa2f85c8b2f956
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
9 years agoSkip some tests that are hanging in the CI system
Simon Hausmann [Fri, 17 Apr 2015 08:21:36 +0000 (10:21 +0200)]
Skip some tests that are hanging in the CI system

It is most unfortunate that those tests are hanging, but in order to move
forward we temporarily skip them.

Task-number: QTBUG-45655
Change-Id: I9fae6c21ca3b5c7eb6715d520bd58e366136ed58
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
9 years agoTestCase: add equals() function to QuickTestImageObject.
Mitch Curtis [Thu, 16 Apr 2015 12:31:01 +0000 (14:31 +0200)]
TestCase: add equals() function to QuickTestImageObject.

This allows for comparison of image objects returned from TestCase's
grabImage() function using QImage's operator== function. Doing pixel by
pixel image comparisons in QML is extremely slow.

This functionality is useful for checking that an item was redrawn
after a property change, for example.

[ChangeLog][QuickTest][TestCase] Added equals() function to image
object returned from TestCase's grabImage() function.

Change-Id: I0ece9df6effe2b1b9d8e1ee8ac011115d9367ef2
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
9 years agoAdd CONSTANT to Q_PROPERTY textDocument
Kari Hautamäki [Mon, 20 Apr 2015 11:49:09 +0000 (14:49 +0300)]
Add CONSTANT to Q_PROPERTY textDocument

Add CONSTANT keyword to Q_PROPERTY textDocument to remove warning "depends
on non-NOTIFYable properties".

Task-number: QTBUG-45115
Change-Id: I090870765e8b32bc1438d21d9c1b7ef942c043b5
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
9 years agoGet rid of asStringObject()
Lars Knoll [Fri, 13 Feb 2015 10:45:03 +0000 (11:45 +0100)]
Get rid of asStringObject()

Change-Id: Iad3afd00d2fdbd04efa4f3b841f11269ab496826
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoqquickitemviewtransition_p.h: eliminate a "_p_p.h" include
J-P Nurmi [Fri, 10 Apr 2015 12:20:39 +0000 (14:20 +0200)]
qquickitemviewtransition_p.h: eliminate a "_p_p.h" include

QtQuick.Controls2.StackView includes qquickitemviewtransition_p.h
to run push/pop transitions from C++. Make this header include less
and use forward declares to avoid including Q_AUTOTEST_EXPORT'd
classes, causing a linking error on Windows.

Change-Id: Ide82a66de62697d01609e5e03798b7a6a893c418
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Elvis Teixeira
9 years agoGet rid of Value::asDateObject()
Lars Knoll [Fri, 13 Feb 2015 10:31:45 +0000 (11:31 +0100)]
Get rid of Value::asDateObject()

Change-Id: I71816a784b5175f600c5a870318b16c0d84c42fb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoQML Engine: JSON XHR response type support
Valery Kotov [Tue, 7 Apr 2015 17:34:44 +0000 (20:34 +0300)]
QML Engine: JSON XHR response type support

Support for "json" response type for QQmlXMLHttpRequest was
added.

[ChangeLog][QtQml][QQmlXMLHttpRequest] QQmlXMLHttpRequest now
supports "json" binary response type.

Change-Id: I21b7659c02dfdc6b64a73e1d2003e269d90b3b23
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoFurther cleanups
Lars Knoll [Fri, 13 Feb 2015 09:42:01 +0000 (10:42 +0100)]
Further cleanups

The get and getIndexed vtable methods should take a const Managed
pointer. Start cleaning up the asFoo() methods in Value and Managed
by removing asArrayObject() and asErrorObject().

Change-Id: Ibd49bf20773ef84c15785b7ac37a7bc9fd4745d5
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoAdded a new render job stage: NoStage
Miikka Heikkinen [Wed, 18 Mar 2015 12:13:10 +0000 (14:13 +0200)]
Added a new render job stage: NoStage

NoStage allows scheduling jobs for immediate execution on the
renderer thread.

[ChangeLog][QtQuick][QQuickWindow] Added a render job stage: NoStage

Task-number: QTBUG-44953
Change-Id: I918c79f1d095bc27d911a88d81376d146a04313c
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
9 years agoMake sure we stop animators if they are yet to be started.
Gunnar Sletta [Wed, 8 Apr 2015 07:27:44 +0000 (09:27 +0200)]
Make sure we stop animators if they are yet to be started.

Change-Id: I311e66c64a79581739f80e124fd58da2aaded549
Task-number: QTBUG-45220
Reviewed-by: Michael Brasser <michael.brasser@live.com>
9 years agoStabilize tst_qquickimage::noLoading
Simon Hausmann [Tue, 14 Apr 2015 12:38:07 +0000 (14:38 +0200)]
Stabilize tst_qquickimage::noLoading

The test loads an image from a remote source and it has a QSignalSpy installed
for the progressChanged(qreal) signal on the QQuickImage. The test counts the
number of times the signal is emitted and expects it to hit an exact value.
That seems wrong when loading an image over the network, as we have no control
over in what pieces the data arrives on our end. And as it turns out, the test
occasionally fails in the CI system, which is also reproducible.

To stabilize the test, we now expect at least two emissions of the signal when
loading from the network (0% and 100%) but there may be more (0% 10% 80% 100%
for example). In addition the reload case is simplified by resetting the spy
and verifying that progressChanged was not emitted at all.

Change-Id: Ib2e660651d40b92eff889ebe3baabb74d6e00fb4
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoMerge remote-tracking branch 'origin/5.5' into dev
Liang Qi [Mon, 13 Apr 2015 07:46:15 +0000 (09:46 +0200)]
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/BLACKLIST

Change-Id: Ie81612f2884f8ea508c48ba2735ec54ea1c2eca5

9 years agoTests: Use blacklist instead of insignificant for tst_qquickanimations
Caroline Chao [Wed, 8 Apr 2015 12:13:28 +0000 (14:13 +0200)]
Tests: Use blacklist instead of insignificant for tst_qquickanimations

Remove the insignificant_tests CONFIG option in favor of a BLACKLIST file.
Blacklist the relevant tests, the tests that have been found flaky in CI.

Change-Id: I4c3ce430e654886ceea8b6f714710ebe2374e4db
Task-number: QTBUG-45466
Task-number: QTBUG-29062
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
9 years agoTests: Use blacklist instead of insignificant for tst_qquickflickable
Caroline Chao [Thu, 9 Apr 2015 12:22:31 +0000 (14:22 +0200)]
Tests: Use blacklist instead of insignificant for tst_qquickflickable

Remove the insignificant_tests CONFIG option in favor of a BLACKLIST file.
Blacklist the relevant tests, the tests that have been found flaky or
failing in CI.

Change-Id: If145b9bc413e4c9dbf1c3c06c1596647c707770e
Task-number: QTBUG-36804
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
9 years agoDo not stall loading of local images if network is slow
Albert Astals Cid [Wed, 1 Apr 2015 14:20:19 +0000 (16:20 +0200)]
Do not stall loading of local images if network is slow

Without this patch it can happen that we're
loading IMAGEREQUEST_MAX_REQUEST_COUNT http based images,
if the next image to load is a local file it wouldn't be processed
until one of the http ones finishes, which makes not much sense

Change-Id: I515306005192a20722f0c4588a1db1241348407c
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
9 years agoFix TextEdit when vertical alignment != AlignTop
Eskil Abrahamsen Blomfeldt [Wed, 8 Apr 2015 11:09:24 +0000 (13:09 +0200)]
Fix TextEdit when vertical alignment != AlignTop

When the TextEdit's alignment was either AlignBottom or
AlignVCenter, several things would be broken: First of all
the position of all non-dirty nodes would not be updated,
so if you e.g. added text to the end of the document, it
would overlap with the previously added text.

Also, the frame decorations were always aligned to the top, since
the basePosition was not accounted for in the node for this.

The fix is to translate the root node to the base position instead
of baking this into the position of the text nodes. This also
automatically fixes frame decorations since it's already aligned
to the top of the root node.

[ChangeLog][TextEdit] Fixed issues with using other vertical
alignments than AlignTop.

Change-Id: I11f73eab21a28658a5cbf00292fd519efd0f3e7f
Task-number: QTBUG-45032
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoTests: Make qquickcustomparticle significant again
Caroline Chao [Wed, 8 Apr 2015 12:41:23 +0000 (14:41 +0200)]
Tests: Make qquickcustomparticle significant again

The test is passing in CI and it seems it was temporarily
made insignificant in 5a4eebbc.

Change-Id: Ic53d45b842c9a9c431a43cb6d5cbd3849e5729ed
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoTests: Make qquicktrailemitter significant again
Caroline Chao [Wed, 8 Apr 2015 13:00:06 +0000 (15:00 +0200)]
Tests: Make qquicktrailemitter significant again

The test is now passing in CI.

Change-Id: Iad7dc46e7819ba9e9f604ed39ab9bc53f123b119
Task-number: QTBUG-33421
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
9 years agoTests: Make qqmldebugjs significant again
Caroline Chao [Wed, 8 Apr 2015 13:16:15 +0000 (15:16 +0200)]
Tests: Make qqmldebugjs significant again

The test is now passing in CI.

Change-Id: I9414e05d40fe373878afa43121fcfa7cf95fcbdf
Task-number: QTBUG-28263
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
9 years agoTests: Make qquickgridview significant again
Caroline Chao [Tue, 7 Apr 2015 12:58:27 +0000 (14:58 +0200)]
Tests: Make qquickgridview significant again

The qquickgridview tests are passing in CI

Change-Id: Idaf5a9d9df06a28c9ff5162b7bb00e4d677c3a0b
Task-number: QTBUG-33017
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
9 years agoTests: Make qquicktext, qquicktextedit and qquickpathview significant
Caroline Chao [Wed, 8 Apr 2015 07:32:24 +0000 (09:32 +0200)]
Tests: Make qquicktext, qquicktextedit and qquickpathview significant

The tests are now passing in CI for OS X.
The test qquicktextedit is also passing on win32.
Make qquicktext, qquicktextedit and qquickpathview significant again.

Change-Id: I778cc90aff0d1e76b66b6f8ae5150d3113e6fc68
Task-number: QTBUG-27740
Task-number: QTBUG-32540
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
9 years ago[mips] Handle properly unaligned halfword load.
Julien Brianceau [Fri, 3 Apr 2015 07:13:17 +0000 (09:13 +0200)]
[mips] Handle properly unaligned halfword load.

This patch improves YarrJIT efficiency on mips platforms.

Cherry-picked from qtwebkit (ea22657d17a934b04c8621dc8891a1d4d80510e3)

Change-Id: I83eca9716e4d6e9e1dd4d8ceb76c3da380502ce7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
9 years agoRemove outdated V8 profiler test
Ulf Hermann [Wed, 8 Apr 2015 14:07:46 +0000 (16:07 +0200)]
Remove outdated V8 profiler test

Change-Id: I296a3f94d16c4e7a6f89e566893f627c50b66ba3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoReturn the correct type from Item::mapToItem/Item::mapFromItem.
Mitch Curtis [Wed, 8 Apr 2015 08:04:25 +0000 (10:04 +0200)]
Return the correct type from Item::mapToItem/Item::mapFromItem.

Previously we were returning a JavaScript object with x/y/width/height
properties, instead of a point/rect. This meant that the type couldn't
be converted to a point/rect because we don't support duck typing,
where we would deduce the type based on the properties.

One example of a broken use case that this patch fixes is when QML is
unable to convert the return type to a point in a property declaration:

property point p: mouseArea.mapToItem(child, mouseArea.mouseX, mouseArea.mouseY)

Another is using the result of the function to pass to another function:

child.contains(mouseArea.mapToItem(child, mouseArea.mouseX, mouseArea.mouseY))

Change-Id: I3ce82f10175f904dd02c8af6b5e42cee14b2ebb2
Task-number: QTBUG-41452
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoTests: Make qquickloader tests significant again
Caroline Chao [Tue, 7 Apr 2015 12:43:05 +0000 (14:43 +0200)]
Tests: Make qquickloader tests significant again

The qquikcloader tests are passing in CI.

Change-Id: I472e20cdeb76f867b9cb02e3bcfdc447825d4d14
Task-number: QTBUG-30721
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
9 years agoSpecifically mark Repeater as transparent for positioners.
Jan Arve Saether [Thu, 19 Mar 2015 12:38:03 +0000 (13:38 +0100)]
Specifically mark Repeater as transparent for positioners.

Historically, Repeaters were avoided by their parent positioners by only
accepting items with a width *and* height greater than zero. (Repeater is
an item where both width and height defaults to zero).

Later, QQuickItemPrivate::isTransparentForPositioner() were added to
fix similar problems with item.layer and item.layer.effect (change
da15ea0f3b5805db657f13060c21efa78f10cde2)

Since isTransparentForPositioner is now available, we can therefore mark
mark QQuickRepeater also as transparent for positioners.

This also enables Qt Quick Layouts to have a much better heuristic on
which items should be ignored or not.

AFAICS, this will only break if people actually resized their repeaters
(and they thus got included in their parent positioners). I cannot see why
anybody would have wanted this behavior (and depend on it). Therefore,
there is a risk of regression, but I doubt that this is behavior that
people would expect not to break.

[ChangeLog][QtQuick][Repeater] Positioners will now always ignore
Repeaters. Previously, Repeaters were ignored by Positioners when their
width or height were 0.

Change-Id: I1132b753869fdc398eaeabeb9cce7cbf545dbbed
Task-number: Preparation for QTBUG-44077
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
9 years agoAddress uninitialized scalar fields
Holger Hans Peter Freyther [Tue, 31 Mar 2015 20:58:02 +0000 (22:58 +0200)]
Address uninitialized scalar fields

Fixes Coverity CID 10732, 10734, 10735, 10736, 10739, 10740

Change-Id: Idebb0bdaf42ceb06cd86c73592138e758a8a87c9
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoImprove debug formatting of QAbstractAnimationJob and related classes.
Friedemann Kleint [Tue, 31 Mar 2015 12:40:20 +0000 (14:40 +0200)]
Improve debug formatting of QAbstractAnimationJob and related classes.

- Output the state.
- Add output to QQuickAnimatorJob.
- Add a private export to the debug operator for use by
  QQuickAnimatorProxyJob to format its contained job.

Task-number: QTBUG-45220
Change-Id: Ic64bb5d949864de1c4fb322d53acc3e253977e5d
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
9 years agoImprove debug operator for QQuickItem.
Friedemann Kleint [Wed, 1 Apr 2015 09:46:33 +0000 (11:46 +0200)]
Improve debug operator for QQuickItem.

Use new formatting helpers and output name, z only when necessary.
For example,

QQuickRectangle_QML_4 (this = 0xb380e0 , name= "" , parent = 0xa4a290 , geometry = QRectF(0,0 320x480) , z = 0 )

becomes:

QQuickRectangle_QML_4(0xb380e0, parent=0xa4a290, geometry=0,0 320x480)

Change-Id: I5d4a8cf9f435995754f875a928fa36978418e4bf
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
9 years agoFix Text item linkColor update
Marko Kangas [Wed, 1 Apr 2015 09:55:01 +0000 (12:55 +0300)]
Fix Text item linkColor update

Changed linkColor to update node correctly when link color is changed.

Change-Id: I056811053e2287c93ba9c0afb5ceddef939f46ce
Task-number: QTBUG-45356
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
9 years agoMerge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Liang Qi [Wed, 1 Apr 2015 06:59:17 +0000 (06:59 +0000)]
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5

9 years agoqml tool should exit on Qt.quit()
Alan Alpert [Wed, 11 Mar 2015 05:25:14 +0000 (22:25 -0700)]
qml tool should exit on Qt.quit()

In a QML/C++ application there may be additional code after app.exec().
In a pure QML application this is not the case, and you may wish to call
Qt.quit() during scene creation (before app.exec()).

[ChangeLog][QtQml][qml] qml tool now quits immediately if Qt.quit()
is called before all scenes complete creation.

Change-Id: I5c6fb64769724350ef3d74c34e2ede2d06562e4b
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
9 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Liang Qi [Tue, 31 Mar 2015 13:45:45 +0000 (15:45 +0200)]
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I54e66e992f5e5d441b8b5394e7a03ec5352e7bf3

9 years agoAndroid: Work around bug on Samsung Galaxy Tab 3 10.1
Eskil Abrahamsen Blomfeldt [Tue, 31 Mar 2015 11:50:31 +0000 (13:50 +0200)]
Android: Work around bug on Samsung Galaxy Tab 3 10.1

After installing the Android 4.4.2 upgrade on Samsung Galaxy Tab 3 10.1,
one of the vertex shaders in Qt Quick stopped compiling.

The issue seems to be that this particular shader triggers a
bug in the driver, and a simple work-around is to replace the
ternary conditional operator with a simple if-statement.

[ChangeLog][Android] Fixed a vertex shader compilation issue on
certain OpenGL drivers.

Change-Id: I2f878215a753a7e222c46c0f85a84b0bc81d523a
Task-number: QTBUG-43515
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
9 years agoAdd inheritance documentation markup to animator classes.
Friedemann Kleint [Mon, 30 Mar 2015 15:18:26 +0000 (17:18 +0200)]
Add inheritance documentation markup to animator classes.

Task-number: QTBUG-45220
Change-Id: Ie817275897f860b0d6c4dcac2f92a4f3469a4611
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
9 years agoFix some qdoc warnings.
Friedemann Kleint [Wed, 25 Mar 2015 14:34:03 +0000 (15:34 +0100)]
Fix some qdoc warnings.

qtdeclarative/src/qml/qml/qqmlinfo.cpp:46: warning: Cannot find 'qmlInfo(...)' in '\fn' QQmlInfo qmlInfo(const QObject *object)
qtdeclarative/src/qml/qml/qqmlexpression.cpp:366: warning: Undocumented parameter 'column' in QQmlExpression::setSourceLocation()
qtdeclarative/src/qml/doc/src/qmlfunctions.qdoc:176: warning: Undocumented parameter 'reason' in qmlRegisterExtendedUncreatableType()
qtdeclarative/src/qml/doc/src/qmlfunctions.qdoc:176: warning: No such parameter 'message' in qmlRegisterExtendedUncreatableType()

Change-Id: Iec801b33b11bd57abadd968a90c49f8eba1280d5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
9 years agoDon't send deferred delete events from windowDestroyed()
Andy Shaw [Thu, 12 Mar 2015 14:01:48 +0000 (15:01 +0100)]
Don't send deferred delete events from windowDestroyed()

This is a follow-up to 657766f19b31d83f361fd3c9ad717b207e1dff8c which
removed it from the destructor itself. This goes one step further and
removes the calls from the windowDestroyed() calls which also sends the
deferred deletes.

Task-number: QTBUG-40920
Change-Id: I491b79bb600914575ba5565d2862d041726217e8
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoImproved QML test robustness and logging.
Jason Erb [Tue, 24 Mar 2015 01:58:09 +0000 (21:58 -0400)]
Improved QML test robustness and logging.

Added logging to quick_test_main and reordered for robustness
(e.g. moved "wait for load" to before error check).

Change-Id: Ifd48b5bdd1efee4301e5c4e571241762dca176ad
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
9 years agoAlways remove reply from replies when processing cancelled
Albert Astals Cid [Mon, 16 Mar 2015 16:46:57 +0000 (17:46 +0100)]
Always remove reply from replies when processing cancelled

Otherwise we if we leave the entry in replies later
QQuickPixmapReader::networkRequestDone
will give a potentially already deleted pointer in replies.take(reply)
which will then crash when trying to post something to it

Change-Id: I157a58e3ebe0a3fd6422742843eafbbdc58a7801
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
9 years agoBlacklist QQuickWindow::testWindowVisibilityOrder for OS X
Frederik Gladhorn [Mon, 30 Mar 2015 15:53:47 +0000 (17:53 +0200)]
Blacklist QQuickWindow::testWindowVisibilityOrder for OS X

The failing test is a regression introduced by
5bf9528b9164bd888e991552b66d6237e84a7ee2.

Since that patch had several side effects, we will not revert it but
blacklist the test function for now.

Task-number: QTBUG-45318
Change-Id: I3e28a21c8b056c1c8f2fd5d6d3ffe32d5f44b0e5
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
9 years agoHonor setFocusOnTouchRelease in QQuickTextInput
Kai Uwe Broulik [Tue, 17 Mar 2015 13:26:35 +0000 (14:26 +0100)]
Honor setFocusOnTouchRelease in QQuickTextInput

[ChangeLog][QtQuick][TextInput] SetFocusOnTouchRelease is honored

Change-Id: I0c5150465effadb7b1221250875aedf16a83bb2c
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
9 years agoadd qt.quick.touch.target logging category
Shawn Rutledge [Mon, 9 Mar 2015 16:16:34 +0000 (17:16 +0100)]
add qt.quick.touch.target logging category

qt.quick.touch produces a lot of output.  This instead tracks only
the changes to the itemForTouchPointId hash: which touchpoints are
being sent to which items.

Change-Id: I5119b4716a43fb35fd6c6712bf7d4ec46d762a9f
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
9 years agoUpdate the shader when devicePixelRatio changes
Paul Olav Tvete [Fri, 27 Mar 2015 14:32:16 +0000 (15:32 +0100)]
Update the shader when devicePixelRatio changes

Task-number: QTBUG-45076
Change-Id: I03de20da2e3f436339dcf48fc7d7d3d11a509577
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoGuard profiler service test against unusual clock behavior.
Ulf Hermann [Fri, 27 Mar 2015 14:07:32 +0000 (15:07 +0100)]
Guard profiler service test against unusual clock behavior.

Apparently a monotonic timer can return the exact same timestamp
multiple times in a row. In this case the events may be sorted in a
different way than we expect. By scanning all events with equal
timestamps for the one we're looking for, we can still keep the test
useful.

Change-Id: I08e1d7ed8d74359a127ac34ebc077375aa70f492
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoQQuickWidget: expose the underlying QQuickWindow
Giuseppe D'Angelo [Thu, 26 Mar 2015 20:34:42 +0000 (21:34 +0100)]
QQuickWidget: expose the underlying QQuickWindow

There's a number of APIs (such as all the scenegraph-related
signals) that are currently missing from QQuickWidget.
Instead of duplicating every API in QQuickWidget, simply expose
the underlying offscreen QQuickWindow.

Task-number: QTBUG-45260
Change-Id: I1a89fe600ce675963ea24ee6dd56d6ca4fea9cd2
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
9 years agoBlacklist tst_qquickwindow::cursor()
Simon Hausmann [Fri, 27 Mar 2015 08:20:30 +0000 (09:20 +0100)]
Blacklist tst_qquickwindow::cursor()

This test is failing randomly on random platforms. Little value is added
until it is stabilized.

Change-Id: I8b11b990403071ef3b2b915afd7d559f73d76f7d
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoInclude the scenegraph autotest in the testrun.
Gunnar Sletta [Wed, 4 Jun 2014 18:32:07 +0000 (20:32 +0200)]
Include the scenegraph autotest in the testrun.

The mipmap test has been updated to work on chips without npot, but
because it is failing in ci on some linux machines, we keep it enabled
for OSX and windows only.

The test also includes a dump of GPU capabilities to aid in debugging.

Change-Id: Ief3092b8e0502bea06aaf4a20c03b7edfa0b2403
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoFix flushing QQuickWidget
Laszlo Agocs [Thu, 19 Mar 2015 15:18:16 +0000 (16:18 +0100)]
Fix flushing QQuickWidget

Like it was done for QOpenGLWidget.

Task-number: QTBUG-45106
Change-Id: I69c11f53f781f57ceebb9b7ed95a2753bff31492
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
9 years agoAdd QQuickAsyncImageProvider
Albert Astals Cid [Fri, 13 Mar 2015 16:29:57 +0000 (17:29 +0100)]
Add QQuickAsyncImageProvider

It allows for providers to implement threading on their side

Change-Id: I34042b213ce7697a3e39470387357d733e15723c
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoBlacklist one QQuickListView auto-test
Simon Hausmann [Thu, 26 Mar 2015 12:45:45 +0000 (13:45 +0100)]
Blacklist one QQuickListView auto-test

It fails randomly in the CI system. We sometimes don't see it because it
works on the second attempt, but the flakey nature of the test should
be recorded here in the blacklist instead of being buried in the logs of
the CI system.

Change-Id: I2f29f86f61491e3078c12c0d4aa6de6567830965
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
9 years agoRemove the old headersclean unit test
Thiago Macieira [Thu, 18 Dec 2014 03:37:18 +0000 (19:37 -0800)]
Remove the old headersclean unit test

We have configure -headersclean now

Change-Id: If48fb86c9f130450d8ffa94a9e52584141a2d793
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
9 years agoFixing yet another memory leak
Robert Griebl [Mon, 23 Mar 2015 13:40:03 +0000 (14:40 +0100)]
Fixing yet another memory leak

Change-Id: I1c083a488f963f8dd40f3bd6db5a46ac9db66ffb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoAnother fix to avoid detaching the m_windows list.
Robert Griebl [Mon, 23 Mar 2015 12:38:28 +0000 (13:38 +0100)]
Another fix to avoid detaching the m_windows list.

Just like commit 310fd3ed, this fixes another unnecessary detach.

Change-Id: I5108ea5112a4b0e877f86d06868375abb9a80409
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoFixed a memory-leak when changing property bindings in states.
Robert Griebl [Mon, 23 Mar 2015 12:28:49 +0000 (13:28 +0100)]
Fixed a memory-leak when changing property bindings in states.

Bindings that were still stored in the revert-list when the state
was destructed were not deleted before. This could lead to considerable
memory leaks in big applications.

Change-Id: I73250f7d03a42c25ca729c18082125fd8f3c8989
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoMerge remote-tracking branch 'origin/5.5' into dev
Liang Qi [Tue, 24 Mar 2015 21:09:49 +0000 (22:09 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
tests/auto/qml/qqmlitemmodels/testtypes.h

Change-Id: I2f2f3f47fd873ddd4fd027414654a861b56357f4

9 years agoFix profiler adapter documentation
Ulf Hermann [Mon, 23 Mar 2015 14:53:23 +0000 (15:53 +0100)]
Fix profiler adapter documentation

Update it to include the features arguments and mark it as internal.

Change-Id: If0324d413c60d3d4bb203fb383dcd20e50db0e88
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
9 years agoDoc: Removed a col from the table of qmldir statements
Venugopal Shivashankar [Wed, 18 Mar 2015 12:31:58 +0000 (13:31 +0100)]
Doc: Removed a col from the table of qmldir statements

The table was too wide for the online template, which
limits the width to 80 columns. Removed a redundant
column in the table so that the readability improves
in online version of the doc.

Change-Id: I633cd81225333d814b1d47aa155130b8d6958e3e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
9 years agoFix disappearing text in selections
Eskil Abrahamsen Blomfeldt [Fri, 20 Mar 2015 13:21:46 +0000 (14:21 +0100)]
Fix disappearing text in selections

Change 11a595e30615943cd6c63f08cc44cde7861112eb introduced a
regression where selected text might disappear randomly because
we changed the order the nodes were added to the list. The
order is significant in cases where there is overlap, such as
for painting selections.

Instead of iterating over the hash and thus getting the regular
nodes in random order, we make the first node with any given
key the primary node, add this to the list immediately, and then
just do a look up in the hash for the nodes that should be
merged with it.

Change-Id: Id2208ab672294aa3dd2bc9741e6c6697c2c66746
Task-number: QTBUG-45133
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
9 years agoFix inconsistent overrides. [-Winconsistent-missing-override]
Sérgio Martins [Thu, 19 Mar 2015 20:34:49 +0000 (20:34 +0000)]
Fix inconsistent overrides. [-Winconsistent-missing-override]

Change-Id: Ia0f3b50fd14f846c4e36cdaa12d5579902137f1b
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
9 years agoRemove QItemSelection value-type, use Array instead
Gabriel de Dietrich [Fri, 6 Mar 2015 18:27:22 +0000 (19:27 +0100)]
Remove QItemSelection value-type, use Array instead

We implement this by adding QItemSelection to the
set of sequence types.

Change-Id: Ia3db376c806d8f062639e22c7f4bf392f114c266
Reviewed-by: Stephen Kelly <steveire@gmail.com>
9 years agoRemove QModelIndexList value type, use Array instead
Gabriel de Dietrich [Tue, 3 Mar 2015 17:36:51 +0000 (18:36 +0100)]
Remove QModelIndexList value type, use Array instead

We implement this by adding QModelIndexList to the
set of sequence types.

Change-Id: If7e0e88ab0c2916c2b65a926f8241549520d7391
Reviewed-by: Stephen Kelly <steveire@gmail.com>
9 years agoRemove unused variable in InstructionSelection::run()
Maks Naumov [Sat, 21 Mar 2015 17:37:17 +0000 (19:37 +0200)]
Remove unused variable in InstructionSelection::run()

Change-Id: I61ebeab024cd3e31e9d94810454328b4e8d48364
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoFix conversion between char and string.
Christian Strømme [Thu, 12 Mar 2015 14:33:50 +0000 (15:33 +0100)]
Fix conversion between char and string.

If a QChar (or char) was used to set a QString property, the
intermediate value used by the QML engine (int), would be
converted to a string representation of the integer and not the actual
character. To avoid this behavior, characters are now stored as string
objects and the string is then converted to the target char type if
possible.
A side effect of this solution is that it is makes it possible to
assign a string to a char property as well, but only if the string
contains exactly one character.

[ChangeLog][QtQml][Important Behavior Changes] Assigning a char to a
string will now create a string with the actual character instead of a
string representation of the character's code-point. A side effect of
this change is that a one-character string also can be assigned to a
character type.

Task-number: QTBUG-44934
Change-Id: Ifd15386933ee11354ee1bbb5598a5f0b00a08616
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoQQuickWindow touch event compression: retain previous positions
Shawn Rutledge [Fri, 13 Mar 2015 14:13:22 +0000 (15:13 +0100)]
QQuickWindow touch event compression: retain previous positions

The previous positions in the delayed touch event should be from
the first touchpoint which is being delayed, not updated based on
subsequent updates that are being merged into it.  Clarified
naming and comments in this section.

Task-number: QTBUG-40167
Change-Id: Ie419267e4a33277f9154bd80f5bce104e52d773e
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoCleanup some of the casting code
Lars Knoll [Fri, 13 Feb 2015 09:02:28 +0000 (10:02 +0100)]
Cleanup some of the casting code

Get rid of value_cast, and move the Managed::as()
method into Value.

Change-Id: I440ac44ae77f4fda1a8a837383fe631f432f6532
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoGet rid of Value::fromManaged()
Lars Knoll [Fri, 13 Feb 2015 08:30:11 +0000 (09:30 +0100)]
Get rid of Value::fromManaged()

Change-Id: Ifb889e4b270dee8350a9c8f7559c671413995e4b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoReduce dependencies
Lars Knoll [Fri, 13 Feb 2015 08:02:28 +0000 (09:02 +0100)]
Reduce dependencies

Change-Id: I4190c1a6d8a06a130e50cb727feafa7cf11f21cd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoWrap members in Object in a Heap::Pointer
Lars Knoll [Fri, 13 Feb 2015 07:29:56 +0000 (08:29 +0100)]
Wrap members in Object in a Heap::Pointer

Change-Id: I0d132592487255027c215da21fbec15b23b00624
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoReduce dependencies
Lars Knoll [Thu, 12 Feb 2015 21:17:37 +0000 (22:17 +0100)]
Reduce dependencies

Change-Id: I61ee4d25f8929d6723d2bf371efc122fa317e851
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoFix assert
Lars Knoll [Sat, 14 Feb 2015 21:46:19 +0000 (22:46 +0100)]
Fix assert

Change-Id: I4b75a95bd7c59943d06bce7572bc0636b00fc5a9
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoDoc: Added info. about the singleton type declaration
Venugopal Shivashankar [Wed, 18 Mar 2015 13:25:11 +0000 (14:25 +0100)]
Doc: Added info. about the singleton type declaration

Task-number:QTBUG-37057
Change-Id: I458bc4fe3920b70c201da0a09b437965b651872e
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
9 years agoAllow Flickable's grab to be stolen if dragging over bounds.
Andrew den Exter [Tue, 10 Mar 2015 01:59:23 +0000 (11:59 +1000)]
Allow Flickable's grab to be stolen if dragging over bounds.

This allows a parent item to intercept a drag gesture in one direction
when the flickable has reached it's limit in that direction without
disabling the drag over bounds for drag gestures in the opposite
direction.

Change-Id: I6ac60113f150dbb8da42d9b5593325b04be166f5
Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
9 years agoRemove forward declaration of QScriptContext
Lars Knoll [Wed, 18 Mar 2015 13:39:20 +0000 (14:39 +0100)]
Remove forward declaration of QScriptContext

Change-Id: I2ab642b73bf7fdd5d82085b0dc0f61d32a5c1fb5
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoMerge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Liang Qi [Wed, 18 Mar 2015 09:55:14 +0000 (09:55 +0000)]
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev

9 years agoqmltest: Make sure we inherit all of testlib's MODULE_CONFIG
Tor Arne Vestbø [Wed, 18 Mar 2015 12:18:43 +0000 (13:18 +0100)]
qmltest: Make sure we inherit all of testlib's MODULE_CONFIG

We don't know what's in testlib's MODULE_CONFIG, so we can't hard-code
the value. E.g., with the introduction of XCTest support in testlib [1],
we'll gain an additional member in testlib's module config set for taking
care of the XCTest framework include path, and this value also needs to
be propagated/inherited to the final target.

[1] https://codereview.qt-project.org/#/c/107477/

Change-Id: I28ee44ac41f148a873ab35adcae38e73bef3316f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoMove QtQuick validators out of qquicktextinput_p.h
J-P Nurmi [Tue, 17 Mar 2015 16:17:51 +0000 (17:17 +0100)]
Move QtQuick validators out of qquicktextinput_p.h

TextField (v2) inherits QQuickTextInput, and therefore has to include
qquicktextinput_p.h. Move the internal Q_AUTOTEST_EXPORT'd classes out
of the header to avoid build problems on Windows due to missing symbols

Change-Id: I6f37cf4e112425ff6c4c0a4ccc5e584f26599d8a
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
9 years agoRestore depth buffer usage when last render node is removed
Mikko Harju [Tue, 17 Mar 2015 21:08:18 +0000 (23:08 +0200)]
Restore depth buffer usage when last render node is removed

Adding a QSGRenderNode to the scene permanently disabled opaque batches
by disabling depth buffer usage. Reset the depth buffer usage to the
default value once last QSGRenderNode has been removed from the scene.

Change-Id: I760afde83ae9eaaf1b5571c37fd0081eb23b1f20
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
9 years agoText: add support for padding
J-P Nurmi [Thu, 5 Mar 2015 09:12:20 +0000 (10:12 +0100)]
Text: add support for padding

[ChangeLog][QtQuick][Text] Added padding, leftPadding, topPadding,
rightPadding and bottomPadding properties.

Task-number: QTBUG-41559
Change-Id: I5aa3a9eaad86de5e49d8e2da2a9f583e9a17222b
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
9 years agoFix use of qml versioning in qml
Alan Alpert [Tue, 17 Mar 2015 01:49:46 +0000 (18:49 -0700)]
Fix use of qml versioning in qml

The bumping of a version number shouldn't "unpublish" any types.

Change-Id: I01ceb70442cb6643478f75bb5729f3db7c989bfa
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
9 years agoMerge remote-tracking branch 'origin/5.5' into dev
Liang Qi [Tue, 17 Mar 2015 15:39:43 +0000 (16:39 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I9f4f561a6399b22c5f423dd853b07bffc9deebfc

9 years agoMerge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
Frederik Gladhorn [Tue, 17 Mar 2015 12:08:08 +0000 (12:08 +0000)]
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5

9 years agoUpdate Ecmascript testsuite submodule
Simon Hausmann [Tue, 17 Mar 2015 08:38:29 +0000 (09:38 +0100)]
Update Ecmascript testsuite submodule

Changed the url and sha1 to the new repository that lives next to qtdeclarative

Change-Id: I39dd50490c635e1a2858afc913cfcbbf10302fa1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
9 years agoTests: initialize pointer class member field.
Erik Verbruggen [Tue, 17 Mar 2015 08:52:26 +0000 (09:52 +0100)]
Tests: initialize pointer class member field.

'cause valgrind complained.

Change-Id: I9f18b3c8adaab8a893b8f6d685b19b2d042ccef7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoRepeater: Don't rely on the createFrom variable
Jørgen Lind [Wed, 11 Mar 2015 13:39:40 +0000 (14:39 +0100)]
Repeater: Don't rely on the createFrom variable

since this breaks for asynchronous models, because item creation order
is not guaranteed. We always have the index
for what item to create, so we do not need it either.

Change-Id: Ib8ce25ac342f5cce4784c56e6a91cf70136566b3
Task-number: QTBUG-38879
Task-number: QTBUG-39001
Task-number: QTBUG-44250
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
9 years agoMerge remote-tracking branch 'origin/5.5' into dev
Simon Hausmann [Tue, 17 Mar 2015 08:32:34 +0000 (09:32 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6

9 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Frederik Gladhorn [Tue, 17 Mar 2015 08:48:35 +0000 (09:48 +0100)]
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I4c338a44c1d64c2d8e637971ab3ec6982c40a685

9 years agoDon't limit to files ending with .qml
Kevin Ottens [Thu, 5 Mar 2015 10:46:46 +0000 (11:46 +0100)]
Don't limit to files ending with .qml

Especially useful when the program is invoked indirectly by a shell
running the QML file like an executable.
Such script executable often don't have an extension to make their
invocation look like that of binary executables.

[ChangeLog][QtQml] Make it possible to make script without .qml suffix

Change-Id: I5a569bdea185cfa60ce68afa27ae03278b1acdb8
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
9 years agoFix warning
Aleix Pol [Fri, 27 Feb 2015 15:39:21 +0000 (16:39 +0100)]
Fix warning

If the arguments of console.timeEnd are wrong, say it's timeEnd instead of
time.

Change-Id: Ida8a76cd452cf3aecc03e5064bbf213333d93a03
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
9 years agoFix usage of QtQmlDevTools private headers on OSX with framework builds
Simon Hausmann [Mon, 9 Mar 2015 15:39:32 +0000 (16:39 +0100)]
Fix usage of QtQmlDevTools private headers on OSX with framework builds

Previously this module borrowed its private headers from QtQml, so that
when writing QT += qmldevtools-private, you'd get the private headers from
QtQml. This doesn't work when QtQml is built as a framework.

A cleaner solution is to give this module its headers proper by letting
syncqt create the forwarding headers correctly (and consequently also
include them in make install). In order for this to work, the included
headers themselves cannot include any headers from QtQml, which this
patch also takes care of, through a centralized inclusion of qv4global_p.h.

Change-Id: I9bb8337956a2774cfaca6b338369face6c6ee785
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
9 years agoRemove QQmlDirParser from QtQmlDevTools
Simon Hausmann [Fri, 13 Mar 2015 11:47:16 +0000 (12:47 +0100)]
Remove QQmlDirParser from QtQmlDevTools

This class is not needed in the library.

Change-Id: Ie880086a849b62a2856d1f388a64d363b040cb56
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>