aboutsummaryrefslogtreecommitdiff
path: root/libraries/qt5/patches
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-06-19 06:57:50 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-06-19 06:57:50 +0700
commit1d2197d33770f854ac1a8b89054ab8a2fe9e6071 (patch)
tree806784ff614a77e5844a8fafb2f2b3e83b2d827c /libraries/qt5/patches
parente0a490df426c8320689d6b5cfa5c460e9b30386b (diff)
libraries/qt5: Updated for version 5.6.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/qt5/patches')
-rw-r--r--libraries/qt5/patches/platformplugin-install-path-fix.patch13
-rw-r--r--libraries/qt5/patches/qt5.whandle.patch24
2 files changed, 0 insertions, 37 deletions
diff --git a/libraries/qt5/patches/platformplugin-install-path-fix.patch b/libraries/qt5/patches/platformplugin-install-path-fix.patch
deleted file mode 100644
index 022166de6690..000000000000
--- a/libraries/qt5/patches/platformplugin-install-path-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro
---- qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2013-04-09 00:11:38.000000000 +0000
-+++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2013-05-31 01:18:29.157175082 +0000
-@@ -20,7 +20,8 @@
- }
- }
-
--DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit
-+target.path = $$[QT_INSTALL_PLUGINS]/webkit
-+INSTALLS += target
-
- SOURCES += \
- WebPlugin.cpp \
diff --git a/libraries/qt5/patches/qt5.whandle.patch b/libraries/qt5/patches/qt5.whandle.patch
deleted file mode 100644
index 4428974d043b..000000000000
--- a/libraries/qt5/patches/qt5.whandle.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Ulf Hermann <ulf.hermann@theqtcompany.com>
-Date: Tue, 27 Oct 2015 14:25:42 +0000 (+0100)
-Subject: WIP: Also do hide/show via WA_OutsideWSRange for native widgets
-X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=5ea44d1d516f0c68a6793279df5c1569ef9fadd2
-
-WIP: Also do hide/show via WA_OutsideWSRange for native widgets
-
-Task-number: QTBUG-48321
-Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c
----
-
-diff --git a/qtbase/src/widgets/kernel/qwidget.cpp b/qtbase/src/widgets/kernel/qwidget.cpp
-index a006246..024005d 100644
---- a/qtbase/src/widgets/kernel/qwidget.cpp
-+++ b/qtbase/src/widgets/kernel/qwidget.cpp
-@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
-
- bool needsShow = false;
-
-- if (q->isWindow()) {
-+ if (q->isWindow() || q->windowHandle()) {
- if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) {
- q->setAttribute(Qt::WA_OutsideWSRange, true);
- if (q->isVisible() && q->testAttribute(Qt::WA_Mapped))