On Tue, 13 May 2014, David Coppa wrote:
>
> Hi!
>
> This is an update to qt-4.8.6.
>
> I've also removed the no_examples pseudo-flavor. It's broken since
> a lot of time and it does not have so much sense anymore: machine
> are faster and you have clusters too ;)
>
> Please test (bulk builds, whatever) as usual...
>
> Ciao,
> David
Now with @conflict marker where it was before (update-plist screwed up)
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qt4/Makefile,v
retrieving revision 1.120
diff -u -p -u -p -r1.120 Makefile
--- Makefile 9 Apr 2014 12:30:41 -0000 1.120
+++ Makefile 13 May 2014 12:19:50 -0000
@@ -24,8 +24,6 @@ PKGNAME-debug = qt4-debug-${PKGVERSION}
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html
-REVISION-main = 3
-
# XXX qmake include parser is bogus
DPB_PROPERTIES = parallel nojunk
@@ -52,8 +50,8 @@ SHARED_LIBS = Qt3Support 8.0 \
QtDeclarative 0.0
-VERSION = 4.8.5
-PKGVERSION = 4.8.5
+VERSION = 4.8.6
+PKGVERSION = 4.8.6
DISTNAME = qt-everywhere-opensource-src-${VERSION}
CATEGORIES = x11
@@ -64,7 +62,6 @@ HOMEPAGE = http://qt-project.org/
MAINTAINER = Marc Espie <[email protected]>
FLAVORS = debug
-PSEUDO_FLAVORS =no_examples
FLAVOR ?=
# GPLv3, or LGPL.
@@ -144,44 +141,6 @@ CONFIGURE_ARGS +=-release
.include <bsd.port.arch.mk>
-.if !${BUILD_PACKAGES:M-examples}
-SUBTARGETS = sub-tools-bootstrap \
- sub-moc \
- sub-rcc \
- sub-uic \
- sub-corelib \
- sub-xml \
- sub-network \
- sub-sql \
- sub-testlib \
- sub-dbus \
- sub-gui \
- sub-qt3support \
- sub-uic3 \
- sub-opengl \
- sub-xmlpatterns \
- sub-phonon \
- sub-multimedia \
- sub-svg \
- sub-script \
- sub-declarative \
- sub-javascriptcore \
- sub-webkit \
- sub-scripttools \
- sub-plugins \
- sub-imports \
- sub-webkitdeclarative \
- sub-tools \
- sub-translations
-
-ALL_TARGET = ${SUBTARGETS}
-INSTALL_TARGET = ${SUBTARGETS:S/$/-install_subtargets/} \
- install_htmldocs install_qchdocs install_docimages \
- install_qmake install_mkspecs
-.else
-PROGRAMS += qtdemo pixeltool
-.endif
-
MODULES = devel/gettext
LIB_DEPENDS =
@@ -263,7 +222,7 @@ NO_TEST = Yes
PROGRAMS4 = assistant designer findtr linguist lrelease lupdate moc qmake \
qtconfig uic uic3
-PROGRAMS += rcc qt3to4 syncqt qdbus
+PROGRAMS += pixeltool qdbus qt3to4 qtdemo rcc syncqt
QMAKE = ${WRKBUILD}/bin/qmake
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/qt4/distinfo,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 distinfo
--- distinfo 4 Oct 2013 13:15:39 -0000 1.33
+++ distinfo 13 May 2014 12:19:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt-everywhere-opensource-src-4.8.5.tar.gz) =
63KPgmiDHcQ3O+ZAO33V1d3gPBaa1ogvmoy1YN9qoTg=
-SIZE (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467
+SHA256 (qt-everywhere-opensource-src-4.8.6.tar.gz) =
ixTdkbUoYuCbjmqWNQe3S8JYB4fRcf7aGXut+nA0Ayw=
+SIZE (qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/qt4/patches/patch-configure,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 patch-configure
--- patches/patch-configure 4 Oct 2013 13:15:40 -0000 1.25
+++ patches/patch-configure 13 May 2014 12:19:50 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.25 2013/10/04 13:15:40 dcoppa Exp $
---- configure.orig Fri Jun 7 07:16:41 2013
-+++ configure Fri Sep 27 10:10:55 2013
+--- configure.orig Thu Apr 10 20:37:08 2014
++++ configure Tue May 13 11:25:23 2014
@@ -917,7 +917,7 @@ CFG_SILENT=no
CFG_GRAPHICS_SYSTEM=default
CFG_RUNTIME_SYSTEM=
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.25 2013/10
else
OPT_VERBOSE=yes
fi
-@@ -4958,7 +4958,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -4965,7 +4965,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
EXTRA_OBJS=
EXTRA_SRCS=
EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
@@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.25 2013/10
EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
-@@ -5058,7 +5058,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -5074,7 +5074,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
done
QMAKE_BUILD_ERROR=no
Index: patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h
===================================================================
RCS file:
/cvs/ports/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v
retrieving revision 1.7
diff -u -p -u -p -r1.7
patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h
--- patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h
4 Oct 2013 13:15:40 -0000 1.7
+++ patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h
13 May 2014 12:19:50 -0000
@@ -1,22 +1,40 @@
$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v
1.7 2013/10/04 13:15:40 dcoppa Exp $
---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig Fri Jun
7 07:16:58 2013
-+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h Fri Sep 27
10:10:55 2013
-@@ -142,6 +142,30 @@
- #endif
- #endif
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig Tue May
13 11:54:48 2014
++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h Tue May 13
11:59:49 2014
+@@ -333,27 +333,32 @@
+
+ #endif /* ARM */
-+/* CPU(MIPS) and CPU(MIPS64) */
++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(MIPS64) || CPU(SPARC64)
++#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
++#endif
++
+ /* CPU(MIPS) - MIPS, any version */
+-#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_))
+#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)
|| defined(__mips64__))
+#if defined(_ABIO32)
-+#define WTF_CPU_MIPS 1
+ #define WTF_CPU_MIPS 1
+-#include <sgidefs.h>
+#endif
+ #if defined(__MIPSEB__)
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+-/* CPU(MIPS64) - MIPS 64-bit both BIG and LITTLE endian */
+-#if defined(_MIPS_SIM_ABI64) && (_MIPS_SIM == _MIPS_SIM_ABI64)
+#if defined(__mips64__)
-+#define WTF_CPU_MIPS64 1
+ #define WTF_CPU_MIPS64 1
+#define USE_SYSTEM_MALLOC 1
-+#endif
-+#if defined(__MIPSEB__)
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
+ #endif
+-
+-/* CPU(MIPSN32) - MIPS N32 ABI both BIG and LITTLE endian */
+-#if defined(_MIPS_SIM_ABIN32) && (_MIPS_SIM == _MIPS_SIM_ABIN32)
+-#define WTF_CPU_MIPSN32 1
+-#endif
+-
+-/* CPU(MIPS32) - MIPS O32 ABI both BIG and LITTLE endian */
+-#if defined(_MIPS_SIM_ABI32) && (_MIPS_SIM == _MIPS_SIM_ABI32)
+-#define WTF_CPU_MIPS32 1
+-#endif
+#define WTF_MIPS_PIC (defined __PIC__)
+#define WTF_MIPS_ARCH __mips
+#define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v)
@@ -27,29 +45,15 @@ $OpenBSD: patch-src_3rdparty_javascriptc
+#define WTF_MIPS_FP64 (defined __mips_fpr && __mips_fpr == 64)
+/* MIPS requires allocators to use aligned memory */
+#define WTF_USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
-+#endif /* MIPS */
-+
- /* CPU(HPPA) - a.k.a. PA-RISC */
- #if defined(__hppa) || defined(__hppa__)
- #define WTF_CPU_HPPA 1
-@@ -325,8 +349,10 @@
-
- #endif /* ARM */
+ #endif /* __mips__ */
-+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(MIPS64) || CPU(SPARC64)
-+#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
-+#endif
-
--
- /* ==== OS() - underlying operating system; only to be used for mandated
low-level services like
- virtual memory, not to choose a GUI toolkit ==== */
-@@ -873,7 +899,7 @@
+@@ -903,7 +908,7 @@
#endif
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) &&
!defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) ||
(CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
-+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX) ||
OS(OPENBSD))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) ||
CPU(SPARC64) || CPU(MIPS64)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) ||
(CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) ||
CPU(MIPS64) || CPU(AARCH64)
++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX) ||
OS(OPENBSD))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) ||
CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
#define WTF_USE_JSVALUE64 1
#elif CPU(ARM) || CPU(PPC64)
#define WTF_USE_JSVALUE32 1
Index: patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h
===================================================================
RCS file:
/cvs/ports/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h,v
retrieving revision 1.3
diff -u -p -u -p -r1.3
patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h
--- patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h
14 Jun 2012 09:38:35 -0000 1.3
+++ patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h
13 May 2014 12:19:50 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h,v
1.3 2012/06/14 09:38:35 espie Exp $
---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig Thu Apr
26 21:46:22 2012
-+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h Sun Jun 10
13:25:08 2012
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig Thu Apr
10 20:37:12 2014
++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h Tue May 13
11:25:32 2014
@@ -247,7 +247,7 @@ inline int atomicDecrement(int volatile* addend) { ret
inline int atomicIncrement(int volatile* addend) { return (int)
atomic_add_value((unsigned volatile*)addend, 1); }
inline int atomicDecrement(int volatile* addend) { return (int)
atomic_sub_value((unsigned volatile*)addend, 1); }
@@ -9,4 +9,4 @@ $OpenBSD: patch-src_3rdparty_javascriptc
+#elif COMPILER(GCC) && !CPU(SPARC64) && !OS(SYMBIAN) && !OS(OPENBSD) //
sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
#define WTF_USE_LOCKFREE_THREADSAFESHARED 1
- inline int atomicIncrement(int volatile* addend) { return
__gnu_cxx::__exchange_and_add(addend, 1) + 1; }
+ inline int atomicIncrement(int volatile* addend) { return
__sync_add_and_fetch(addend, 1); }
Index: patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform_h
===================================================================
RCS file:
/cvs/ports/x11/qt4/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1
patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform_h
--- patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform_h
14 Jan 2013 22:09:43 -0000 1.1
+++ patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform_h
13 May 2014 12:19:51 -0000
@@ -1,16 +1,21 @@
$OpenBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform_h,v 1.1
2013/01/14 22:09:43 bcallah Exp $
---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig Thu Apr
26 15:46:13 2012
-+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h Mon Jan 14
16:48:40 2013
-@@ -146,9 +146,14 @@
+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig Thu Apr
10 20:37:11 2014
++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h Tue May 13
11:46:42 2014
+@@ -145,19 +145,19 @@
+ #endif
- /* CPU(MIPS) - MIPS 32-bit */
- /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */
--#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \
-- && defined(_ABIO32)
+ /* CPU(MIPS) - MIPS 32-bit and 64-bit */
+-#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \
+- || defined(__mips64))
+-#if defined(__mips64)
+-#define WTF_CPU_MIPS64 1
+-#define WTF_MIPS_ARCH __mips64
+-#else
+#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)
|| defined(__mips64__))
+#if defined(_ABIO32)
#define WTF_CPU_MIPS 1
-+#endif
+-#define WTF_MIPS_ARCH __mips
+ #endif
+#if defined(__mips64__)
+#define WTF_CPU_MIPS64 1
+#define USE_SYSTEM_MALLOC 1
@@ -18,7 +23,12 @@ $OpenBSD: patch-src_3rdparty_webkit_Sour
#if defined(__MIPSEB__)
#define WTF_CPU_BIG_ENDIAN 1
#endif
-@@ -365,7 +370,7 @@
+ #define WTF_MIPS_PIC (defined __PIC__)
++#define WTF_MIPS_ARCH __mips
+ #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v)
+ #define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v)
+ #define WTF_MIPS_ARCH_REV __mips_isa_rev
+@@ -369,7 +369,7 @@
#endif /* ARM */
@@ -27,14 +37,3 @@ $OpenBSD: patch-src_3rdparty_webkit_Sour
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
-@@ -998,7 +1003,9 @@
- || CPU(ALPHA) \
- || CPU(SPARC64) \
- || CPU(S390X) \
-- || CPU(PPC64)
-+ || CPU(PPC64) \
-+ || CPU(SPARC64) \
-+ || CPU(MIPS64)
- #define WTF_USE_JSVALUE64 1
- #else
- #define WTF_USE_JSVALUE32_64 1
Index: patches/patch-src_corelib_global_qglobal_h
===================================================================
RCS file: /cvs/ports/x11/qt4/patches/patch-src_corelib_global_qglobal_h,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 patch-src_corelib_global_qglobal_h
--- patches/patch-src_corelib_global_qglobal_h 4 Oct 2013 13:15:40 -0000
1.16
+++ patches/patch-src_corelib_global_qglobal_h 13 May 2014 12:19:51 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.16 2013/10/04 13:15:40 dcoppa
Exp $
---- src/corelib/global/qglobal.h.orig Fri Jun 7 07:16:52 2013
-+++ src/corelib/global/qglobal.h Fri Sep 27 10:10:56 2013
-@@ -2359,7 +2359,7 @@ typedef uint Flags;
+--- src/corelib/global/qglobal.h.orig Thu Apr 10 20:37:11 2014
++++ src/corelib/global/qglobal.h Tue May 13 11:25:38 2014
+@@ -2367,7 +2367,7 @@ typedef uint Flags;
#endif /* Q_NO_TYPESAFE_FLAGS */
Index: patches/patch-src_gui_image_qgifhandler_cpp
===================================================================
RCS file: patches/patch-src_gui_image_qgifhandler_cpp
diff -N patches/patch-src_gui_image_qgifhandler_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gui_image_qgifhandler_cpp 13 May 2014 12:19:51 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+Don't crash on broken GIF images
+
+Broken GIF images could set invalid width and height
+values inside the image, leading to Qt creating a null
+QImage for it. In that case we need to abort decoding
+the image and return an error.
+
+Initial patch by Rich Moore.
+
+Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5
+
+Task-number: QTBUG-38367
+Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a
+Security-advisory: CVE-2014-0190
+
+--- src/gui/image/qgifhandler.cpp.orig Thu Apr 10 20:37:12 2014
++++ src/gui/image/qgifhandler.cpp Tue May 13 11:25:53 2014
+@@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buf
+ memset(bits, 0, image->byteCount());
+ }
+
++ // Check if the previous attempt to create the image failed.
If it
++ // did then the image is broken and we should give up.
++ if (image->isNull()) {
++ state = Error;
++ return -1;
++ }
++
+ disposePrevious(image);
+ disposed = false;
+
Index: patches/patch-src_gui_itemviews_qlistview_cpp
===================================================================
RCS file: /cvs/ports/x11/qt4/patches/patch-src_gui_itemviews_qlistview_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_gui_itemviews_qlistview_cpp
--- patches/patch-src_gui_itemviews_qlistview_cpp 4 Oct 2013 13:15:40
-0000 1.4
+++ patches/patch-src_gui_itemviews_qlistview_cpp 13 May 2014 12:19:51
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_gui_itemviews_qlistview_cpp,v 1.4 2013/10/04 13:15:40
dcoppa Exp $
---- src/gui/itemviews/qlistview.cpp.orig Fri Jun 7 07:16:59 2013
-+++ src/gui/itemviews/qlistview.cpp Fri Sep 27 10:10:56 2013
-@@ -2921,7 +2921,8 @@ void QIconModeViewBase::doDynamicLayout(const QListVie
+--- src/gui/itemviews/qlistview.cpp.orig Thu Apr 10 20:37:12 2014
++++ src/gui/itemviews/qlistview.cpp Tue May 13 11:25:38 2014
+@@ -2918,7 +2918,8 @@ void QIconModeViewBase::doDynamicLayout(const QListVie
if (moved.count() != items.count())
moved.resize(items.count());
Index: patches/patch-src_gui_kernel_qkeymapper_x11_cpp
===================================================================
RCS file: patches/patch-src_gui_kernel_qkeymapper_x11_cpp
diff -N patches/patch-src_gui_kernel_qkeymapper_x11_cpp
--- patches/patch-src_gui_kernel_qkeymapper_x11_cpp 15 Nov 2013 10:52:24
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-src_gui_kernel_qkeymapper_x11_cpp,v 1.1 2013/11/15 10:52:24
dcoppa Exp $
-
-From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <[email protected]>
-Date: Sat, 31 Aug 2013 21:22:47 +0200
-Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb layout."
-
-The change which attempted to fix QTBUG-15319 broke keyboard
-shortcuts for non latin keyboard layouts.
-
-This patch reverts QTBUG-15319 (f45cdeda8) since it caused a
-regression.
-
-Task-number: QTBUG-32908
-
-Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7
-Reviewed-by: David Faure <[email protected]>
-
---- src/gui/kernel/qkeymapper_x11.cpp.orig Fri Jun 7 07:16:59 2013
-+++ src/gui/kernel/qkeymapper_x11.cpp Wed Nov 13 18:09:16 2013
-@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEven
-
- // first, translate key only using lock modifiers (there are no Qt
equivalents for these, so we must
- // always use them when determining the baseKeySym)
-- // Note: the Xkb group to be used for the conversion keycode->keysym has
to be given to
-- // XkbLookupKeySym(). This information is contained in the bits 8
to 15 of xmodifiers.
-- // See https://bugreports.qt-project.org/browse/QTBUG-15319 .
- KeySym baseKeySym;
- uint consumedModifiers;
-- if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 |
LockMask | qt_num_lock_mask)),
-+ if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask |
qt_num_lock_mask)),
- &consumedModifiers, &baseKeySym))
- return QList<int>();
-
Index: patches/patch-src_gui_painting_qcosmeticstroker_cpp
===================================================================
RCS file: patches/patch-src_gui_painting_qcosmeticstroker_cpp
diff -N patches/patch-src_gui_painting_qcosmeticstroker_cpp
--- patches/patch-src_gui_painting_qcosmeticstroker_cpp 4 Oct 2013 13:15:40
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,126 +0,0 @@
-$OpenBSD: patch-src_gui_painting_qcosmeticstroker_cpp,v 1.1 2013/10/04
13:15:40 dcoppa Exp $
-
-From 2a6537f0629aaff53a42d993ad94ad4de3cd3030 Mon Sep 17 00:00:00 2001
-From: Gunnar Sletta <[email protected]>
-Date: Thu, 4 Jul 2013 16:20:40 +1000
-Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect.
-
-This was broken by a previous fix which aimed to fix gaps in
-polylines with tiny line segments. The result was that we
-skipped updating the origin point when stroke() didn't produce
-pixels which accidentally included the case of the line
-being completely outside the deviceRect. I fixed this
-by returning the value of clipLine in drawLine to the caller
-so we could still update the origin for this case.
-
-Task-number: QTBUG-31579
-Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065
-(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87)
-Reviewed-by: Gunnar Sletta <[email protected]>
-
---- src/gui/painting/qcosmeticstroker.cpp.orig Fri Jun 7 07:16:59 2013
-+++ src/gui/painting/qcosmeticstroker.cpp Fri Sep 27 10:37:52 2013
-@@ -133,10 +133,15 @@ struct NoDasher {
-
- };
-
-+/*
-+ * The return value is the result of the clipLine() call performed at the
start
-+ * of each of the two functions, aka "false" means completely outside the
devices
-+ * rect.
-+ */
- template<DrawPixel drawPixel, class Dasher>
--static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2,
qreal y2, int caps);
-+static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2,
qreal y2, int caps);
- template<DrawPixel drawPixel, class Dasher>
--static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal
x2, qreal y2, int caps);
-+static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal
x2, qreal y2, int caps);
-
- inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage)
- {
-@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath &pat
- caps |= CapEnd;
-
- QCosmeticStroker::Point last = this->lastPixel;
-- stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
-+ bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps);
-
- /* fix for gaps in polylines with fastpen and aliased in a
sequence
- of points with small distances: if current point p2 has been
dropped
-- out, keep last non dropped point p. */
-- if (fastPenAliased) {
-- if (last.x != lastPixel.x || last.y != lastPixel.y ||
-- points == begin + 2 || points == end - 2 ) {
-- {
-- p = p2;
-- }
-+ out, keep last non dropped point p.
-+
-+ However, if the line was completely outside the devicerect, we
-+ still need to update p to avoid drawing the line after this
one from
-+ a bad starting position.
-+ */
-+ if (fastPenAliased && unclipped) {
-+ if (last.x != lastPixel.x || last.y != lastPixel.y
-+ || points == begin + 2 || points == end - 2) {
-+ p = p2;
- }
- } else {
- p = p2;
-@@ -720,10 +728,10 @@ static inline void capAdjust(int caps, int &x1, int &x
- the drawing shifts from horizontal to vertical or back.
- */
- template<DrawPixel drawPixel, class Dasher>
--static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal
rx2, qreal ry2, int caps)
-+static bool drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal
rx2, qreal ry2, int caps)
- {
- if (stroker->clipLine(rx1, ry1, rx2, ry2))
-- return;
-+ return false;
-
- static const int half = 31;
- int x1 = toF26Dot6(rx1) + half;
-@@ -813,7 +821,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal
- } else {
- // horizontal
- if (!dx)
-- return;
-+ return true;
-
- QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight;
-
-@@ -886,14 +894,15 @@ static void drawLine(QCosmeticStroker *stroker, qreal
- }
- }
- stroker->lastPixel = last;
-+ return true;
- }
-
-
- template<DrawPixel drawPixel, class Dasher>
--static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal
rx2, qreal ry2, int caps)
-+static bool drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal
rx2, qreal ry2, int caps)
- {
- if (stroker->clipLine(rx1, ry1, rx2, ry2))
-- return;
-+ return false;
-
- int x1 = toF26Dot6(rx1);
- int y1 = toF26Dot6(ry1);
-@@ -967,7 +976,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qrea
- } else {
- // horizontal
- if (!dx)
-- return;
-+ return true;
-
- int yinc = F16Dot16FixedDiv(dy, dx);
-
-@@ -1029,6 +1038,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qrea
- drawPixel(stroker, x, (y>>16) + 1, alpha * alphaEnd >> 6);
- }
- }
-+ return true;
- }
-
- QT_END_NAMESPACE
Index: patches/patch-src_gui_painting_qcosmeticstroker_p_h
===================================================================
RCS file: patches/patch-src_gui_painting_qcosmeticstroker_p_h
diff -N patches/patch-src_gui_painting_qcosmeticstroker_p_h
--- patches/patch-src_gui_painting_qcosmeticstroker_p_h 4 Oct 2013 13:15:40
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-src_gui_painting_qcosmeticstroker_p_h,v 1.1 2013/10/04
13:15:40 dcoppa Exp $
-
-From 2a6537f0629aaff53a42d993ad94ad4de3cd3030 Mon Sep 17 00:00:00 2001
-From: Gunnar Sletta <[email protected]>
-Date: Thu, 4 Jul 2013 16:20:40 +1000
-Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect.
-
-This was broken by a previous fix which aimed to fix gaps in
-polylines with tiny line segments. The result was that we
-skipped updating the origin point when stroke() didn't produce
-pixels which accidentally included the case of the line
-being completely outside the deviceRect. I fixed this
-by returning the value of clipLine in drawLine to the caller
-so we could still update the origin for this case.
-
-Task-number: QTBUG-31579
-Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065
-(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87)
-Reviewed-by: Gunnar Sletta <[email protected]>
-
---- src/gui/painting/qcosmeticstroker_p.h.orig Fri Jun 7 07:16:59 2013
-+++ src/gui/painting/qcosmeticstroker_p.h Fri Sep 27 10:37:52 2013
-@@ -56,7 +56,7 @@ QT_MODULE(Gui)
- class QCosmeticStroker;
-
-
--typedef void (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1,
qreal x2, qreal y2, int caps);
-+typedef bool (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1,
qreal x2, qreal y2, int caps);
-
- class QCosmeticStroker
- {
Index: patches/patch-src_network_access_qhttpmultipart_cpp
===================================================================
RCS file: patches/patch-src_network_access_qhttpmultipart_cpp
diff -N patches/patch-src_network_access_qhttpmultipart_cpp
--- patches/patch-src_network_access_qhttpmultipart_cpp 4 Oct 2013 13:15:41
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-src_network_access_qhttpmultipart_cpp,v 1.1 2013/10/04
13:15:41 dcoppa Exp $
-
-From 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf Mon Sep 17 00:00:00 2001
-From: Peter Hartmann <[email protected]>
-Date: Thu, 25 Jul 2013 12:05:29 -0400
-Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method
-
-When readData() is called repeatedly, we need to keep track which
-part of the multipart message we are currently reading from.
-Hereby we also need to take the boundary size into account, and not
-only the size of the multipart; otherwise we would skip a not
-completely read part. This would then later lead to advancing the
-read pointer by negative indexes and data loss.
-
-Task-number: QTBUG-32534
-Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0
-Reviewed-by: Jonathan Liu <[email protected]>
-Reviewed-by: Shane Kearns <[email protected]>
-(cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529)
-Reviewed-by: Thiago Macieira <[email protected]>
-
---- src/network/access/qhttpmultipart.cpp.orig Fri Jun 7 07:17:00 2013
-+++ src/network/access/qhttpmultipart.cpp Fri Sep 27 10:43:09 2013
-@@ -488,7 +488,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qi
-
- // skip the parts we have already read
- while (index < multiPart->parts.count() &&
-- readPointer >= partOffsets.at(index) +
multiPart->parts.at(index).d->size())
-+ readPointer >= partOffsets.at(index) +
multiPart->parts.at(index).d->size()
-+ + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n
after boundary, \r\n after multipart
- index++;
-
- // read the data
Index: patches/patch-src_xml_sax_qxml_cpp
===================================================================
RCS file: patches/patch-src_xml_sax_qxml_cpp
diff -N patches/patch-src_xml_sax_qxml_cpp
--- patches/patch-src_xml_sax_qxml_cpp 12 Mar 2014 13:18:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,105 +0,0 @@
-$OpenBSD: patch-src_xml_sax_qxml_cpp,v 1.1 2014/03/12 13:18:37 dcoppa Exp $
-
-Fix for CVE-2013-4549: QXmlSimpleReader in Qt before 5.2 allows
-context-dependent attackers to cause a denial of service (memory
-consumption) via an XML Entity Expansion (XEE) attack.
-
---- src/xml/sax/qxml.cpp.orig Fri Jun 7 07:16:58 2013
-+++ src/xml/sax/qxml.cpp Tue Feb 25 10:13:45 2014
-@@ -424,6 +424,12 @@ class QXmlSimpleReaderPrivate (private)
- int stringValueLen;
- QString emptyStr;
-
-+ // The limit to the amount of times the DTD parsing functions can be
called
-+ // for the DTD currently being parsed.
-+ static const int dtdRecursionLimit = 2;
-+ // The maximum amount of characters an entity value may contain, after
expansion.
-+ static const int entityCharacterLimit = 1024;
-+
- const QString &string();
- void stringClear();
- void stringAddC(QChar);
-@@ -492,6 +498,7 @@ class QXmlSimpleReaderPrivate (private)
- void unexpectedEof(ParseFunction where, int state);
- void parseFailed(ParseFunction where, int state);
- void pushParseState(ParseFunction function, int state);
-+ bool isExpandedEntityValueTooLarge(QString *errorMessage);
-
- Q_DECLARE_PUBLIC(QXmlSimpleReader)
- QXmlSimpleReader *q_ptr;
-@@ -5018,6 +5025,11 @@ bool QXmlSimpleReaderPrivate::parseDoctype()
- }
- break;
- case Mup:
-+ if (dtdRecursionLimit > 0 && parameterEntities.size() >
dtdRecursionLimit) {
-+ reportParseError(QString::fromLatin1(
-+ "DTD parsing exceeded recursion limit of
%1.").arg(dtdRecursionLimit));
-+ return false;
-+ }
- if (!parseMarkupdecl()) {
- parseFailed(&QXmlSimpleReaderPrivate::parseDoctype,
state);
- return false;
-@@ -6627,6 +6639,50 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq()
- return false;
- }
-
-+bool QXmlSimpleReaderPrivate::isExpandedEntityValueTooLarge(QString
*errorMessage)
-+{
-+ QMap<QString, int> literalEntitySizes;
-+ // The entity at (QMap<QString,) referenced the entities at
(QMap<QString,) (int>) times.
-+ QMap<QString, QMap<QString, int> > referencesToOtherEntities;
-+ QMap<QString, int> expandedSizes;
-+
-+ // For every entity, check how many times all entity names were
referenced in its value.
-+ foreach (QString toSearch, entities.keys()) {
-+ // The amount of characters that weren't entity names, but literals,
like 'X'.
-+ QString leftOvers = entities.value(toSearch);
-+ // How many times was entityName referenced by toSearch?
-+ foreach (QString entityName, entities.keys()) {
-+ for (int i = 0; i < leftOvers.size() && i != -1; ) {
-+ i =
leftOvers.indexOf(QString::fromLatin1("&%1;").arg(entityName), i);
-+ if (i != -1) {
-+ leftOvers.remove(i, entityName.size() + 2);
-+ // The entityName we're currently trying to find was
matched in this string; increase our count.
-+ ++referencesToOtherEntities[toSearch][entityName];
-+ }
-+ }
-+ }
-+ literalEntitySizes[toSearch] = leftOvers.size();
-+ }
-+
-+ foreach (QString entity, referencesToOtherEntities.keys()) {
-+ expandedSizes[entity] = literalEntitySizes[entity];
-+ foreach (QString referenceTo,
referencesToOtherEntities.value(entity).keys()) {
-+ const int references =
referencesToOtherEntities.value(entity).value(referenceTo);
-+ // The total size of an entity's value is the expanded size of
all of its referenced entities, plus its literal size.
-+ expandedSizes[entity] += expandedSizes[referenceTo] * references
+ literalEntitySizes[referenceTo] * references;
-+ }
-+
-+ if (expandedSizes[entity] > entityCharacterLimit) {
-+ if (errorMessage) {
-+ *errorMessage = QString::fromLatin1("The XML entity \"%1\"
expands too a string that is too large to process (%2 characters > %3).");
-+ *errorMessage =
(*errorMessage).arg(entity).arg(expandedSizes[entity]).arg(entityCharacterLimit);
-+ }
-+ return true;
-+ }
-+ }
-+ return false;
-+}
-+
- /*
- Parse a EntityDecl [70].
-
-@@ -6721,6 +6777,12 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl()
- switch (state) {
- case EValue:
- if ( !entityExist(name())) {
-+ QString errorMessage;
-+ if (isExpandedEntityValueTooLarge(&errorMessage)) {
-+ reportParseError(errorMessage);
-+ return false;
-+ }
-+
- entities.insert(name(), string());
- if (declHnd) {
- if (!declHnd->internalEntityDecl(name(), string())) {
Index: pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/x11/qt4/pkg/PLIST-examples,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 PLIST-examples
--- pkg/PLIST-examples 4 Oct 2013 13:15:41 -0000 1.29
+++ pkg/PLIST-examples 13 May 2014 12:19:59 -0000
@@ -1122,17 +1122,17 @@ lib/qt4/examples/declarative/cppextensio
lib/qt4/examples/declarative/cppextensions/networkaccessmanagerfactory/qml/networkaccessmanagerfactory/view.qml
lib/qt4/examples/declarative/cppextensions/plugins/
lib/qt4/examples/declarative/cppextensions/plugins/README
-lib/qt4/examples/declarative/cppextensions/plugins/com/
-lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/
-lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/
-lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
-lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png
-lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png
-lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png
-lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/libqmlqtimeexampleplugin.so
-lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png
-lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
lib/qt4/examples/declarative/cppextensions/plugins/libqmlqwidgetsplugin.so
+lib/qt4/examples/declarative/cppextensions/plugins/org/
+lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/
+lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/
+lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/Clock.qml
+lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/center.png
+lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/clock.png
+lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/hour.png
+lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/libqmlqtimeexampleplugin.so
+lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/minute.png
+lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/qmldir
lib/qt4/examples/declarative/cppextensions/plugins/plugin.cpp
lib/qt4/examples/declarative/cppextensions/plugins/plugins.pro
lib/qt4/examples/declarative/cppextensions/plugins/plugins.qml
Index: pkg/PLIST-html
===================================================================
RCS file: /cvs/ports/x11/qt4/pkg/PLIST-html,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 PLIST-html
--- pkg/PLIST-html 4 Oct 2013 13:15:41 -0000 1.29
+++ pkg/PLIST-html 13 May 2014 12:20:11 -0000
@@ -231,8 +231,8 @@ share/doc/qt4/html/declarative-cppextens
share/doc/qt4/html/declarative-cppextensions-networkaccessmanagerfactory-networkaccessmanagerfactory-qrc.html
share/doc/qt4/html/declarative-cppextensions-networkaccessmanagerfactory-qml-networkaccessmanagerfactory-view-qml.html
share/doc/qt4/html/declarative-cppextensions-networkaccessmanagerfactory.html
-share/doc/qt4/html/declarative-cppextensions-plugins-com-nokia-timeexample-clock-qml.html
-share/doc/qt4/html/declarative-cppextensions-plugins-com-nokia-timeexample-qmldir.html
+share/doc/qt4/html/declarative-cppextensions-plugins-org-qtproject-timeexample-clock-qml.html
+share/doc/qt4/html/declarative-cppextensions-plugins-org-qtproject-timeexample-qmldir.html
share/doc/qt4/html/declarative-cppextensions-plugins-plugin-cpp.html
share/doc/qt4/html/declarative-cppextensions-plugins-plugins-pro.html
share/doc/qt4/html/declarative-cppextensions-plugins-plugins-qml.html
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/qt4/pkg/PLIST-main,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 PLIST-main
--- pkg/PLIST-main 4 Oct 2013 13:15:41 -0000 1.32
+++ pkg/PLIST-main 13 May 2014 12:20:14 -0000
@@ -194,6 +194,7 @@ include/X11/qt4/Qt/qatomic_generic.h
include/X11/qt4/Qt/qatomic_i386.h
include/X11/qt4/Qt/qatomic_ia64.h
include/X11/qt4/Qt/qatomic_integrity.h
+include/X11/qt4/Qt/qatomic_m68k.h
include/X11/qt4/Qt/qatomic_macosx.h
include/X11/qt4/Qt/qatomic_mips.h
include/X11/qt4/Qt/qatomic_parisc.h
@@ -1412,6 +1413,7 @@ include/X11/qt4/QtCore/qatomic_generic.h
include/X11/qt4/QtCore/qatomic_i386.h
include/X11/qt4/QtCore/qatomic_ia64.h
include/X11/qt4/QtCore/qatomic_integrity.h
+include/X11/qt4/QtCore/qatomic_m68k.h
include/X11/qt4/QtCore/qatomic_macosx.h
include/X11/qt4/QtCore/qatomic_mips.h
include/X11/qt4/QtCore/qatomic_parisc.h
@@ -3804,6 +3806,11 @@ lib/qt4/mkspecs/unsupported/linux-scratc
lib/qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
lib/qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
lib/qt4/mkspecs/unsupported/macx-clang/
+lib/qt4/mkspecs/unsupported/macx-clang-libc++/
+lib/qt4/mkspecs/unsupported/macx-clang-libc++/Info.plist.app
+lib/qt4/mkspecs/unsupported/macx-clang-libc++/Info.plist.lib
+lib/qt4/mkspecs/unsupported/macx-clang-libc++/qmake.conf
+lib/qt4/mkspecs/unsupported/macx-clang-libc++/qplatformdefs.h
lib/qt4/mkspecs/unsupported/macx-clang/Info.plist.app
lib/qt4/mkspecs/unsupported/macx-clang/Info.plist.lib
lib/qt4/mkspecs/unsupported/macx-clang/qmake.conf
@@ -3902,6 +3909,9 @@ lib/qt4/mkspecs/win32-msvc2010/qplatform
lib/qt4/mkspecs/win32-msvc2012/
lib/qt4/mkspecs/win32-msvc2012/qmake.conf
lib/qt4/mkspecs/win32-msvc2012/qplatformdefs.h
+lib/qt4/mkspecs/win32-msvc2013/
+lib/qt4/mkspecs/win32-msvc2013/qmake.conf
+lib/qt4/mkspecs/win32-msvc2013/qplatformdefs.h
lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/
lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
@@ -4100,6 +4110,7 @@ lib/qt4/translations/
lib/qt4/translations/assistant_cs.qm
lib/qt4/translations/assistant_da.qm
lib/qt4/translations/assistant_de.qm
+lib/qt4/translations/assistant_eu.qm
lib/qt4/translations/assistant_fr.qm
lib/qt4/translations/assistant_hu.qm
lib/qt4/translations/assistant_ja.qm
@@ -4124,6 +4135,7 @@ lib/qt4/translations/designer_zh_CN.qm
lib/qt4/translations/designer_zh_TW.qm
lib/qt4/translations/linguist_cs.qm
lib/qt4/translations/linguist_de.qm
+lib/qt4/translations/linguist_eu.qm
lib/qt4/translations/linguist_fr.qm
lib/qt4/translations/linguist_hu.qm
lib/qt4/translations/linguist_ja.qm
@@ -4139,6 +4151,7 @@ lib/qt4/translations/qt_cs.qm
lib/qt4/translations/qt_da.qm
lib/qt4/translations/qt_de.qm
lib/qt4/translations/qt_es.qm
+lib/qt4/translations/qt_eu.qm
lib/qt4/translations/qt_fa.qm
lib/qt4/translations/qt_fr.qm
lib/qt4/translations/qt_gl.qm
@@ -4146,6 +4159,7 @@ lib/qt4/translations/qt_he.qm
lib/qt4/translations/qt_help_cs.qm
lib/qt4/translations/qt_help_da.qm
lib/qt4/translations/qt_help_de.qm
+lib/qt4/translations/qt_help_eu.qm
lib/qt4/translations/qt_help_fr.qm
lib/qt4/translations/qt_help_gl.qm
lib/qt4/translations/qt_help_hu.qm
@@ -4170,6 +4184,8 @@ lib/qt4/translations/qt_sv.qm
lib/qt4/translations/qt_uk.qm
lib/qt4/translations/qt_zh_CN.qm
lib/qt4/translations/qt_zh_TW.qm
+lib/qt4/translations/qtconfig_eu.qm
+lib/qt4/translations/qtconfig_he.qm
lib/qt4/translations/qtconfig_hu.qm
lib/qt4/translations/qtconfig_ja.qm
lib/qt4/translations/qtconfig_ko.qm
@@ -4179,6 +4195,8 @@ lib/qt4/translations/qtconfig_sl.qm
lib/qt4/translations/qtconfig_uk.qm
lib/qt4/translations/qtconfig_zh_CN.qm
lib/qt4/translations/qtconfig_zh_TW.qm
+lib/qt4/translations/qtscript_eu.qm
+lib/qt4/translations/qvfb_eu.qm
lib/qt4/translations/qvfb_hu.qm
lib/qt4/translations/qvfb_ja.qm
lib/qt4/translations/qvfb_ko.qm
