Merge lp:~timo-jyrinki/ubuntu/saucy/qtdeclarative-opensource-src/merge_continued into lp:ubuntu/saucy/qtdeclarative-opensource-src

Proposed by Timo Jyrinki on 2013-07-08
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~timo-jyrinki/ubuntu/saucy/qtdeclarative-opensource-src/merge_continued
Merge into: lp:ubuntu/saucy/qtdeclarative-opensource-src
Diff against target: 885 lines (+510/-58)
12 files modified
.pc/applied-patches (+2/-0)
debian/changelog (+83/-0)
debian/control (+52/-29)
debian/copyright (+42/-2)
debian/patches/0b190b7114c816689eeb8478ea5151732bc7a5de_backport.patch (+112/-0)
debian/patches/81a9dd71b9ce60ab4cae629b67d6f26ebdeb19db_backport.patch (+169/-0)
debian/patches/series (+2/-0)
debian/qtdeclarative5-doc-html.install (+2/-0)
debian/qtdeclarative5-doc.install (+2/-0)
debian/rules (+12/-6)
src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp (+24/-15)
src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h (+8/-6)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu/saucy/qtdeclarative-opensource-src/merge_continued
Reviewer Review Type Date Requested Status
Ubuntu branches 2013-07-08 Pending
Review via email: mp+173448@code.launchpad.net

Commit message

Merge from Debian, started by me and continued by Dmitry Shachnev. This is needed to unblock landing of qtdoc package. Additionally two patches added to fix LP: #1198830

Description of the change

Continuation from https://code.launchpad.net/~mitya57/ubuntu/saucy/qtdeclarative-opensource-src/merge/+merge/172054 with two patches added.

Orig description there:
---
This is a merge from Debian, started by Timo and finished by me. This is needed to unblock landing of new qtdoc package.

The only difference from what is in bzr now is a "dch -r" call.
---

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2013-06-20 15:24:17 +0000
3+++ .pc/applied-patches 2013-07-08 09:40:35 +0000
4@@ -4,4 +4,6 @@
5 04_9d6cd72353e4862592c016951810abf9a7ab8079_backport.patch
6 8a3d48915c29484c9ffb2fb8f0e3b569a9fe9b44_backport.patch
7 0001-Fallback-to-QMetaObject-for-properties-not-in-QQmlPr.patch
8+0b190b7114c816689eeb8478ea5151732bc7a5de_backport.patch
9+81a9dd71b9ce60ab4cae629b67d6f26ebdeb19db_backport.patch
10 rendering_performance_fix_lp1092358.patch
11
12=== modified file 'debian/changelog'
13--- debian/changelog 2013-06-20 15:24:17 +0000
14+++ debian/changelog 2013-07-08 09:40:35 +0000
15@@ -1,3 +1,86 @@
16+qtdeclarative-opensource-src (5.0.2-6ubuntu1) saucy; urgency=low
17+
18+ [ Timo Jyrinki ]
19+ * Resync with Debian, remaining changes:
20+ - Keep cherry-picked patches, and symbols
21+ - Keep debian/patches/rendering_performance_fix_lp1092358.patch
22+ - Add Vcs-Bzr field
23+ * Fix https://bugreports.qt-project.org/browse/QTBUG-30246 (LP: #1198830)
24+ - debian/patches/0b190b7114c816689eeb8478ea5151732bc7a5de_backport.patch
25+ - debian/patches/81a9dd71b9ce60ab4cae629b67d6f26ebdeb19db_backport.patch
26+
27+ [ Dmitry Shachnev ]
28+ * Merge with Debian 5.0.2-6 to bring in documentation packages.
29+ * Note: architecture restrictions have been dropped from this upload,
30+ as requested by the Release Team.
31+
32+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Mon, 08 Jul 2013 07:51:02 +0300
33+
34+qtdeclarative-opensource-src (5.0.2-6) experimental; urgency=low
35+
36+ * Update symbols files.
37+
38+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Wed, 26 Jun 2013 18:29:51 -0300
39+
40+qtdeclarative-opensource-src (5.0.2-5) experimental; urgency=low
41+
42+ [ Lisandro Damián Nicanor Pérez Meyer ]
43+ * Make every package that ships a binary managed by qtchooser depend on it.
44+ * Build the documentation shipped with this submodule as a build-indep task:
45+ - Add the necessary indep build dependencies:
46+ * qttools5-dev-tools to use qhelpgenerator.
47+ * libqt5sql5-sqlite to generate qch doc.
48+ - Build and create packages for qch and HTML doc formats.
49+ * Update symbols files.
50+ * Set qtdeclarative5-dbg as M-A same, so it can be coinstalled with other
51+ archs debugging symbols.
52+
53+ [ Timo Jyrinki ]
54+ * Depend on libgl1-mesa-dri from the qtquick2 QML plugin
55+ - Not depending may cause crashes due to lack of VBO support
56+ (https://bugs.launchpad.net/bugs/1176199)
57+
58+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Wed, 19 Jun 2013 21:33:20 -0300
59+
60+qtdeclarative-opensource-src (5.0.2-4) experimental; urgency=low
61+
62+ [ Pino Toscano ]
63+ * debian/control: remove extra ${misc:Pre-Depends} from qmlscene and
64+ qtdeclarative5-dev-tools.
65+ * Update symbols files.
66+ * Fix Vcs-* headers.
67+
68+ [ Lisandro Damián Nicanor Pérez Meyer ]
69+ * Update symbols with amd64 build.
70+
71+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Sat, 18 May 2013 21:25:40 -0300
72+
73+qtdeclarative-opensource-src (5.0.2-3) experimental; urgency=low
74+
75+ [ Pino Toscano ]
76+ * Update symbols files.
77+
78+ [ Lisandro Damián Nicanor Pérez Meyer ]
79+ * Update symbols files.
80+
81+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Mon, 06 May 2013 14:53:19 -0300
82+
83+qtdeclarative-opensource-src (5.0.2-2) experimental; urgency=low
84+
85+ [ Lisandro Damián Nicanor Pérez Meyer ]
86+ * Fix wrong permissions of examples.
87+
88+ [ Pino Toscano ]
89+ * Update symbols files.
90+ * qtdeclarative5-localstorage-plugin: depend on libqt5sql5-sqlite, as it is
91+ used directly.
92+ * Remove extra ${shlibs:Depends} from qtdeclarative5-private-dev.
93+ * Bump the libqt5v8-5-private-dev and libqt5xmlpatterns5-private-dev build
94+ dependencies to 5.0.2~.
95+ * rules: use $(DEB_HOST_MULTIARCH) everywhere.
96+
97+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Tue, 30 Apr 2013 20:45:49 -0300
98+
99 qtdeclarative-opensource-src (5.0.2-1ubuntu2) saucy; urgency=low
100
101 [ Timo Jyrinki ]
102
103=== modified file 'debian/control'
104--- debian/control 2013-04-29 16:27:13 +0000
105+++ debian/control 2013-07-08 09:40:35 +0000
106@@ -11,18 +11,20 @@
107 Timo Jyrinki <timo@debian.org>
108 Build-Depends: debhelper (>= 9),
109 dpkg-dev (>= 1.16.1),
110- libqt5v8-5-private-dev (>= 5.0.1~),
111- libqt5xmlpatterns5-private-dev (>= 5.0.1~),
112+ libqt5v8-5-private-dev (>= 5.0.2~),
113+ libqt5xmlpatterns5-private-dev (>= 5.0.2~),
114 pkg-kde-tools,
115 qtbase5-private-dev (>= 5.0.2~)
116+Build-Depends-Indep: libqt5sql5-sqlite,
117+ qttools5-dev-tools (>= 5.0.2~)
118 Standards-Version: 3.9.4
119 Homepage: http://qt-project.org/
120-Vcs-Git: git://git.debian.org/pkg-kde/qt/qtdeclarative.git
121-Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=summary
122+Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtdeclarative.git
123+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtdeclarative.git;a=summary
124 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src
125
126 Package: libqt5qml5
127-Architecture: amd64 i386 armhf
128+Architecture: any
129 Multi-Arch: same
130 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
131 Depends: ${misc:Depends}, ${shlibs:Depends}
132@@ -37,7 +39,7 @@
133 QML code with JavaScript and C++.
134
135 Package: libqt5quick5
136-Architecture: amd64 i386 armhf
137+Architecture: any
138 Multi-Arch: same
139 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
140 Depends: ${misc:Depends}, ${shlibs:Depends}
141@@ -51,7 +53,7 @@
142 boxes and other portable devices.
143
144 Package: libqt5quickparticles5
145-Architecture: amd64 i386 armhf
146+Architecture: any
147 Multi-Arch: same
148 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
149 Depends: ${misc:Depends}, ${shlibs:Depends}
150@@ -62,7 +64,7 @@
151 This package contains the Qt Quick Particles support library.
152
153 Package: libqt5quicktest5
154-Architecture: amd64 i386 armhf
155+Architecture: any
156 Multi-Arch: same
157 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
158 Depends: ${misc:Depends}, ${shlibs:Depends}
159@@ -73,7 +75,7 @@
160 This package contains the Qt Quick Test library for QtDeclarative module.
161
162 Package: qtdeclarative5-folderlistmodel-plugin
163-Architecture: amd64 i386 armhf
164+Architecture: any
165 Multi-Arch: same
166 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
167 Depends: ${misc:Depends}, ${shlibs:Depends}
168@@ -84,10 +86,10 @@
169 The FolderListModel provides a model of the contents of a file system folder.
170
171 Package: qtdeclarative5-localstorage-plugin
172-Architecture: amd64 i386 armhf
173+Architecture: any
174 Multi-Arch: same
175 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
176-Depends: ${misc:Depends}, ${shlibs:Depends}
177+Depends: ${misc:Depends}, ${shlibs:Depends}, libqt5sql5-sqlite
178 Description: Qt 5 localstorage QML plugin
179 Qt is a cross-platform C++ application framework. Qt's primary feature
180 is its rich set of widgets that provide standard GUI functionality.
181@@ -95,7 +97,7 @@
182 This is a singleton type for reading and writing to SQLite databases.
183
184 Package: qtdeclarative5-particles-plugin
185-Architecture: amd64 i386 armhf
186+Architecture: any
187 Multi-Arch: same
188 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
189 Depends: ${misc:Depends}, ${shlibs:Depends}
190@@ -106,7 +108,7 @@
191 This QML module contains a particle system for Qt Quick.
192
193 Package: qtdeclarative5-qtquick2-plugin
194-Architecture: amd64 i386 armhf
195+Architecture: any
196 Multi-Arch: same
197 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
198 Depends: libgl1-mesa-dri, ${misc:Depends}, ${shlibs:Depends}
199@@ -117,7 +119,7 @@
200 This package contains the Qt Quick 2 QML plugin for Qt declarative.
201
202 Package: qtdeclarative5-test-plugin
203-Architecture: amd64 i386 armhf
204+Architecture: any
205 Multi-Arch: same
206 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
207 Depends: ${misc:Depends}, ${shlibs:Depends}
208@@ -128,7 +130,7 @@
209 This package contains the test QML plugin for Qt declarative.
210
211 Package: qtdeclarative5-window-plugin
212-Architecture: amd64 i386 armhf
213+Architecture: any
214 Multi-Arch: same
215 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
216 Depends: ${misc:Depends}, ${shlibs:Depends}
217@@ -140,7 +142,7 @@
218 accessing screen information.
219
220 Package: qtdeclarative5-xmllistmodel-plugin
221-Architecture: amd64 i386 armhf
222+Architecture: any
223 Multi-Arch: same
224 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
225 Depends: ${misc:Depends}, ${shlibs:Depends}
226@@ -152,7 +154,7 @@
227
228 Package: qtdeclarative5-dev
229 Section: libdevel
230-Architecture: amd64 i386 armhf
231+Architecture: any
232 Pre-Depends: dpkg (>= 1.15.6~)
233 Depends: libqt5qml5 (= ${binary:Version}),
234 libqt5quick5 (= ${binary:Version}),
235@@ -168,12 +170,11 @@
236 Qt 5 applications using Qt 5 declarative headers.
237
238 Package: qtdeclarative5-private-dev
239-Architecture: amd64 i386 armhf
240+Architecture: any
241 Section: libdevel
242 Pre-Depends: dpkg (>= 1.15.6~)
243 Depends: qtdeclarative5-dev (= ${binary:Version}),
244 ${misc:Depends},
245- ${shlibs:Depends}
246 Description: Qt 5 declarative private development files
247 Qt is a cross-platform C++ application framework. Qt's primary feature
248 is its rich set of widgets that provide standard GUI functionality.
249@@ -184,12 +185,11 @@
250 Use at your own risk.
251
252 Package: qtdeclarative5-dev-tools
253-Architecture: amd64 i386 armhf
254+Architecture: any
255 Multi-Arch: foreign
256 Section: devel
257-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
258-Depends: ${misc:Depends}, ${shlibs:Depends}
259-Recommends: qtchooser
260+Pre-Depends: dpkg (>= 1.15.6~)
261+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
262 Description: Qt 5 declarative development programs
263 Qt is a cross-platform C++ application framework. Qt's primary feature
264 is its rich set of widgets that provide standard GUI functionality.
265@@ -198,12 +198,11 @@
266 declarative applications.
267
268 Package: qmlscene
269-Architecture: amd64 i386 armhf
270+Architecture: any
271 Multi-Arch: foreign
272 Section: devel
273-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
274-Depends: ${misc:Depends}, ${shlibs:Depends}
275-Recommends: qtchooser
276+Pre-Depends: dpkg (>= 1.15.6~)
277+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
278 Description: Qt 5 QML scene viewer
279 Qt is a cross-platform C++ application framework. Qt's primary feature
280 is its rich set of widgets that provide standard GUI functionality.
281@@ -211,7 +210,7 @@
282 This package contains the QML viewer for Qt Quick 2.
283
284 Package: qtdeclarative5-examples
285-Architecture: amd64 i386 armhf
286+Architecture: any
287 Multi-Arch: same
288 Section: x11
289 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
290@@ -224,7 +223,8 @@
291
292 Package: qtdeclarative5-dbg
293 Priority: extra
294-Architecture: amd64 i386 armhf
295+Architecture: any
296+Multi-Arch: same
297 Section: debug
298 Pre-Depends: dpkg (>= 1.15.6~)
299 Depends: libqt5qml5 (= ${binary:Version}),
300@@ -239,3 +239,26 @@
301 is its rich set of widgets that provide standard GUI functionality.
302 .
303 This package contains the debugging symbols for the Qt 5 declarative libraries.
304+
305+Package: qtdeclarative5-doc
306+Priority: extra
307+Architecture: all
308+Section: doc
309+Depends: ${misc:Depends}
310+Description: Qt 5 declarative documentation
311+ Qt is a cross-platform C++ application framework. Qt's primary feature
312+ is its rich set of widgets that provide standard GUI functionality.
313+ .
314+ This package contains the documentation for the Qt 5 declarative libraries.
315+
316+Package: qtdeclarative5-doc-html
317+Priority: extra
318+Architecture: all
319+Section: doc
320+Depends: ${misc:Depends}
321+Description: Qt 5 declarative HTML documentation
322+ Qt is a cross-platform C++ application framework. Qt's primary feature
323+ is its rich set of widgets that provide standard GUI functionality.
324+ .
325+ This package contains the HTML documentation for the Qt 5 declarative
326+ libraries.
327
328=== modified file 'debian/copyright'
329--- debian/copyright 2013-04-29 16:27:13 +0000
330+++ debian/copyright 2013-07-08 09:40:35 +0000
331@@ -17,8 +17,48 @@
332 2012-2013 Timo Jyrinki <timo.jyrinki@canonical.com>
333 License: LGPL-2.1
334
335-Files: examples/* src/qml/doc/snippets/* src/quick/doc/snippets/* tests/auto/qmltest/listview/tst_listview.qml tests/auto/qmltest/listview/tst_listview.qml tests/auto/qmltest/image/tst_image.qml tests/auto/qmltest/image/tst_image.qml tests/auto/qmltest/text/tst_text.qml tests/auto/qmltest/text/tst_text.qml tests/auto/qmltest/animatedimage/tst_animatedimage.qml tests/auto/qmltest/animatedimage/tst_animatedimage.qml tests/auto/qmltest/gradient/tst_gradient.qml tests/auto/qmltest/gradient/tst_gradient.qml tests/auto/qmltest/textinput/tst_textinput.qml tests/auto/qmltest/textinput/tst_textinput.qml tests/auto/qmltest/rectangle/tst_rectangle.qml tests/auto/qmltest/rectangle/tst_rectangle.qml tests/auto/qmltest/textedit/tst_textedit.qml tests/auto/qmltest/textedit/tst_textedit.qml tests/auto/qmltest/listmodel/tst_listmodel.qml tests/auto/qmltest/listmodel/tst_listmodel.qml tests/auto/qmltest/fontloader/tst_fontloader.qml tests/auto/qmltest/fontloader/tst_fontloader.qml tests/benchmarks/qml/holistic/data/
336-largeTargets/gridview-example.qml tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml tests/testapplications/listview/sections.qml tests/testapplications/listview/sections.qml tests/testapplications/listview/onRemove.qml tests/testapplications/listview/onRemove.qml tests/testapplications/listview/alteredViews.qml tests/testapplications/listview/alteredViews.qml tests/testapplications/listview/viewTransitions.qml tests/testapplications/listview/viewTransitions.qml tests/testapplications/animatedsprite/animatedsprite.qml tests/testapplications/animatedsprite/animatedsprite.qml tests/testapplications/animatedsprite/animatedspriteadvance.qml tests/testapplications/animatedsprite/animatedspriteadvance.qml
337+Files: examples/*
338+ src/qml/doc/snippets/*
339+ src/quick/doc/snippets/*
340+ tests/auto/qmltest/listview/tst_listview.qml
341+ tests/auto/qmltest/listview/tst_listview.qml
342+ tests/auto/qmltest/image/tst_image.qml
343+ tests/auto/qmltest/image/tst_image.qml
344+ tests/auto/qmltest/text/tst_text.qml
345+ tests/auto/qmltest/text/tst_text.qml
346+ tests/auto/qmltest/animatedimage/tst_animatedimage.qml
347+ tests/auto/qmltest/animatedimage/tst_animatedimage.qml
348+ tests/auto/qmltest/gradient/tst_gradient.qml
349+ tests/auto/qmltest/gradient/tst_gradient.qml
350+ tests/auto/qmltest/textinput/tst_textinput.qml
351+ tests/auto/qmltest/textinput/tst_textinput.qml
352+ tests/auto/qmltest/rectangle/tst_rectangle.qml
353+ tests/auto/qmltest/rectangle/tst_rectangle.qml
354+ tests/auto/qmltest/textedit/tst_textedit.qml
355+ tests/auto/qmltest/textedit/tst_textedit.qml
356+ tests/auto/qmltest/listmodel/tst_listmodel.qml
357+ tests/auto/qmltest/listmodel/tst_listmodel.qml
358+ tests/auto/qmltest/fontloader/tst_fontloader.qml
359+ tests/auto/qmltest/fontloader/tst_fontloader.qml
360+ tests/benchmarks/qml/holistic/data/
361+ largeTargets/gridview-example.qml
362+ tests/benchmarks/qml/holistic/data/largeTargets/gridview-example.qml
363+ tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
364+ tests/benchmarks/qml/holistic/data/largeTargets/mousearea-example.qml
365+ tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml
366+ tests/benchmarks/qml/holistic/data/largeTargets/layoutdirection.qml
367+ tests/testapplications/listview/sections.qml
368+ tests/testapplications/listview/sections.qml
369+ tests/testapplications/listview/onRemove.qml
370+ tests/testapplications/listview/onRemove.qml
371+ tests/testapplications/listview/alteredViews.qml
372+ tests/testapplications/listview/alteredViews.qml
373+ tests/testapplications/listview/viewTransitions.qml
374+ tests/testapplications/listview/viewTransitions.qml
375+ tests/testapplications/animatedsprite/animatedsprite.qml
376+ tests/testapplications/animatedsprite/animatedsprite.qml
377+ tests/testapplications/animatedsprite/animatedspriteadvance.qml
378+ tests/testapplications/animatedsprite/animatedspriteadvance.qml
379 Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
380 License: BSD-3-clause
381
382
383=== added file 'debian/patches/0b190b7114c816689eeb8478ea5151732bc7a5de_backport.patch'
384--- debian/patches/0b190b7114c816689eeb8478ea5151732bc7a5de_backport.patch 1970-01-01 00:00:00 +0000
385+++ debian/patches/0b190b7114c816689eeb8478ea5151732bc7a5de_backport.patch 2013-07-08 09:40:35 +0000
386@@ -0,0 +1,112 @@
387+From 0b190b7114c816689eeb8478ea5151732bc7a5de Mon Sep 17 00:00:00 2001
388+From: Yoann Lopes <yoann.lopes@digia.com>
389+Date: Thu, 21 Mar 2013 16:34:38 +0100
390+Subject: [PATCH] Fixed distance field text when using non-opaque colors.
391+
392+The alpha has to be premultiplied before passing the color to the
393+shader.
394+
395+Change-Id: If22f0e0892eb4330d5f7398bea2710fce18c4dcb
396+Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
397+---
398+ .../scenegraph/qsgdistancefieldglyphnode_p.cpp | 24 ++++++++++++++++---
399+ .../scenegraph/qsgdistancefieldglyphnode_p_p.h | 6 +++-
400+ 2 files changed, 24 insertions(+), 6 deletions(-)
401+
402+diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
403+index 45fc0f5..86c3356 100644
404+--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
405++++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
406+@@ -144,8 +144,8 @@ void QSGDistanceFieldTextMaterialShader::updateState(const RenderState &state, Q
407+ if (oldMaterial == 0
408+ || material->color() != oldMaterial->color()
409+ || state.isOpacityDirty()) {
410+- QVector4D color(material->color().redF(), material->color().greenF(),
411+- material->color().blueF(), material->color().alphaF());
412++ QColor c = material->color();
413++ QVector4D color(c.redF(), c.greenF(), c.blueF(), c.alphaF());
414+ color *= state.opacity();
415+ program()->setUniformValue(m_color_id, color);
416+ }
417+@@ -204,6 +204,14 @@ QSGMaterialType *QSGDistanceFieldTextMaterial::type() const
418+ return &type;
419+ }
420+
421++void QSGDistanceFieldTextMaterial::setColor(const QColor &color)
422++{
423++ m_color = QColor::fromRgbF(color.redF() * color.alphaF(),
424++ color.greenF() * color.alphaF(),
425++ color.blueF() * color.alphaF(),
426++ color.alphaF());
427++}
428++
429+ QSGMaterialShader *QSGDistanceFieldTextMaterial::createShader() const
430+ {
431+ return new QSGDistanceFieldTextMaterialShader;
432+@@ -276,8 +284,8 @@ void DistanceFieldStyledTextMaterialShader::updateState(const RenderState &state
433+ if (oldMaterial == 0
434+ || material->styleColor() != oldMaterial->styleColor()
435+ || (state.isOpacityDirty())) {
436+- QVector4D color(material->styleColor().redF(), material->styleColor().greenF(),
437+- material->styleColor().blueF(), material->styleColor().alphaF());
438++ QColor c = material->styleColor();
439++ QVector4D color(c.redF(), c.greenF(), c.blueF(), c.alphaF());
440+ color *= state.opacity();
441+ program()->setUniformValue(m_styleColor_id, color);
442+ }
443+@@ -292,6 +300,14 @@ QSGDistanceFieldStyledTextMaterial::~QSGDistanceFieldStyledTextMaterial()
444+ {
445+ }
446+
447++void QSGDistanceFieldStyledTextMaterial::setStyleColor(const QColor &color)
448++{
449++ m_styleColor = QColor::fromRgbF(color.redF() * color.alphaF(),
450++ color.greenF() * color.alphaF(),
451++ color.blueF() * color.alphaF(),
452++ color.alphaF());
453++}
454++
455+ int QSGDistanceFieldStyledTextMaterial::compare(const QSGMaterial *o) const
456+ {
457+ Q_ASSERT(o && type() == o->type());
458+diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
459+index d6aa38a..7fea8f6 100644
460+--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
461++++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
462+@@ -58,7 +58,7 @@ public:
463+ virtual QSGMaterialShader *createShader() const;
464+ virtual int compare(const QSGMaterial *other) const;
465+
466+- void setColor(const QColor &color) { m_color = color; }
467++ virtual void setColor(const QColor &color);
468+ const QColor &color() const { return m_color; }
469+
470+ void setGlyphCache(QSGDistanceFieldGlyphCache *a) { m_glyph_cache = a; }
471+@@ -92,7 +92,7 @@ public:
472+ virtual QSGMaterialShader *createShader() const = 0;
473+ virtual int compare(const QSGMaterial *other) const;
474+
475+- void setStyleColor(const QColor &color) { m_styleColor = color; }
476++ void setStyleColor(const QColor &color);
477+ const QColor &styleColor() const { return m_styleColor; }
478+
479+ protected:
480+@@ -130,6 +130,7 @@ class Q_QUICK_PRIVATE_EXPORT QSGHiQSubPixelDistanceFieldTextMaterial : public QS
481+ public:
482+ virtual QSGMaterialType *type() const;
483+ virtual QSGMaterialShader *createShader() const;
484++ void setColor(const QColor &color) { m_color = color; }
485+ };
486+
487+ class Q_QUICK_PRIVATE_EXPORT QSGLoQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial
488+@@ -137,6 +138,7 @@ class Q_QUICK_PRIVATE_EXPORT QSGLoQSubPixelDistanceFieldTextMaterial : public QS
489+ public:
490+ virtual QSGMaterialType *type() const;
491+ virtual QSGMaterialShader *createShader() const;
492++ void setColor(const QColor &color) { m_color = color; }
493+ };
494+
495+ QT_END_NAMESPACE
496+--
497+1.7.1
498+
499
500=== added file 'debian/patches/81a9dd71b9ce60ab4cae629b67d6f26ebdeb19db_backport.patch'
501--- debian/patches/81a9dd71b9ce60ab4cae629b67d6f26ebdeb19db_backport.patch 1970-01-01 00:00:00 +0000
502+++ debian/patches/81a9dd71b9ce60ab4cae629b67d6f26ebdeb19db_backport.patch 2013-07-08 09:40:35 +0000
503@@ -0,0 +1,169 @@
504+From 81a9dd71b9ce60ab4cae629b67d6f26ebdeb19db Mon Sep 17 00:00:00 2001
505+From: Gunnar Sletta <gunnar.sletta@digia.com>
506+Date: Sat, 18 May 2013 08:24:45 +0200
507+Subject: [PATCH] Avoid using QColor::xxxF functions.
508+
509+In our usecase, the color is always used as a float so using QColor
510+(which is ushort) internally adds a lot of pointless conversion.
511+Enough so that it shows up in profiles as 1-2% each. Not a lot,
512+but easy to fix.
513+
514+The compare function is also somewhat simplified. For colors we're
515+primarily searching for equallity. If that fails, we just need to
516+provide consistent values, so use the address instead of doing
517+any fancy calculation.
518+
519+Change-Id: Icae7e78ed767e802c137bab7fcacff66e9a4bc66
520+Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
521+---
522+ .../scenegraph/qsgdistancefieldglyphnode_p.cpp | 39 ++++++++------------
523+ .../scenegraph/qsgdistancefieldglyphnode_p_p.h | 12 +++---
524+ 2 files changed, 22 insertions(+), 29 deletions(-)
525+
526+diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
527+index 86c3356..bdbce61 100644
528+--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
529++++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
530+@@ -144,8 +144,7 @@ void QSGDistanceFieldTextMaterialShader::updateState(const RenderState &state, Q
531+ if (oldMaterial == 0
532+ || material->color() != oldMaterial->color()
533+ || state.isOpacityDirty()) {
534+- QColor c = material->color();
535+- QVector4D color(c.redF(), c.greenF(), c.blueF(), c.alphaF());
536++ QVector4D color = material->color();
537+ color *= state.opacity();
538+ program()->setUniformValue(m_color_id, color);
539+ }
540+@@ -206,10 +205,10 @@ QSGMaterialType *QSGDistanceFieldTextMaterial::type() const
541+
542+ void QSGDistanceFieldTextMaterial::setColor(const QColor &color)
543+ {
544+- m_color = QColor::fromRgbF(color.redF() * color.alphaF(),
545+- color.greenF() * color.alphaF(),
546+- color.blueF() * color.alphaF(),
547+- color.alphaF());
548++ m_color = QVector4D(color.redF() * color.alphaF(),
549++ color.greenF() * color.alphaF(),
550++ color.blueF() * color.alphaF(),
551++ color.alphaF());
552+ }
553+
554+ QSGMaterialShader *QSGDistanceFieldTextMaterial::createShader() const
555+@@ -239,10 +238,8 @@ int QSGDistanceFieldTextMaterial::compare(const QSGMaterial *o) const
556+ if (m_fontScale != other->m_fontScale) {
557+ return int(other->m_fontScale < m_fontScale) - int(m_fontScale < other->m_fontScale);
558+ }
559+- QRgb c1 = m_color.rgba();
560+- QRgb c2 = other->m_color.rgba();
561+- if (c1 != c2)
562+- return int(c2 < c1) - int(c1 < c2);
563++ if (m_color != other->m_color)
564++ return &m_color < &other->m_color ? -1 : 1;
565+ int t0 = m_texture ? m_texture->textureId : -1;
566+ int t1 = other->m_texture ? other->m_texture->textureId : -1;
567+ return t0 - t1;
568+@@ -284,8 +281,7 @@ void DistanceFieldStyledTextMaterialShader::updateState(const RenderState &state
569+ if (oldMaterial == 0
570+ || material->styleColor() != oldMaterial->styleColor()
571+ || (state.isOpacityDirty())) {
572+- QColor c = material->styleColor();
573+- QVector4D color(c.redF(), c.greenF(), c.blueF(), c.alphaF());
574++ QVector4D color = material->styleColor();
575+ color *= state.opacity();
576+ program()->setUniformValue(m_styleColor_id, color);
577+ }
578+@@ -302,21 +298,18 @@ QSGDistanceFieldStyledTextMaterial::~QSGDistanceFieldStyledTextMaterial()
579+
580+ void QSGDistanceFieldStyledTextMaterial::setStyleColor(const QColor &color)
581+ {
582+- m_styleColor = QColor::fromRgbF(color.redF() * color.alphaF(),
583+- color.greenF() * color.alphaF(),
584+- color.blueF() * color.alphaF(),
585+- color.alphaF());
586++ m_styleColor = QVector4D(color.redF() * color.alphaF(),
587++ color.greenF() * color.alphaF(),
588++ color.blueF() * color.alphaF(),
589++ color.alphaF());
590+ }
591+
592+ int QSGDistanceFieldStyledTextMaterial::compare(const QSGMaterial *o) const
593+ {
594+ Q_ASSERT(o && type() == o->type());
595+ const QSGDistanceFieldStyledTextMaterial *other = static_cast<const QSGDistanceFieldStyledTextMaterial *>(o);
596+- if (m_styleColor != other->m_styleColor) {
597+- QRgb c1 = m_styleColor.rgba();
598+- QRgb c2 = other->m_styleColor.rgba();
599+- return int(c2 < c1) - int(c1 < c2);
600+- }
601++ if (m_styleColor != other->m_color)
602++ return &m_styleColor < &other->m_styleColor ? -1 : 1;
603+ return QSGDistanceFieldTextMaterial::compare(o);
604+ }
605+
606+@@ -657,8 +650,8 @@ void QSGHiQSubPixelDistanceFieldTextMaterialShader::updateState(const RenderStat
607+ QSGDistanceFieldTextMaterial *oldMaterial = static_cast<QSGDistanceFieldTextMaterial *>(oldEffect);
608+
609+ if (oldMaterial == 0 || material->color() != oldMaterial->color()) {
610+- QColor c = material->color();
611+- state.context()->functions()->glBlendColor(c.redF(), c.greenF(), c.blueF(), 1.0f);
612++ QVector4D c = material->color();
613++ state.context()->functions()->glBlendColor(c.x(), c.y(), c.z(), 1.0f);
614+ }
615+
616+ if (oldMaterial == 0 || material->fontScale() != oldMaterial->fontScale())
617+diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
618+index 7fea8f6..54d4146 100644
619+--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
620++++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h
621+@@ -59,7 +59,7 @@ public:
622+ virtual int compare(const QSGMaterial *other) const;
623+
624+ virtual void setColor(const QColor &color);
625+- const QColor &color() const { return m_color; }
626++ const QVector4D &color() const { return m_color; }
627+
628+ void setGlyphCache(QSGDistanceFieldGlyphCache *a) { m_glyph_cache = a; }
629+ QSGDistanceFieldGlyphCache *glyphCache() const { return m_glyph_cache; }
630+@@ -76,7 +76,7 @@ public:
631+
632+ protected:
633+ QSize m_size;
634+- QColor m_color;
635++ QVector4D m_color;
636+ QSGDistanceFieldGlyphCache *m_glyph_cache;
637+ const QSGDistanceFieldGlyphCache::Texture *m_texture;
638+ qreal m_fontScale;
639+@@ -93,10 +93,10 @@ public:
640+ virtual int compare(const QSGMaterial *other) const;
641+
642+ void setStyleColor(const QColor &color);
643+- const QColor &styleColor() const { return m_styleColor; }
644++ const QVector4D &styleColor() const { return m_styleColor; }
645+
646+ protected:
647+- QColor m_styleColor;
648++ QVector4D m_styleColor;
649+ };
650+
651+ class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldOutlineTextMaterial : public QSGDistanceFieldStyledTextMaterial
652+@@ -130,7 +130,7 @@ class Q_QUICK_PRIVATE_EXPORT QSGHiQSubPixelDistanceFieldTextMaterial : public QS
653+ public:
654+ virtual QSGMaterialType *type() const;
655+ virtual QSGMaterialShader *createShader() const;
656+- void setColor(const QColor &color) { m_color = color; }
657++ void setColor(const QColor &color) { m_color = QVector4D(color.redF(), color.greenF(), color.blueF(), color.alphaF()); }
658+ };
659+
660+ class Q_QUICK_PRIVATE_EXPORT QSGLoQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial
661+@@ -138,7 +138,7 @@ class Q_QUICK_PRIVATE_EXPORT QSGLoQSubPixelDistanceFieldTextMaterial : public QS
662+ public:
663+ virtual QSGMaterialType *type() const;
664+ virtual QSGMaterialShader *createShader() const;
665+- void setColor(const QColor &color) { m_color = color; }
666++ void setColor(const QColor &color) { m_color = QVector4D(color.redF(), color.greenF(), color.blueF(), color.alphaF()); }
667+ };
668+
669+ QT_END_NAMESPACE
670+--
671+1.7.1
672+
673
674=== modified file 'debian/patches/series'
675--- debian/patches/series 2013-06-20 15:24:17 +0000
676+++ debian/patches/series 2013-07-08 09:40:35 +0000
677@@ -5,6 +5,8 @@
678 04_9d6cd72353e4862592c016951810abf9a7ab8079_backport.patch
679 8a3d48915c29484c9ffb2fb8f0e3b569a9fe9b44_backport.patch
680 0001-Fallback-to-QMetaObject-for-properties-not-in-QQmlPr.patch
681+0b190b7114c816689eeb8478ea5151732bc7a5de_backport.patch
682+81a9dd71b9ce60ab4cae629b67d6f26ebdeb19db_backport.patch
683
684 # ubuntu
685 rendering_performance_fix_lp1092358.patch
686
687=== added file 'debian/qtdeclarative5-doc-html.install'
688--- debian/qtdeclarative5-doc-html.install 1970-01-01 00:00:00 +0000
689+++ debian/qtdeclarative5-doc-html.install 2013-07-08 09:40:35 +0000
690@@ -0,0 +1,2 @@
691+usr/share/qt5/doc/qtqml/
692+usr/share/qt5/doc/qtquick/
693
694=== added file 'debian/qtdeclarative5-doc.install'
695--- debian/qtdeclarative5-doc.install 1970-01-01 00:00:00 +0000
696+++ debian/qtdeclarative5-doc.install 2013-07-08 09:40:35 +0000
697@@ -0,0 +1,2 @@
698+usr/share/qt5/doc/qtquick.qch
699+usr/share/qt5/doc/qtqml.qch
700
701=== modified file 'debian/rules'
702--- debian/rules 2013-04-29 16:27:13 +0000
703+++ debian/rules 2013-07-08 09:40:35 +0000
704@@ -14,25 +14,31 @@
705 override_dh_auto_configure:
706 qmake
707
708-override_dh_auto_install:
709+override_dh_auto_build-indep:
710+ dh_auto_build -Smakefile -- docs
711+
712+override_dh_auto_install-arch:
713 dh_auto_install
714
715 # Fix wrong path in pkgconfig files
716- find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
717+ find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
718 -exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
719
720+ # Remove libtool-like files
721+ rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
722+
723 # Fix wrong permissions in examples.
724- find $(CURDIR)/debian/tmp/usr/lib/*/qt5/examples/ -type f \( \
725+ find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/ -type f \( \
726 -name '*.png' \
727 -o -name '*.php' \
728 -o -name '*.xsl' \
729 -o -name '*.xml' \
730 -o -name '*.js' \
731 -o -name '*.jpg' \
732- \) -print0 | xargs -0 chmod 644
733+ \) -print0 | xargs -0 chmod a-x
734
735- # Remove libtool-like files
736- rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
737+override_dh_auto_install-indep:
738+ make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
739
740 override_dh_install:
741 dh_install --fail-missing
742
743=== modified file 'src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp'
744--- src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp 2013-04-29 16:27:13 +0000
745+++ src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp 2013-07-08 09:40:35 +0000
746@@ -143,8 +143,7 @@
747 if (oldMaterial == 0
748 || material->color() != oldMaterial->color()
749 || state.isOpacityDirty()) {
750- QVector4D color(material->color().redF(), material->color().greenF(),
751- material->color().blueF(), material->color().alphaF());
752+ QVector4D color = material->color();
753 color *= state.opacity();
754 program()->setUniformValue(m_color_id, color);
755 }
756@@ -203,6 +202,14 @@
757 return &type;
758 }
759
760+void QSGDistanceFieldTextMaterial::setColor(const QColor &color)
761+{
762+ m_color = QVector4D(color.redF() * color.alphaF(),
763+ color.greenF() * color.alphaF(),
764+ color.blueF() * color.alphaF(),
765+ color.alphaF());
766+}
767+
768 QSGMaterialShader *QSGDistanceFieldTextMaterial::createShader() const
769 {
770 return new QSGDistanceFieldTextMaterialShader;
771@@ -230,10 +237,8 @@
772 if (m_fontScale != other->m_fontScale) {
773 return int(other->m_fontScale < m_fontScale) - int(m_fontScale < other->m_fontScale);
774 }
775- QRgb c1 = m_color.rgba();
776- QRgb c2 = other->m_color.rgba();
777- if (c1 != c2)
778- return int(c2 < c1) - int(c1 < c2);
779+ if (m_color != other->m_color)
780+ return &m_color < &other->m_color ? -1 : 1;
781 int t0 = m_texture ? m_texture->textureId : -1;
782 int t1 = other->m_texture ? other->m_texture->textureId : -1;
783 return t0 - t1;
784@@ -275,8 +280,7 @@
785 if (oldMaterial == 0
786 || material->styleColor() != oldMaterial->styleColor()
787 || (state.isOpacityDirty())) {
788- QVector4D color(material->styleColor().redF(), material->styleColor().greenF(),
789- material->styleColor().blueF(), material->styleColor().alphaF());
790+ QVector4D color = material->styleColor();
791 color *= state.opacity();
792 program()->setUniformValue(m_styleColor_id, color);
793 }
794@@ -291,15 +295,20 @@
795 {
796 }
797
798+void QSGDistanceFieldStyledTextMaterial::setStyleColor(const QColor &color)
799+{
800+ m_styleColor = QVector4D(color.redF() * color.alphaF(),
801+ color.greenF() * color.alphaF(),
802+ color.blueF() * color.alphaF(),
803+ color.alphaF());
804+}
805+
806 int QSGDistanceFieldStyledTextMaterial::compare(const QSGMaterial *o) const
807 {
808 Q_ASSERT(o && type() == o->type());
809 const QSGDistanceFieldStyledTextMaterial *other = static_cast<const QSGDistanceFieldStyledTextMaterial *>(o);
810- if (m_styleColor != other->m_styleColor) {
811- QRgb c1 = m_styleColor.rgba();
812- QRgb c2 = other->m_styleColor.rgba();
813- return int(c2 < c1) - int(c1 < c2);
814- }
815+ if (m_styleColor != other->m_color)
816+ return &m_styleColor < &other->m_styleColor ? -1 : 1;
817 return QSGDistanceFieldTextMaterial::compare(o);
818 }
819
820@@ -634,8 +643,8 @@
821 QSGDistanceFieldTextMaterial *oldMaterial = static_cast<QSGDistanceFieldTextMaterial *>(oldEffect);
822
823 if (oldMaterial == 0 || material->color() != oldMaterial->color()) {
824- QColor c = material->color();
825- state.context()->functions()->glBlendColor(c.redF(), c.greenF(), c.blueF(), 1.0f);
826+ QVector4D c = material->color();
827+ state.context()->functions()->glBlendColor(c.x(), c.y(), c.z(), 1.0f);
828 }
829
830 if (oldMaterial == 0 || material->fontScale() != oldMaterial->fontScale())
831
832=== modified file 'src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h'
833--- src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h 2013-04-29 16:27:13 +0000
834+++ src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h 2013-07-08 09:40:35 +0000
835@@ -58,8 +58,8 @@
836 virtual QSGMaterialShader *createShader() const;
837 virtual int compare(const QSGMaterial *other) const;
838
839- void setColor(const QColor &color) { m_color = color; }
840- const QColor &color() const { return m_color; }
841+ virtual void setColor(const QColor &color);
842+ const QVector4D &color() const { return m_color; }
843
844 void setGlyphCache(QSGDistanceFieldGlyphCache *a) { m_glyph_cache = a; }
845 QSGDistanceFieldGlyphCache *glyphCache() const { return m_glyph_cache; }
846@@ -76,7 +76,7 @@
847
848 protected:
849 QSize m_size;
850- QColor m_color;
851+ QVector4D m_color;
852 QSGDistanceFieldGlyphCache *m_glyph_cache;
853 const QSGDistanceFieldGlyphCache::Texture *m_texture;
854 qreal m_fontScale;
855@@ -92,11 +92,11 @@
856 virtual QSGMaterialShader *createShader() const = 0;
857 virtual int compare(const QSGMaterial *other) const;
858
859- void setStyleColor(const QColor &color) { m_styleColor = color; }
860- const QColor &styleColor() const { return m_styleColor; }
861+ void setStyleColor(const QColor &color);
862+ const QVector4D &styleColor() const { return m_styleColor; }
863
864 protected:
865- QColor m_styleColor;
866+ QVector4D m_styleColor;
867 };
868
869 class Q_QUICK_PRIVATE_EXPORT QSGDistanceFieldOutlineTextMaterial : public QSGDistanceFieldStyledTextMaterial
870@@ -130,6 +130,7 @@
871 public:
872 virtual QSGMaterialType *type() const;
873 virtual QSGMaterialShader *createShader() const;
874+ void setColor(const QColor &color) { m_color = QVector4D(color.redF(), color.greenF(), color.blueF(), color.alphaF()); }
875 };
876
877 class Q_QUICK_PRIVATE_EXPORT QSGLoQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial
878@@ -137,6 +138,7 @@
879 public:
880 virtual QSGMaterialType *type() const;
881 virtual QSGMaterialShader *createShader() const;
882+ void setColor(const QColor &color) { m_color = QVector4D(color.redF(), color.greenF(), color.blueF(), color.alphaF()); }
883 };
884
885 QT_END_NAMESPACE

Subscribers

People subscribed via source and target branches

to all changes: