qt/qtdeclarative.git/examples, branch wip/webassembly Qt Declarative (Quick 2) Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly 2018-06-04T08:45:14+00:00 Morten Johan Sørvig morten.sorvig@qt.io 2018-06-04T08:45:14+00:00 3ca5f33c8b9c273f0169ec4c11417328f8071e97 Change-Id: I7556ac62fd8e1aeb99186c929f1225f02f9d2430 
Change-Id: I7556ac62fd8e1aeb99186c929f1225f02f9d2430
webassembly: fix for crash and assert on no thread and wasm builds 2018-05-14T08:22:47+00:00 Lorn Potter lorn.potter@gmail.com 2018-05-08T00:41:46+00:00 7e22af4bfdfd736e624321924eaae0e0d36940c7 This change requires moveToThread change in qtbase Change-Id: Idf35af4b416f577dabb91f749929dbfe5c88a0f0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> 
This change requires moveToThread change in qtbase

Change-Id: Idf35af4b416f577dabb91f749929dbfe5c88a0f0
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Clarify ownership around QQmlEngine::setNAMF 2018-04-26T19:55:13+00:00 Mårten Nordheim marten.nordheim@qt.io 2018-04-26T08:44:49+00:00 44e398f64ebe2841d5448076ed83f9886ab1b48f We were leaking an instance of MyNetworkAccessManagerFactory in the "NetworkAccessManagerFactory"-example. To add to this the documentation around QQmlEngine::setNetworkAccessManagerFactory did not specify whether or not it took ownership, causing confusion. Change-Id: Ic9eee2c45682c752bcb4aa98943fc0af2b630795 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> 
We were leaking an instance of MyNetworkAccessManagerFactory in the
"NetworkAccessManagerFactory"-example. To add to this the documentation
around QQmlEngine::setNetworkAccessManagerFactory did not specify
whether or not it took ownership, causing confusion.

Change-Id: Ic9eee2c45682c752bcb4aa98943fc0af2b630795
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Examples: remove bogus return 2018-04-03T12:36:21+00:00 J-P Nurmi jpnurmi@qt.io 2018-04-03T11:43:41+00:00 d2ed475b84d872181b872472c742297476c062c2 Change-Id: I653974c80c6767d9af95b9157a73c09dbdeb76cc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> 
Change-Id: I653974c80c6767d9af95b9157a73c09dbdeb76cc
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
rename containsMask to containmentMask 2018-02-27T14:00:24+00:00 Shawn Rutledge shawn.rutledge@qt.io 2018-02-26T07:02:39+00:00 6fa746fa61e35dc26e5286250ddc9488546f5b66 It was pointed out that containsMask sounds like it ought to be a boolean property. Change-Id: I2b56823b60d64f9903b0d5108c6428e691c09ed0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> 
It was pointed out that containsMask sounds like it ought to be a
boolean property.

Change-Id: I2b56823b60d64f9903b0d5108c6428e691c09ed0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
use the override keyword consistently and correctly (clang-tidy) 2018-02-27T08:27:38+00:00 Shawn Rutledge shawn.rutledge@qt.io 2018-02-26T16:34:27+00:00 e17c89f4ce74e5699ed50dc2187a39d8990316c4 Change-Id: If9e28d143f8cba3df3c757476b4f2265e2eb8b2a Reviewed-by: Johan Helsing <johan.helsing@qt.io> 
Change-Id: If9e28d143f8cba3df3c757476b4f2265e2eb8b2a
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
AnimatedSprite: set implicit size based on implicit frame size 2018-02-26T22:59:42+00:00 Mitch Curtis mitch.curtis@qt.io 2018-02-26T10:49:47+00:00 e41d067227eb6225b05df88ab724708588fa5304 By doing so, users no longer need to set an implicit or explicit size for AnimatedSprite. [ChangeLog][QtQuick][AnimatedSprite] AnimatedSprite's implicitWidth and implicitHeight are now based on frameWidth and frameHeight, respectively. This means it is no longer necessary to explicitly size AnimatedSprite. Task-number: QTBUG-36341 Change-Id: I3eb87e9b1c6bb93b3c667123c345341f34e2eee8 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> 
By doing so, users no longer need to set an implicit or explicit size
for AnimatedSprite.

[ChangeLog][QtQuick][AnimatedSprite] AnimatedSprite's implicitWidth and
implicitHeight are now based on frameWidth and frameHeight,
respectively. This means it is no longer necessary to explicitly size
AnimatedSprite.

Task-number: QTBUG-36341
Change-Id: I3eb87e9b1c6bb93b3c667123c345341f34e2eee8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
init variables where they are declared when possible (clang-tidy) 2018-02-26T13:08:30+00:00 Shawn Rutledge shawn.rutledge@qt.io 2018-02-21T10:52:59+00:00 06e962f263a86c4b66e1c6195b3d2615695fea1e clang-tidy -p compile_commands.json $file -checks='-*,modernize-use-default-member-init,readability-redundant-member-init' -config='{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: "1"}]}' -header-filter='qtdeclarative' -fix Change-Id: I705f3235ff129ba68b0d8dad54a083e29fcead5f Reviewed-by: Johan Helsing <johan.helsing@qt.io> 
clang-tidy -p compile_commands.json $file -checks='-*,modernize-use-default-member-init,readability-redundant-member-init'
 -config='{CheckOptions: [{key: modernize-use-default-member-init.UseAssignment, value: "1"}]}' -header-filter='qtdeclarative' -fix

Change-Id: I705f3235ff129ba68b0d8dad54a083e29fcead5f
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
use nullptr consistently (clang-tidy) 2018-02-26T07:13:18+00:00 Shawn Rutledge shawn.rutledge@qt.io 2018-02-21T09:41:54+00:00 499ec43937e926e4f2fa57a9baa455fcb3862262 From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> 
From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.

Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).

Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Merge remote-tracking branch 'origin/5.10' into 5.11 2018-02-12T15:31:13+00:00 Liang Qi liang.qi@qt.io 2018-02-12T12:26:55+00:00 4d525de33e2ee55e69bb6c90fc11049a0f8b36b5 Conflicts: src/imports/shapes/qquickshape.cpp src/imports/shapes/qquickshape_p_p.h src/qml/compiler/qqmlpropertycachecreator_p.h src/qml/jsruntime/qv4value_p.h src/quick/items/qquickloader_p.h tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp tools/qmlprofiler/qmlprofilerapplication.cpp Change-Id: Iafc66ae84bf78630ed72a986acb678e9d19e3a69 
 Conflicts:
	src/imports/shapes/qquickshape.cpp
	src/imports/shapes/qquickshape_p_p.h
	src/qml/compiler/qqmlpropertycachecreator_p.h
	src/qml/jsruntime/qv4value_p.h
	src/quick/items/qquickloader_p.h
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
	tools/qmlprofiler/qmlprofilerapplication.cpp

Change-Id: Iafc66ae84bf78630ed72a986acb678e9d19e3a69