summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb6
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bb6
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0020-webkit-disable-the-fuse-ld-gold-flag.patch41
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch148
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch43
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch48
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.5/0025-Fix-misaligned-selection-region-with-text-when-cente.patch75
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6.inc (renamed from meta/recipes-qt/qt4/qt4-4.8.5.inc)9
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0009-qmake-fix-source-file-references-in-qmake.pri.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0011-freetype-host-includes.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0012-Add-2bpp-support.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0012-Add-2bpp-support.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0013-configure-add-crossarch-option.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0014-translations-fix-phony-translation-linking-error.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0014-translations-fix-phony-translation-linking-error.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0015-configure-add-nostrip-for-debug-packages.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0015-configure-add-nostrip-for-debug-packages.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0016-configure-eval-QMAKE_CXX.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0016-configure-eval-QMAKE_CXX.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0018-configure-make-pulseaudio-a-configurable-option.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0018-configure-make-pulseaudio-a-configurable-option.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0021-configure-make-qt4-native-work-with-long-building-pa.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0021-configure-make-qt4-native-work-with-long-building-pa.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/0027-tools.pro-disable-qmeegographicssystemhelper.patch (renamed from meta/recipes-qt/qt4/qt4-4.8.5/0027-tools.pro-disable-qmeegographicssystemhelper.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/g++.conf (renamed from meta/recipes-qt/qt4/qt4-4.8.5/g++.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/linux.conf (renamed from meta/recipes-qt/qt4/qt4-4.8.5/linux.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.6/qte.sh (renamed from meta/recipes-qt/qt4/qt4-4.8.5/qte.sh)0
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.8.6.bb (renamed from meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb)0
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.5.bb6
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.6.bb6
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.8.6.bb (renamed from meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb)0
-rw-r--r--meta/recipes-qt/qt4/qt4.inc2
37 files changed, 15 insertions, 375 deletions
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb
deleted file mode 100644
index 9e5743bb43..0000000000
--- a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require nativesdk-qt4-tools.inc
2
3SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch"
4
5SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133"
6SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138"
diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bb
new file mode 100644
index 0000000000..00526b891d
--- /dev/null
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bb
@@ -0,0 +1,6 @@
1require nativesdk-qt4-tools.inc
2
3SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch"
4
5SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb"
6SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c"
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0020-webkit-disable-the-fuse-ld-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0020-webkit-disable-the-fuse-ld-gold-flag.patch
deleted file mode 100644
index 92eddebaec..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0020-webkit-disable-the-fuse-ld-gold-flag.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From d90b496f9ffdc828928ef84afad43260ea67ec1f Mon Sep 17 00:00:00 2001
2From: Ken Werner <ken.werner@linaro.org>
3Date: Wed, 26 Sep 2012 20:55:21 +0200
4Subject: [PATCH 20/21] webkit: disable the -fuse-ld=gold flag
5
6This option is a Debian/Ubuntu specific extension to the g++ and causes upstream GCC to throw an error.
7
8Upstream-Status: Pending
9
10Signed-off-by: Ken Werner <ken.werner@linaro.org>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 src/3rdparty/webkit/Source/common.pri | 12 ++++++------
14 1 file changed, 6 insertions(+), 6 deletions(-)
15
16diff --git a/src/3rdparty/webkit/Source/common.pri b/src/3rdparty/webkit/Source/common.pri
17index 0f62e14..d81a1f0 100644
18--- a/src/3rdparty/webkit/Source/common.pri
19+++ b/src/3rdparty/webkit/Source/common.pri
20@@ -3,12 +3,12 @@
21 contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
22 contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
23
24-linux-g++ {
25-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
26- message(Using gold linker)
27- QMAKE_LFLAGS+=-fuse-ld=gold
28-}
29-}
30+#linux-g++ {
31+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
32+# message(Using gold linker)
33+# QMAKE_LFLAGS+=-fuse-ld=gold
34+#}
35+#}
36
37 # We use this flag on production branches
38 # See https://bugs.webkit.org/show_bug.cgi?id=60824
39--
401.8.0
41
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch
deleted file mode 100644
index ad45dd0511..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch
+++ /dev/null
@@ -1,148 +0,0 @@
1From b7029fbd12c32e851ed7d81b692197176eb71d9e Mon Sep 17 00:00:00 2001
2From: Gunnar Sletta <gunnar.sletta@digia.com>
3Date: Thu, 4 Jul 2013 16:20:40 +1000
4Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect.
5
6This was broken by a previous fix which aimed to fix gaps in
7polylines with tiny line segments. The result was that we
8skipped updating the origin point when stroke() didn't produce
9pixels which accidentally included the case of the line
10being completely outside the deviceRect. I fixed this
11by returning the value of clipLine in drawLine to the caller
12so we could still update the origin for this case.
13
14Upstream-Status: Accepted [https://codereview.qt-project.org/#change,60427]
15Signed-off-by: Jonathan Liu <net147@gmail.com>
16
17Task-number: QTBUG-31579
18Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065
19(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87)
20---
21 src/gui/painting/qcosmeticstroker.cpp | 42 ++++++++++++++++++++++-------------
22 src/gui/painting/qcosmeticstroker_p.h | 2 +-
23 2 files changed, 27 insertions(+), 17 deletions(-)
24
25diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
26index 0061ecb..4413170 100644
27--- a/src/gui/painting/qcosmeticstroker.cpp
28+++ b/src/gui/painting/qcosmeticstroker.cpp
29@@ -133,10 +133,15 @@ struct NoDasher {
30
31 };
32
33+/*
34+ * The return value is the result of the clipLine() call performed at the start
35+ * of each of the two functions, aka "false" means completely outside the devices
36+ * rect.
37+ */
38 template<DrawPixel drawPixel, class Dasher>
39-static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
40+static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
41 template<DrawPixel drawPixel, class Dasher>
42-static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
43+static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
44
45 inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage)
46 {
47@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
48 caps |= CapEnd;
49
50 QCosmeticStroker::Point last = this->lastPixel;
51- stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
52+ bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
53
54 /* fix for gaps in polylines with fastpen and aliased in a sequence
55 of points with small distances: if current point p2 has been dropped
56- out, keep last non dropped point p. */
57- if (fastPenAliased) {
58- if (last.x != lastPixel.x || last.y != lastPixel.y ||
59- points == begin + 2 || points == end - 2 ) {
60- {
61- p = p2;
62- }
63+ out, keep last non dropped point p.
64+
65+ However, if the line was completely outside the devicerect, we
66+ still need to update p to avoid drawing the line after this one from
67+ a bad starting position.
68+ */
69+ if (fastPenAliased && unclipped) {
70+ if (last.x != lastPixel.x || last.y != lastPixel.y
71+ || points == begin + 2 || points == end - 2) {
72+ p = p2;
73 }
74 } else {
75 p = p2;
76@@ -720,10 +728,10 @@ static inline void capAdjust(int caps, int &x1, int &x2, int &y, int yinc)
77 the drawing shifts from horizontal to vertical or back.
78 */
79 template<DrawPixel drawPixel, class Dasher>
80-static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
81+static bool drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
82 {
83 if (stroker->clipLine(rx1, ry1, rx2, ry2))
84- return;
85+ return false;
86
87 static const int half = 31;
88 int x1 = toF26Dot6(rx1) + half;
89@@ -813,7 +821,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
90 } else {
91 // horizontal
92 if (!dx)
93- return;
94+ return true;
95
96 QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight;
97
98@@ -886,14 +894,15 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
99 }
100 }
101 stroker->lastPixel = last;
102+ return true;
103 }
104
105
106 template<DrawPixel drawPixel, class Dasher>
107-static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
108+static bool drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps)
109 {
110 if (stroker->clipLine(rx1, ry1, rx2, ry2))
111- return;
112+ return false;
113
114 int x1 = toF26Dot6(rx1);
115 int y1 = toF26Dot6(ry1);
116@@ -967,7 +976,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx
117 } else {
118 // horizontal
119 if (!dx)
120- return;
121+ return true;
122
123 int yinc = F16Dot16FixedDiv(dy, dx);
124
125@@ -1029,6 +1038,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx
126 drawPixel(stroker, x, (y>>16) + 1, alpha * alphaEnd >> 6);
127 }
128 }
129+ return true;
130 }
131
132 QT_END_NAMESPACE
133diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h
134index 870738b..3216856 100644
135--- a/src/gui/painting/qcosmeticstroker_p.h
136+++ b/src/gui/painting/qcosmeticstroker_p.h
137@@ -56,7 +56,7 @@ QT_MODULE(Gui)
138 class QCosmeticStroker;
139
140
141-typedef void (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
142+typedef bool (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps);
143
144 class QCosmeticStroker
145 {
146--
1471.8.3.2
148
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch
deleted file mode 100644
index c3c002e8a1..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf Mon Sep 17 00:00:00 2001
2From: Peter Hartmann <phartmann@blackberry.com>
3Date: Thu, 25 Jul 2013 12:05:29 -0400
4Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method
5
6When readData() is called repeatedly, we need to keep track which
7part of the multipart message we are currently reading from.
8Hereby we also need to take the boundary size into account, and not
9only the size of the multipart; otherwise we would skip a not
10completely read part. This would then later lead to advancing the
11read pointer by negative indexes and data loss.
12
13Upstream-Status: Accepted [https://codereview.qt-project.org/#change,61861]
14Signed-off-by: Jonathan Liu <net147@gmail.com>
15
16Task-number: QTBUG-32534
17Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0
18Reviewed-by: Jonathan Liu <net147@gmail.com>
19Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
20(cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529)
21Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
22---
23 src/network/access/qhttpmultipart.cpp | 3 +-
24 tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++++++
25 2 files changed, 46 insertions(+), 1 deletion(-)
26
27diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp
28index 635129a..b25e917 100644
29--- a/src/network/access/qhttpmultipart.cpp
30+++ b/src/network/access/qhttpmultipart.cpp
31@@ -488,7 +488,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize)
32
33 // skip the parts we have already read
34 while (index < multiPart->parts.count() &&
35- readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size())
36+ readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()
37+ + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart
38 index++;
39
40 // read the data
41--
421.8.3.4
43
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
deleted file mode 100644
index 7825205310..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 0726127285413829f58618b5b82fb3e2da0c3a74 Mon Sep 17 00:00:00 2001
2From: Andy Shaw <andy.shaw@digia.com>
3Date: Tue, 8 Oct 2013 15:45:42 +0200
4Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary
5
6Task-number: QTBUG-31579
7
8Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67624]
9Signed-off-by: Jonathan Liu <net147@gmail.com>
10
11Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
12Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
13(cherry picked from qtbase/f0b950144dde85b65df0c3cf83f7c8df0e94bbbf)
14---
15 src/gui/painting/qcosmeticstroker.cpp | 3 +++
16 1 file changed, 3 insertions(+)
17
18diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
19index 4413170..36616d4 100644
20--- a/src/gui/painting/qcosmeticstroker.cpp
21+++ b/src/gui/painting/qcosmeticstroker.cpp
22@@ -305,6 +305,7 @@ void QCosmeticStroker::setup()
23 ymax = deviceRect.bottom() + 2;
24
25 lastPixel.x = -1;
26+ lastPixel.y = -1;
27 }
28
29 // returns true if the whole line gets clipped away
30@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
31 QPointF p = QPointF(points[0], points[1]) * state->matrix;
32 patternOffset = state->lastPen.dashOffset()*64;
33 lastPixel.x = -1;
34+ lastPixel.y = -1;
35
36 bool closed;
37 const QPainterPath::ElementType *e = subPath(type, end, points, &closed);
38@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
39 QPointF movedTo = p;
40 patternOffset = state->lastPen.dashOffset()*64;
41 lastPixel.x = -1;
42+ lastPixel.y = -1;
43
44 const qreal *begin = points;
45 const qreal *end = points + 2*path.elementCount();
46--
471.8.4
48
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0025-Fix-misaligned-selection-region-with-text-when-cente.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0025-Fix-misaligned-selection-region-with-text-when-cente.patch
deleted file mode 100644
index 964bcf8efb..0000000000
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0025-Fix-misaligned-selection-region-with-text-when-cente.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1From c368cbad3a505d44894ff150dc25c74d0174ca15 Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Wed, 23 Oct 2013 00:28:17 +1100
4Subject: [PATCH] Fix misaligned selection region with text when centered
5
6If the text is centered, the x/y position in the selection QRectF may
7be a multiple of 0.5 which is rounded up. This rounding causes
8misalignment of the selection region with the text.
9
10The alignment is fixed by using qFloor on the x and y components.
11
12Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68935]
13Signed-off-by: Jonathan Liu <net147@gmail.com>
14
15Task-number: QTBUG-34218
16Task-number: QTBUG-34234
17Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f
18Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
19(cherry picked from qtbase/5d8a882c11201a29475c5ea71cfb76c9de6573f5)
20---
21 src/gui/text/qtextlayout.cpp | 19 ++++++++++++++-----
22 1 file changed, 14 insertions(+), 5 deletions(-)
23
24diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
25index 3d340cb..8d652ea 100644
26--- a/src/gui/text/qtextlayout.cpp
27+++ b/src/gui/text/qtextlayout.cpp
28@@ -44,6 +44,7 @@
29
30 #include <qfont.h>
31 #include <qapplication.h>
32+#include <qmath.h>
33 #include <qpainter.h>
34 #include <qvarlengtharray.h>
35 #include <qtextformat.h>
36@@ -979,15 +980,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo
37 continue;
38 }
39
40- if (lastSelectionWidth > 0)
41- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
42+ if (lastSelectionWidth > 0) {
43+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
44+ rect.moveLeft(qFloor(rect.left()));
45+ rect.moveTop(qFloor(rect.top()));
46+ region->addRect(rect);
47+ }
48
49 lastSelectionX = selectionX;
50 lastSelectionWidth = selectionWidth;
51 }
52 }
53- if (lastSelectionWidth > 0)
54- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
55+ if (lastSelectionWidth > 0) {
56+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
57+ rect.moveLeft(qFloor(rect.left()));
58+ rect.moveTop(qFloor(rect.top()));
59+ region->addRect(rect);
60+ }
61 }
62
63 static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip)
64@@ -2081,7 +2090,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q
65
66 QBrush bg = chf.background();
67 if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool())
68- p->fillRect(r, bg);
69+ p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg);
70 if (c.style() != Qt::NoBrush) {
71 p->setPen(QPen(c, 0));
72 }
73--
741.8.4
75
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5.inc b/meta/recipes-qt/qt4/qt4-4.8.6.inc
index dcbf26ff12..c4dd36f67c 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.6.inc
@@ -20,18 +20,13 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
20 file://0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \ 20 file://0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch \
21 file://0018-configure-make-pulseaudio-a-configurable-option.patch \ 21 file://0018-configure-make-pulseaudio-a-configurable-option.patch \
22 file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ 22 file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \
23 file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \
24 file://0022-Fix-drawing-of-0-width-polylines-from-outside-the-de.patch \
25 file://0023-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch \
26 file://0024-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \
27 file://0025-Fix-misaligned-selection-region-with-text-when-cente.patch \
28 file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \ 23 file://0027-tools.pro-disable-qmeegographicssystemhelper.patch \
29 file://g++.conf \ 24 file://g++.conf \
30 file://linux.conf \ 25 file://linux.conf \
31 " 26 "
32 27
33SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" 28SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb"
34SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138" 29SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c"
35 30
36S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" 31S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
37 32
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index d8b0a09d17..d8b0a09d17 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
index 98fc88738f..98fc88738f 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
index ecaea51e08..ecaea51e08 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
index 1eb8a5843a..1eb8a5843a 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
index 1a8f2b7f94..1a8f2b7f94 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
index 90ebf75095..90ebf75095 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
index 7d3b336f77..7d3b336f77 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
index ec07f41403..ec07f41403 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0009-qmake-fix-source-file-references-in-qmake.pri.patch
index 45b8c10fbe..45b8c10fbe 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0009-qmake-fix-source-file-references-in-qmake.pri.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
index 1d2ddab490..1d2ddab490 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0011-freetype-host-includes.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch
index e0879c5615..e0879c5615 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0011-freetype-host-includes.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0011-freetype-host-includes.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0012-Add-2bpp-support.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0012-Add-2bpp-support.patch
index 8402eab635..8402eab635 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0012-Add-2bpp-support.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0012-Add-2bpp-support.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0013-configure-add-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch
index aa464fd1ed..aa464fd1ed 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0013-configure-add-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0013-configure-add-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0014-translations-fix-phony-translation-linking-error.patch
index 66724a8ecf..66724a8ecf 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0014-translations-fix-phony-translation-linking-error.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0014-translations-fix-phony-translation-linking-error.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0015-configure-add-nostrip-for-debug-packages.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0015-configure-add-nostrip-for-debug-packages.patch
index b5db49128c..b5db49128c 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0015-configure-add-nostrip-for-debug-packages.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0015-configure-add-nostrip-for-debug-packages.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0016-configure-eval-QMAKE_CXX.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0016-configure-eval-QMAKE_CXX.patch
index 9c3de47b4b..9c3de47b4b 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0016-configure-eval-QMAKE_CXX.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0016-configure-eval-QMAKE_CXX.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
index 9471966660..9471966660 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0018-configure-make-pulseaudio-a-configurable-option.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0018-configure-make-pulseaudio-a-configurable-option.patch
index 19cdd4c57d..19cdd4c57d 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0018-configure-make-pulseaudio-a-configurable-option.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0018-configure-make-pulseaudio-a-configurable-option.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
index a83d2470a1..a83d2470a1 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0021-configure-make-qt4-native-work-with-long-building-pa.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0021-configure-make-qt4-native-work-with-long-building-pa.patch
index dbc90227a5..dbc90227a5 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0021-configure-make-qt4-native-work-with-long-building-pa.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0021-configure-make-qt4-native-work-with-long-building-pa.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0027-tools.pro-disable-qmeegographicssystemhelper.patch b/meta/recipes-qt/qt4/qt4-4.8.6/0027-tools.pro-disable-qmeegographicssystemhelper.patch
index 6e30aeed02..6e30aeed02 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/0027-tools.pro-disable-qmeegographicssystemhelper.patch
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/0027-tools.pro-disable-qmeegographicssystemhelper.patch
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf
index 8755031017..8755031017 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/g++.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.6/linux.conf
index 86703813ca..86703813ca 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/linux.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/linux.conf
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/qte.sh b/meta/recipes-qt/qt4/qt4-4.8.6/qte.sh
index 21d6ecbd6a..21d6ecbd6a 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.5/qte.sh
+++ b/meta/recipes-qt/qt4/qt4-4.8.6/qte.sh
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.6.bb
index 1435d857ce..1435d857ce 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.6.bb
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.5.bb b/meta/recipes-qt/qt4/qt4-native_4.8.5.bb
deleted file mode 100644
index 2443cc4b10..0000000000
--- a/meta/recipes-qt/qt4/qt4-native_4.8.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require qt4-native.inc
2
3TOBUILD := "src/tools/bootstrap ${TOBUILD}"
4
5SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133"
6SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138"
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.6.bb b/meta/recipes-qt/qt4/qt4-native_4.8.6.bb
new file mode 100644
index 0000000000..d874d3297f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.6.bb
@@ -0,0 +1,6 @@
1require qt4-native.inc
2
3TOBUILD := "src/tools/bootstrap ${TOBUILD}"
4
5SRC_URI[md5sum] = "2edbe4d6c2eff33ef91732602f3518eb"
6SRC_URI[sha256sum] = "8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.6.bb
index 5cb5e6817d..5cb5e6817d 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.6.bb
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 6de020270b..75a580c25f 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -275,7 +275,7 @@ do_compile() {
275python populate_packages_prepend() { 275python populate_packages_prepend() {
276 translation_dir = d.expand('${datadir}/${QT_DIR_NAME}/translations/') 276 translation_dir = d.expand('${datadir}/${QT_DIR_NAME}/translations/')
277 translation_name = d.expand('${QT_BASE_NAME}-translation-%s') 277 translation_name = d.expand('${QT_BASE_NAME}-translation-%s')
278 do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' ) 278 do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb|qtscript)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' )
279 279
280 phrasebook_dir = d.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/') 280 phrasebook_dir = d.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/')
281 phrasebook_name = d.expand('${QT_BASE_NAME}-phrasebook-%s') 281 phrasebook_name = d.expand('${QT_BASE_NAME}-phrasebook-%s')