qt/qtdeclarative.git/tests/testapplications, branch 5.7 Qt Declarative (Quick 2) Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-08T11:03:25+00:00 Liang Qi liang.qi@theqtcompany.com 2016-04-07T08:56:42+00:00 68ba8fe3ccf7abe8d24ba3614f8d7ceb3778de74 This change also fixes the build of two benchmarks, tst_affectors and tst_emission. Conflicts: src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro src/qml/qml/ftw/qhashfield_p.h tests/benchmarks/particles/affectors/tst_affectors.cpp tests/benchmarks/particles/emission/tst_emission.cpp tests/benchmarks/qml/pointers/pointers.pro tests/benchmarks/qml/pointers/tst_pointers.cpp tests/benchmarks/qml/qmltime/qmltime.pro tests/benchmarks/qml/qquickwindow/qquickwindow.pro Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2 
This change also fixes the build of two benchmarks, tst_affectors
and tst_emission.

Conflicts:
	src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
	src/qml/qml/ftw/qhashfield_p.h
	tests/benchmarks/particles/affectors/tst_affectors.cpp
	tests/benchmarks/particles/emission/tst_emission.cpp
	tests/benchmarks/qml/pointers/pointers.pro
	tests/benchmarks/qml/pointers/tst_pointers.cpp
	tests/benchmarks/qml/qmltime/qmltime.pro
	tests/benchmarks/qml/qquickwindow/qquickwindow.pro

Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
Purge sRGB chunks from PNG in tests. 2016-03-29T12:04:02+00:00 Edward Welbourne edward.welbourne@theqtcompany.com 2016-02-29T13:22:53+00:00 7d7e28ce112c2e3af5542dc1b025627340a5ba2d Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Various tools grumble about sRGB tables in PNG images; and our handling of them doesn't pay attention to these, so purging them makes the images smaller with no loss to the images. Change-Id: I9e4dc3aec97cd32bc8ac216fadeaf7669c49647c Reviewed-by: Robin Burchell <robin.burchell@viroteck.net> 
Subjects each *.png file that matched grep -law "sRGB" to:
pngcrush -ow -brute -rem allb -reduce

Various tools grumble about sRGB tables in PNG images; and our
handling of them doesn't pay attention to these, so purging them
makes the images smaller with no loss to the images.

Change-Id: I9e4dc3aec97cd32bc8ac216fadeaf7669c49647c
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Updated license headers 2016-01-20T11:46:25+00:00 Jani Heikkinen jani.heikkinen@theqtcompany.com 2016-01-19T11:23:05+00:00 38ec3bd755fd07ce860ef28c44f4c7148559de7c From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> 
From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/

Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one
(in those files which will be under GPL 3 with exceptions)

Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-17T08:48:36+00:00 Frederik Gladhorn frederik.gladhorn@theqtcompany.com 2015-03-17T08:48:35+00:00 8d5a2f2a81a001ff64e1a798dc34c61e9ad00b6d Change-Id: I4c338a44c1d64c2d8e637971ab3ec6982c40a685 
Change-Id: I4c338a44c1d64c2d8e637971ab3ec6982c40a685
Doc: Replace qt-project.org/doc with doc.qt.io 2015-03-05T07:07:28+00:00 Sergio Ahumada sahumada@blackberry.com 2015-03-04T22:00:59+00:00 65516b7f6cebcbce0db475d08f00f432b0f90c3b Change-Id: Ib693ac8d48ab943a3c26a49ab4fca91f0c5f0b0e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> 
Change-Id: Ib693ac8d48ab943a3c26a49ab4fca91f0c5f0b0e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Fixed license headers 2015-02-17T13:33:18+00:00 Jani Heikkinen jani.heikkinen@theqtcompany.com 2015-02-13T11:35:35+00:00 20c207815a0c942e1f66966cbeedcb0cd332e3b5 Change-Id: I4d5640ff95e1361ec7e65fb3e87d7726d8185ff5 Reviewed-by: Sergio Ahumada <sahumada@texla.cl> 
Change-Id: I4d5640ff95e1361ec7e65fb3e87d7726d8185ff5
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
Update copyright headers 2015-02-12T10:28:11+00:00 Jani Heikkinen jani.heikkinen@theqtcompany.com 2015-01-28T11:55:39+00:00 c5796292adf7cb7f2ce6f95fb83a9da89ecaa730 Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com> 
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
Change Qt bugtracker URL to qt.io 2014-12-16T10:35:55+00:00 Alex Blasche alexander.blasche@theqtcompany.com 2014-12-11T13:23:01+00:00 2a0d1cc3794394107652d979051cb050e4615a36 Change-Id: I3dde034b2a36c324df9f4e1fd2e05a07a7237c04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> 
Change-Id: I3dde034b2a36c324df9f4e1fd2e05a07a7237c04
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Update license headers and add new licenses 2014-08-25T09:28:46+00:00 Jani Heikkinen jani.heikkinen@digia.com 2014-08-22T06:13:59+00:00 e7ceacda70857f68a4c406c898bcd9b517ac1b43 - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> 
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
ListView: add support for "pull back" header & footer 2014-08-07T22:25:49+00:00 J-P Nurmi jpnurmi@digia.com 2014-03-03T14:53:27+00:00 ce5dff18b9a61707617080be7be0cd688996ad6f [ChangeLog][QtQuick][ListView] Introduced headerPositioning and footerPositioning properties to control whether header and footer are positioned inline, as overlays, or so that they slide away and can be pulled back regardless of the content position. Change-Id: Ifef1faf1ce6acf2b55cd1b6408e22ec2de841409 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> 
[ChangeLog][QtQuick][ListView] Introduced headerPositioning and
footerPositioning properties to control whether header and footer
are positioned inline, as overlays, or so that they slide away and
can be pulled back regardless of the content position.

Change-Id: Ifef1faf1ce6acf2b55cd1b6408e22ec2de841409
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>