summaryrefslogtreecommitdiffstats
path: root/deps/qt/qt.webkit-no_Werror.patch
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-01-24 19:37:30 +0100
committer Eric Hameleers <alien@slackware.com>2015-01-24 19:37:30 +0100
commit03e1ed04d7a06d039e5dc317638aa5a6b4773f8c (patch)
tree71647cc408cc17d130c16f2527f59ff6cd58cf73 /deps/qt/qt.webkit-no_Werror.patch
parent63815cb3bce281c3f745f1da4ddc86f4ae4c1701 (diff)
downloadktown-03e1ed04d7a06d039e5dc317638aa5a6b4773f8c.tar.gz
ktown-03e1ed04d7a06d039e5dc317638aa5a6b4773f8c.tar.xz
Add support for Qt4 applications to dock to the Plasma 5 systray.
qt-4.8.6: added dep; compared to the Slackware original, I have applied several patches to impement qsystemtrayicon support. sni-qt: added dep; this application actually provides the systray support for Qt4 apps in Plasma 5.
Diffstat (limited to 'deps/qt/qt.webkit-no_Werror.patch')
-rw-r--r--deps/qt/qt.webkit-no_Werror.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/deps/qt/qt.webkit-no_Werror.patch b/deps/qt/qt.webkit-no_Werror.patch
new file mode 100644
index 0000000..c8d730e
--- /dev/null
+++ b/deps/qt/qt.webkit-no_Werror.patch
@@ -0,0 +1,11 @@
+--- qt-everywhere-opensource-src-4.8.4/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-12-02 15:59:44.891550783 +0100
++++ qt-everywhere-opensource-src-4.8.4/src/3rdparty/webkit/Source/WebKit.pri 2012-12-02 16:52:47.384406539 +0100
+@@ -102,8 +102,6 @@
+
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
+- !CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror
+-
+ greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
+ if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
+ # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).