dev-qt: remove 4.8.5

2 files changed, 0 insertions, 125 deletions

diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch b/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch
deleted file mode 100644
index c975ebfaca2d..000000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@digia.com>
-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 <david.faure@kdab.com>
----
- src/gui/kernel/qkeymapper_x11.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
-index 005ff3f..7daa41d 100644
---- a/src/gui/kernel/qkeymapper_x11.cpp
-+++ b/src/gui/kernel/qkeymapper_x11.cpp
-@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event)
- 
-     // 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>();
- 
--- 
-1.8.3.2
-
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch b/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch
deleted file mode 100644
index 47d35e232499..000000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 2a9ea11f4dea51f9e75036aab8e7a23f0eb4bd1f Mon Sep 17 00:00:00 2001
-From: aavit <eirik.aavitsland@digia.com>
-Date: Tue, 10 Sep 2013 11:46:51 +0200
-Subject: Compilation fix for libjpeg release 9
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In the latest libjpeg version, the "boolean" type is changed so that
-true and false no longer can be used instead of TRUE and FALSE.
-
-Also, purge some ancient code remains meant to support a now defunct
-OS´s idea about the boolean type.
-
-Task-number: QTBUG-33166
-Change-Id: Iebbdf300cfdc22775954de65f985358424ed2b49
-Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
-(cherry picked from qtbase/fad6aa619bf6eb048821a58065433f6b598c10e4)
----
- src/gui/image/qjpeghandler.cpp | 27 +++++----------------------
- 1 file changed, 5 insertions(+), 22 deletions(-)
-
-diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
-index a8700b7..ba5c469 100644
---- a/src/gui/image/qjpeghandler.cpp
-+++ b/src/gui/image/qjpeghandler.cpp
-@@ -157,11 +157,7 @@ static boolean qt_fill_input_buffer(j_decompress_ptr cinfo)
-     } else {
-         src->bytes_in_buffer = num_read;
-     }
--#if defined(Q_OS_UNIXWARE)
--    return B_TRUE;
--#else
--    return true;
--#endif
-+    return TRUE;
- }
- 
- static void qt_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
-@@ -489,11 +485,7 @@ static boolean qt_empty_output_buffer(j_compress_ptr cinfo)
-     dest->next_output_byte = dest->buffer;
-     dest->free_in_buffer = max_buf;
- 
--#if defined(Q_OS_UNIXWARE)
--    return B_TRUE;
--#else
--    return true;
--#endif
-+    return TRUE;
- }
- 
- static void qt_term_destination(j_compress_ptr cinfo)
-@@ -584,13 +576,8 @@ static bool write_jpeg_image(const QImage &image, QIODevice *device, int sourceQ
- 
- 
-         int quality = sourceQuality >= 0 ? qMin(sourceQuality,100) : 75;
--#if defined(Q_OS_UNIXWARE)
--        jpeg_set_quality(&cinfo, quality, B_TRUE /* limit to baseline-JPEG values */);
--        jpeg_start_compress(&cinfo, B_TRUE);
--#else
--        jpeg_set_quality(&cinfo, quality, true /* limit to baseline-JPEG values */);
--        jpeg_start_compress(&cinfo, true);
--#endif
-+        jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
-+        jpeg_start_compress(&cinfo, TRUE);
- 
-         row_pointer[0] = new uchar[cinfo.image_width*cinfo.input_components];
-         int w = cinfo.image_width;
-@@ -751,11 +738,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device)
-         err.error_exit = my_error_exit;
- 
-         if (!setjmp(err.setjmp_buffer)) {
--    #if defined(Q_OS_UNIXWARE)
--            (void) jpeg_read_header(&info, B_TRUE);
--    #else
--            (void) jpeg_read_header(&info, true);
--    #endif
-+            (void) jpeg_read_header(&info, TRUE);
- 
-             int width = 0;
-             int height = 0;
--- 
-2.0.0
-