From b785d4813e5d0f428b9563b3cea7cc6953fc24db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sat, 26 May 2018 09:05:18 +0200
Subject: [PATCH 1/8] qt5: 5.10 -> 5.11

This is the first time since 5.9 that we also update `qtwebkit`.
`qtwebkit` is not maintained by Qt anymore and thus, we switch to the
community port as for example arch has done. To prevent pulling in
single patches, we just stick to the latest git version.
---
 pkgs/development/libraries/qt-5/5.10/fetch.sh |   2 -
 .../libraries/qt-5/5.10/qtwebkit.patch        |  77 ----
 pkgs/development/libraries/qt-5/5.10/srcs.nix | 341 ------------------
 .../libraries/qt-5/{5.10 => 5.11}/default.nix |  14 +-
 pkgs/development/libraries/qt-5/5.11/fetch.sh |   2 +
 .../qt-5/{5.10 => 5.11}/qtbase-darwin.patch   |  27 +-
 .../qt-5/{5.10 => 5.11}/qtbase.patch          | 139 +++----
 .../qt-5/{5.10 => 5.11}/qtdeclarative.patch   |   0
 .../qt-5/{5.10 => 5.11}/qtscript.patch        |   0
 .../qt-5/{5.10 => 5.11}/qtserialport.patch    |   0
 .../qt-5/{5.10 => 5.11}/qttools.patch         |   0
 .../qtwebengine-paxmark-mksnapshot.patch      |   0
 .../libraries/qt-5/5.11/qtwebkit.patch        |  12 +
 pkgs/development/libraries/qt-5/5.11/srcs.nix | 325 +++++++++++++++++
 .../libraries/qt-5/modules/qtbase.nix         |   9 +-
 .../libraries/qt-5/modules/qtdeclarative.nix  |   1 +
 .../libraries/qt-5/modules/qtwebkit.nix       |  33 +-
 pkgs/development/libraries/qt-5/qtModule.nix  |   4 +-
 pkgs/top-level/all-packages.nix               |  12 +-
 19 files changed, 456 insertions(+), 542 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.10/fetch.sh
 delete mode 100644 pkgs/development/libraries/qt-5/5.10/qtwebkit.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.10/srcs.nix
 rename pkgs/development/libraries/qt-5/{5.10 => 5.11}/default.nix (91%)
 create mode 100644 pkgs/development/libraries/qt-5/5.11/fetch.sh
 rename pkgs/development/libraries/qt-5/{5.10 => 5.11}/qtbase-darwin.patch (74%)
 rename pkgs/development/libraries/qt-5/{5.10 => 5.11}/qtbase.patch (94%)
 rename pkgs/development/libraries/qt-5/{5.10 => 5.11}/qtdeclarative.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.10 => 5.11}/qtscript.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.10 => 5.11}/qtserialport.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.10 => 5.11}/qttools.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.10 => 5.11}/qtwebengine-paxmark-mksnapshot.patch (100%)
 create mode 100644 pkgs/development/libraries/qt-5/5.11/qtwebkit.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.11/srcs.nix

diff --git a/pkgs/development/libraries/qt-5/5.10/fetch.sh b/pkgs/development/libraries/qt-5/5.10/fetch.sh
deleted file mode 100644
index 4770644ae4e..00000000000
--- a/pkgs/development/libraries/qt-5/5.10/fetch.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/ \
-            -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch
deleted file mode 100644
index c78cb58f564..00000000000
--- a/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri
-index 69e4cd1f3..3f729a75e 100644
---- a/Source/WTF/WTF.pri
-+++ b/Source/WTF/WTF.pri
-@@ -12,7 +12,7 @@ mac {
-     # Mac OS does ship libicu but not the associated header files.
-     # Therefore WebKit provides adequate header files.
-     INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
--    LIBS += -licucore
-+    LIBS += /usr/lib/libicucore.dylib
- } else:!use?(wchar_unicode): {
-     win32 {
-         CONFIG(static, static|shared) {
-diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index a923d49aa..46772a4bb 100644
---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* module = 0)
-         }
-     }
- 
-+#ifdef NIXPKGS_LIBGTK2
-+    QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0);
-+#else
-     QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
-+#endif
-     if (library.load()) {
-         typedef void *(*gtk_init_check_ptr)(int*, char***);
-         gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-index de06a2fea..86fe39ef1 100644
---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-@@ -697,7 +697,11 @@ static Display *getPluginDisplay()
-     // support gdk based plugins (like flash) that use a different X connection.
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
-+#ifdef NIXPKGS_LIBGDK2
-+    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
-+#else
-     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+#endif
-     if (!library.load())
-         return 0;
- 
-diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-index 8de65216b..38f5c05e5 100644
---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
- 
- static bool initializeGtk()
- {
-+#ifdef NIXPKGS_LIBGTK2
-+    QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0);
-+#else
-     QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
-+#endif
-     if (!gtkLibrary.load())
-         return false;
-     typedef void* (*gtk_init_ptr)(void*, void*);
-diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-index d734ff684..0f6ff63d1 100644
---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -64,7 +64,11 @@ static Display* getPluginDisplay()
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- 
-+#ifdef NIXPKGS_LIBGDK2
-+    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
-+#else
-     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+#endif
-     if (!library.load())
-         return 0;
- 
diff --git a/pkgs/development/libraries/qt-5/5.10/srcs.nix b/pkgs/development/libraries/qt-5/5.10/srcs.nix
deleted file mode 100644
index 025c7aa44e1..00000000000
--- a/pkgs/development/libraries/qt-5/5.10/srcs.nix
+++ /dev/null
@@ -1,341 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
-{ fetchurl, mirror }:
-
-{
-  qt3d = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qt3d-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0fvb346xhiyc0csxcvs5ifwkzs9wnza54vvsw6dvyax76qjv87q4";
-      name = "qt3d-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtactiveqt-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1r4i72i1pl9xnmcx8rr8g48fmym8mxs28pkg1nl302xi6izan8ch";
-      name = "qtactiveqt-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtandroidextras = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtandroidextras-everywhere-src-5.10.1.tar.xz";
-      sha256 = "03jmf7gw4abn5gj92b1ns0k75bbi4wycbc4bbb7c9mngzkv3nzkn";
-      name = "qtandroidextras-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtbase-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0sd9cn3ywkjfswddcxhbfplkwk8snqld752q5laaapdakhc0wrnq";
-      name = "qtbase-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtcanvas3d = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcanvas3d-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1h5hpjwdyp824r2ajmaqjcshra06yfzz7dp991h4kf54da79m0ny";
-      name = "qtcanvas3d-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtcharts = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtcharts-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1j8y683ainri9ma44ky6q87pjs1d794znb2wfsrbplixyxxmf3ag";
-      name = "qtcharts-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtconnectivity-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1j9ydlkwz3039yslaizz923h0qbszm4z2sqspk28wr8rd3f22a35";
-      name = "qtconnectivity-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtdatavis3d = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdatavis3d-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0ny8j689jm2fghklzw894yc5hjqa23yf395yv17yvwi72kpiz0b3";
-      name = "qtdatavis3d-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdeclarative-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0lwmg1qan886czzkzi4px36mqxlqiw0acrsa9kqcddg5pi8yvy9s";
-      name = "qtdeclarative-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtdoc-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1gl62acr346jrcfxla8vxlczf706a3md52zc0zaqbjw9rf2bgnqq";
-      name = "qtdoc-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtgamepad = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgamepad-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1xs6adpnv5ymdmb7kcbvcc0vx2lp6wqz53pzr9amyzbgyl0jiiw5";
-      name = "qtgamepad-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtgraphicaleffects-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0zw4n6s42w70r45gjg66ad0s9dpxil6wmwwrivshnqvrnlqhcfrz";
-      name = "qtgraphicaleffects-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtimageformats-everywhere-src-5.10.1.tar.xz";
-      sha256 = "10x248s4a6ij18awkdskk3g7zfw6gwyj63l2jr803blyfyibl118";
-      name = "qtimageformats-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtlocation-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1jbjzl6gwxy4n43x6m55b86vkdpjvwyvw7xsxg4a40f72xaw0p2y";
-      name = "qtlocation-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmacextras-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1jkzizsa8nr1dp5n9p81s6ylnqfh0vqwz8l72632fg68x229jfn7";
-      name = "qtmacextras-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtmultimedia-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0j9nq8s2kzfc7zqs253pixqwd5xjv2cbqyik5lgvi9p5bq0riym1";
-      name = "qtmultimedia-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtnetworkauth = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtnetworkauth-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1p6wnma2nygqbjhrbiijjgkc8jq6lkdmq6xaxcgdh8ynkcqiq8wp";
-      name = "qtnetworkauth-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtpurchasing = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtpurchasing-everywhere-src-5.10.1.tar.xz";
-      sha256 = "090gmxy5bp44rirl5yrb1ryn97z37ri4fmmclh9z7c4dvnmr2d3j";
-      name = "qtpurchasing-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtquickcontrols = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1dw22sk2x5bk2mix06w8dv1b05dyq0gx088aqvdz18y67ncs2cfj";
-      name = "qtquickcontrols-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtquickcontrols2 = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtquickcontrols2-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0jk01vgzc78w45q8kys1hwri3jx0hzx5vxivzmv8nh8yj0dlmijx";
-      name = "qtquickcontrols2-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtremoteobjects = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtremoteobjects-everywhere-src-5.10.1.tar.xz";
-      sha256 = "052fa27rv4b9h6qbldrq013zxb69ysgmqnxbyv9c48s2ra50pnp9";
-      name = "qtremoteobjects-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscript-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0bakr5xcxc6j6l78fyazh7sgcz2hwf2g8k60jb9307qzrgvqlqg0";
-      name = "qtscript-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtscxml = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtscxml-everywhere-src-5.10.1.tar.xz";
-      sha256 = "00v1n86pyw9cm320qa2fpazvkfi6czd027x60k2g2sprwh0x4hhb";
-      name = "qtscxml-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsensors-everywhere-src-5.10.1.tar.xz";
-      sha256 = "15jw2r6snhwi26b4ajp7m89l89kaf1j0kgqds4wjpksk1rngf3dv";
-      name = "qtsensors-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtserialbus = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialbus-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0mr2j86mk1fm9z5iba3kav651231j9jv0805q8716h7ia1ws2l06";
-      name = "qtserialbus-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtserialport-everywhere-src-5.10.1.tar.xz";
-      sha256 = "17ja368ggl9aak64r8sqzx34j2i8zv7z60bkhncynrgipc9wpr08";
-      name = "qtserialport-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtspeech = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtspeech-everywhere-src-5.10.1.tar.xz";
-      sha256 = "07clcy3bslq4fk7xb6cqlfsz5frhmy41hzpajdqjwj9h6dvmqxw5";
-      name = "qtspeech-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtsvg-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0nkz3kxclk7s95fnh8xgljahk131mwb8pjllgp7n70ycmc20rq00";
-      name = "qtsvg-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qttools = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttools-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0lwa0i6zspcrii0ak1dyxacif1fkv2vhmdp3dmp7af71bwg49spi";
-      name = "qttools-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qttranslations-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1za34rvn3bhzi4mxqm9lghdhaqcxpsi6xa61dfbhpc047l788v8z";
-      name = "qttranslations-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtvirtualkeyboard = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0bnmhy0kibvyra0i15qzwc9195s8wpfhg5gk0d6rfwd5d07gj6a3";
-      name = "qtvirtualkeyboard-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwayland-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0mk3p8pkfia3z7v7phk0qdyzd1zkfpk92c995g851p5wbqx699zm";
-      name = "qtwayland-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebchannel-everywhere-src-5.10.1.tar.xz";
-      sha256 = "0r1p1ar4xh7g7lzi564hgw1ng5xkim4mkpgq29ymjlmhxjgl8b62";
-      name = "qtwebchannel-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebengine-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1ph1pinxn0dp44zall9gihbgziira4zpynixacm4ldd85f6lyr0j";
-      name = "qtwebengine-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebglplugin = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebglplugin-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1hdzymwai5f6agkn4hz32aq5fjv2lqdac285fwrlk5gsff0j0yal";
-      name = "qtwebglplugin-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebsockets-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1sjkml5kqigvyxrkv5b7x1cy69d69dzma40yfg72vr7zal4pkkvf";
-      name = "qtwebsockets-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebview = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwebview-everywhere-src-5.10.1.tar.xz";
-      sha256 = "110mwc423cq1bwdz0vv78cjprzy03xawxnxhfcs4138gssfj0n0b";
-      name = "qtwebview-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwinextras = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtwinextras-everywhere-src-5.10.1.tar.xz";
-      sha256 = "05w9n8kry1mg3i14i4m98gm5hf20mlwxbagbk9xk11xykbm1wh0j";
-      name = "qtwinextras-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtx11extras-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1d4pvisxbcyb7ljl1lh2zg72kw44h9kk14l0xmvajb8bslgkg2n3";
-      name = "qtx11extras-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtxmlpatterns = {
-    version = "5.10.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.10/5.10.1/submodules/qtxmlpatterns-everywhere-src-5.10.1.tar.xz";
-      sha256 = "1zp9smsfdqyfiarxs7r8kfr7yq68cdn7biddwl36cybax6fgbpiw";
-      name = "qtxmlpatterns-everywhere-src-5.10.1.tar.xz";
-    };
-  };
-  qtwebkit = {
-    version = "5.9.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz";
-      sha256 = "1ksjn1vjbfhdm4y4rg08ag4krk87ahp7qcdcpwll42l0rnz61998";
-      name = "qtwebkit-opensource-src-5.9.1.tar.xz";
-    };
-  };
-  qtwebkit-examples = {
-    version = "5.9.1";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz";
-      sha256 = "1l2l7ycgqql6rf4gx6sjhsqjapdhvy6vxaxssax3l938nkk4vkp4";
-      name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
similarity index 91%
rename from pkgs/development/libraries/qt-5/5.10/default.nix
rename to pkgs/development/libraries/qt-5/5.11/default.nix
index 3969e01a2b9..fa3ac8f8503 100644
--- a/pkgs/development/libraries/qt-5/5.10/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -17,7 +17,7 @@ top-level attribute to `top-level/all-packages.nix`.
 
 {
   newScope,
-  stdenv, fetchurl, makeSetupHook, makeWrapper,
+  stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper,
   bison, cups ? null, harfbuzz, libGL, perl,
   gstreamer, gst-plugins-base, gtk3, dconf,
 
@@ -31,7 +31,7 @@ with stdenv.lib;
 
 let
 
-  qtCompatVersion = "5.10";
+  qtCompatVersion = "5.11";
 
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
@@ -96,7 +96,15 @@ let
       qtwayland = callPackage ../modules/qtwayland.nix {};
       qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
       qtwebengine = callPackage ../modules/qtwebengine.nix {};
-      qtwebkit = callPackage ../modules/qtwebkit.nix {};
+      qtwebkit = callPackage ../modules/qtwebkit.nix {
+        src = fetchFromGitHub {
+          owner = "annulen";
+          repo = "webkit";
+          rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
+          sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
+        };
+        version = "5.212-alpha-01-26-2018";
+      };
       qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
       qtx11extras = callPackage ../modules/qtx11extras.nix {};
       qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh
new file mode 100644
index 00000000000..aaf42c5c5b2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/fetch.sh
@@ -0,0 +1,2 @@
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.0/submodules/ \
+            -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch
similarity index 74%
rename from pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch
rename to pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch
index fa389fe55c2..8c9d50bdf5d 100644
--- a/pkgs/development/libraries/qt-5/5.10/qtbase-darwin.patch
+++ b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch
@@ -1,16 +1,3 @@
-diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-index 66baf16..89794ef 100644
---- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl
- 
- QFixed QCoreTextFontEngine::emSquareSize() const
- {
--    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
-+    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
- }
- 
- QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
 diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
 index 341d3bccf2..3368234c26 100644
 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -34,11 +21,11 @@ index 341d3bccf2..3368234c26 100644
              scanThread->interfaceName = QString::fromNSString(ifName);
              scanThread->start();
 diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
-index d1f19f2..1ac2cf1 100644
+index 54254455e4..e10f62909a 100644
 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm
 +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
-@@ -1699,7 +1699,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
-
+@@ -1674,7 +1674,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
+ 
      if (!m_drawContentBorderGradient) {
          window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask;
 -        [window.contentView.superview setNeedsDisplay:YES];
@@ -47,10 +34,10 @@ index d1f19f2..1ac2cf1 100644
          return;
      }
 diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm
-index e846fa0..4171cd4 100644
+index cb13b7d184..0159d68dca 100644
 --- a/src/plugins/platforms/cocoa/qnswindow.mm
 +++ b/src/plugins/platforms/cocoa/qnswindow.mm
-@@ -224,7 +224,7 @@ static bool isMouseEvent(NSEvent *ev)
+@@ -231,7 +231,7 @@ static bool isMouseEvent(NSEvent *ev)
      if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) {
          NSPoint loc = [theEvent locationInWindow];
          NSRect windowFrame = [self convertRectFromScreen:self.frame];
@@ -59,12 +46,12 @@ index e846fa0..4171cd4 100644
          if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO))
              [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent];
      }
-@@ -253,7 +253,7 @@ static bool isMouseEvent(NSEvent *ev)
+@@ -260,7 +260,7 @@ static bool isMouseEvent(NSEvent *ev)
  + (void)applicationActivationChanged:(NSNotification*)notification
  {
      const id sender = self;
 -    NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
 +    NSEnumerator *windowEnumerator = nullptr;
      NSApplication *application = [NSApplication sharedApplication];
-
+ 
  #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase.patch b/pkgs/development/libraries/qt-5/5.11/qtbase.patch
similarity index 94%
rename from pkgs/development/libraries/qt-5/5.10/qtbase.patch
rename to pkgs/development/libraries/qt-5/5.11/qtbase.patch
index 286dea2178b..ec8d27ebb6c 100644
--- a/pkgs/development/libraries/qt-5/5.10/qtbase.patch
+++ b/pkgs/development/libraries/qt-5/5.11/qtbase.patch
@@ -12,7 +12,7 @@ index 5208379f9a..92fe29a0ac 100644
  
  QMAKE_LFLAGS_REL_RPATH  =
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index bb5083c925..77034f9bb6 100644
+index 66acedef55..fe01bf8de4 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -21,7 +21,7 @@ load(cmake_functions)
@@ -24,7 +24,7 @@ index bb5083c925..77034f9bb6 100644
  contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
  
  CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
-@@ -47,47 +47,22 @@ split_incpath {
+@@ -47,49 +47,20 @@ split_incpath {
          $$cmake_extra_source_includes.output
  }
  
@@ -33,11 +33,11 @@ index bb5083c925..77034f9bb6 100644
 -    CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/
 -    CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
 -}
-+CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/
-+CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
- 
- !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true
- 
+-
+-isEmpty(QT.$${MODULE}_private.includes)| \
+-        !exists($$first(QT.$${MODULE}_private.includes)): \
+-    CMAKE_NO_PRIVATE_INCLUDES = true
+-
 -CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
 -contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
 -    CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
@@ -48,8 +48,8 @@ index bb5083c925..77034f9bb6 100644
 -    # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}
 -    CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"
 -}
-+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/
-+CMAKE_LIB_DIR_IS_ABSOLUTE = True
++CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/
++CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
  
 -CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
 -contains(CMAKE_BIN_DIR, "^\\.\\./.*") {
@@ -64,8 +64,8 @@ index bb5083c925..77034f9bb6 100644
 -    CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/
 -    CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
 -}
-+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/
-+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/
++CMAKE_LIB_DIR_IS_ABSOLUTE = True
  
 -win32:!static:!staticlib {
 -    CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX])
@@ -77,12 +77,15 @@ index bb5083c925..77034f9bb6 100644
 -    CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
 -    CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
 -}
++CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/
++CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
++ 
 +CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/
 +CMAKE_DLL_DIR_IS_ABSOLUTE = True
  
  static|staticlib:CMAKE_STATIC_TYPE = true
  
-@@ -167,7 +142,7 @@ contains(CONFIG, plugin) {
+@@ -169,7 +140,7 @@ contains(CONFIG, plugin) {
        cmake_target_file
  
      cmake_qt5_plugin_file.files = $$cmake_target_file.output
@@ -91,7 +94,7 @@ index bb5083c925..77034f9bb6 100644
      INSTALLS += cmake_qt5_plugin_file
  
      return()
-@@ -314,7 +289,7 @@ exists($$cmake_macros_file.input) {
+@@ -316,7 +287,7 @@ exists($$cmake_macros_file.input) {
      cmake_qt5_module_files.files += $$cmake_macros_file.output
  }
  
@@ -101,12 +104,12 @@ index bb5083c925..77034f9bb6 100644
  # We are generating cmake files. Most developers of Qt are not aware of cmake,
  # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 55c74aad66..0bbc8718eb 100644
+index 27f4c277d6..18b4813e25 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
+@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
+     message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
  endif()
- !!ENDIF
  
 -!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
 -!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -135,7 +138,7 @@ index 55c74aad66..0bbc8718eb 100644
  !!IF !equals(TEMPLATE, aux)
  # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
  set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
-@@ -58,11 +34,7 @@ endmacro()
+@@ -52,11 +28,7 @@ endmacro()
  macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
@@ -147,7 +150,7 @@ index 55c74aad66..0bbc8718eb 100644
      _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
      set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
          \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-@@ -75,11 +47,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
      )
  
  !!IF !isEmpty(CMAKE_WINDOWS_BUILD)
@@ -159,7 +162,7 @@ index 55c74aad66..0bbc8718eb 100644
      _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
      if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
          set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-@@ -95,24 +63,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!IF !no_module_headers
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
@@ -188,7 +191,7 @@ index 55c74aad66..0bbc8718eb 100644
      )
  !!ELSE
      set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -128,7 +85,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
  !!ENDIF
  !!ENDIF
@@ -196,7 +199,7 @@ index 55c74aad66..0bbc8718eb 100644
  !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
      include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
  !!ENDIF
-@@ -280,25 +236,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -269,25 +225,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
  !!IF isEmpty(CMAKE_DEBUG_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -222,7 +225,7 @@ index 55c74aad66..0bbc8718eb 100644
          _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
  !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
      endif()
-@@ -317,25 +261,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -306,25 +250,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
  !!IF isEmpty(CMAKE_RELEASE_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
@@ -248,7 +251,7 @@ index 55c74aad66..0bbc8718eb 100644
          _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
      endif()
-@@ -354,11 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -343,11 +275,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
          set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
@@ -454,13 +457,13 @@ index 50a1ec6764..d6368b769e 100644
 -
 -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
 diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
-index f1a4ca77b2..3b01424e67 100644
+index f1a4ca77b2..61ed486a76 100644
 --- a/mkspecs/features/mac/default_pre.prf
 +++ b/mkspecs/features/mac/default_pre.prf
-@@ -1,67 +1,2 @@
+@@ -1,67 +1,3 @@
  CONFIG = asset_catalogs rez $$CONFIG
  load(default_pre)
--
+ 
 -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
 -    # Get path of Xcode's Developer directory
 -    QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")
@@ -526,11 +529,11 @@ index f1a4ca77b2..3b01424e67 100644
 -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}"
 -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
 diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
-index 3f6dc076ca..e69de29bb2 100644
+index 8360dd8b38..8b13789179 100644
 --- a/mkspecs/features/mac/sdk.prf
 +++ b/mkspecs/features/mac/sdk.prf
-@@ -1,58 +0,0 @@
--
+@@ -1,58 +1 @@
+ 
 -isEmpty(QMAKE_MAC_SDK): \
 -    error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
 -
@@ -540,21 +543,21 @@ index 3f6dc076ca..e69de29bb2 100644
 -defineReplace(xcodeSDKInfo) {
 -    info = $$1
 -    equals(info, "Path"): \
--        info = --show-sdk-path
+-        infoarg = --show-sdk-path
 -    equals(info, "PlatformPath"): \
--        info = --show-sdk-platform-path
+-        infoarg = --show-sdk-platform-path
 -    equals(info, "SDKVersion"): \
--        info = --show-sdk-version
+-        infoarg = --show-sdk-version
 -    sdk = $$2
 -    isEmpty(sdk): \
 -        sdk = $$QMAKE_MAC_SDK
 -
 -    isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
--        QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")
+-        QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")
 -        # --show-sdk-platform-path won't work for Command Line Tools; this is fine
 -        # only used by the XCTest backend to testlib
--        isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \
--            error("Could not resolve SDK $$info for \'$$sdk\'")
+-        isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \
+-            error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg")
 -        cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
 -    }
 -
@@ -572,7 +575,7 @@ index 3f6dc076ca..e69de29bb2 100644
 -QMAKESPEC_NAME = $$basename(QMAKESPEC)
 -
 -# Resolve SDK version of various tools
--for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) {
+-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) {
 -    tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool}
 -    !isEmpty($$tool_variable) {
 -        $$tool = $$eval($$tool_variable)
@@ -670,7 +673,7 @@ index f4ae5bde80..6d4c6d223f 100644
      contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
          lib_replace.match = "[^ ']*$$rplbase/lib"
 diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
-index 72dde61a40..f891a2baed 100644
+index 3139c443c6..1b4f2fddd8 100644
 --- a/mkspecs/features/qt_docs.prf
 +++ b/mkspecs/features/qt_docs.prf
 @@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
@@ -709,7 +712,7 @@ index 72dde61a40..f891a2baed 100644
      INSTALLS += inst_qch_docs
  
 diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
-index c9ce926b1a..f00868a031 100644
+index 43b58817fe..e635b8f67a 100644
 --- a/mkspecs/features/qt_example_installs.prf
 +++ b/mkspecs/features/qt_example_installs.prf
 @@ -88,7 +88,7 @@ sourcefiles += \
@@ -735,7 +738,7 @@ index 1903e509c8..ae7b585989 100644
              $${1}_EXE = $${cmd}.pl
              cmd = perl -w $$system_path($${cmd}.pl)
 diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
-index 90d84cc535..387481bfc6 100644
+index 8f98987b99..21b3bb8b32 100644
 --- a/mkspecs/features/qt_installs.prf
 +++ b/mkspecs/features/qt_installs.prf
 @@ -12,16 +12,10 @@
@@ -760,10 +763,10 @@ index 90d84cc535..387481bfc6 100644
 @@ -29,33 +23,33 @@
  #headers
  qt_install_headers {
-     class_headers.files = $$SYNCQT.HEADER_CLASSES
--    class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
-+    class_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME
-     INSTALLS += class_headers
+     gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES
+-    gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
++    gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME
+     INSTALLS += gen_headers
  
      targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES
 -    targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
@@ -798,7 +801,7 @@ index 90d84cc535..387481bfc6 100644
          INSTALLS += privpritarget
      }
 diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
-index 14fc5f9a94..2a0f2cd27f 100644
+index bf90adcf1e..b3de698ff7 100644
 --- a/mkspecs/features/qt_plugin.prf
 +++ b/mkspecs/features/qt_plugin.prf
 @@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build {
@@ -811,7 +814,7 @@ index 14fc5f9a94..2a0f2cd27f 100644
  
  TARGET = $$qt5LibraryTarget($$TARGET)
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 545b9a3d1e..6ac0cdefe4 100644
+index e0652fdcf9..450b2a2d28 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
@@ -841,7 +844,7 @@ index 545b9a3d1e..6ac0cdefe4 100644
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-@@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain)
+@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain)
  !!IF !isEmpty(CMAKE_RELEASE_TYPE)
      set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -850,7 +853,7 @@ index 545b9a3d1e..6ac0cdefe4 100644
  !!ELSE
      set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
  !!ENDIF
-@@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain)
+@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain)
      set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
  
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -884,10 +887,10 @@ index 706304cf34..546420f6ad 100644
  set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
  !!ENDIF
 diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
-index 3814894630..3c6468277c 100644
+index 4e32f90964..503aeffd0c 100644
 --- a/src/corelib/kernel/qcoreapplication.cpp
 +++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2601,6 +2601,15 @@ QStringList QCoreApplication::libraryPaths()
+@@ -2613,6 +2613,15 @@ QStringList QCoreApplication::libraryPaths()
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
  
@@ -1001,32 +1004,6 @@ index 07869efd7d..fb4183bada 100644
  !!ELSE
      set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  !!ENDIF
-diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp
-index ce1ec6442a..4f75655abe 100644
---- a/src/network/kernel/qdnslookup_unix.cpp
-+++ b/src/network/kernel/qdnslookup_unix.cpp
-@@ -95,7 +95,7 @@ static bool resolveLibraryInternal()
-     if (!lib.load())
- #endif
-     {
--        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
-         if (!lib.load())
-             return false;
-     }
-diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
-index 8d2cffc304..9730fb33f2 100644
---- a/src/network/kernel/qhostinfo_unix.cpp
-+++ b/src/network/kernel/qhostinfo_unix.cpp
-@@ -98,7 +98,7 @@ static bool resolveLibraryInternal()
-     if (!lib.load())
- #endif
-     {
--        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV));
-         if (!lib.load())
-             return false;
-     }
 diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
 index b5a0a5bbeb..6c20305f4d 100644
 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -1046,15 +1023,17 @@ index b5a0a5bbeb..6c20305f4d 100644
  
  QString TableGenerator::findComposeFile()
 diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-index a59dc15b0e..a13ee89b5a 100644
+index cc982b3379..0c5005d3d7 100644
 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
 +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-@@ -584,7 +584,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName)
+@@ -648,9 +648,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName)
  #if QT_CONFIG(library)
                  extern const QString qt_gl_library_name();
  //                QLibrary lib(qt_gl_library_name());
 +                // Check system library paths first
                  QLibrary lib(QLatin1String("GL"));
+-                if (!lib.load())
+-                    lib.setFileNameAndVersion(QLatin1String("GL"), 1);
 +#ifdef NIXPKGS_MESA_GL
 +                if (!lib.load()) {
 +                    // Fallback to Mesa driver
@@ -1065,10 +1044,10 @@ index a59dc15b0e..a13ee89b5a 100644
  #endif
              }
 diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
-index da63360333..95e34e2e50 100644
+index 8d151b760b..a8b39d282a 100644
 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp
 +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
+@@ -314,10 +314,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
  #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
      static bool function_ptrs_not_initialized = true;
      if (function_ptrs_not_initialized) {
@@ -1082,7 +1061,7 @@ index da63360333..95e34e2e50 100644
          }
          if (xcursorFound) {
 diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp
-index c4cd66c33b..b6f2691587 100644
+index fb1c425d8e..bb8bab9795 100644
 --- a/src/plugins/platformthemes/gtk3/main.cpp
 +++ b/src/plugins/platformthemes/gtk3/main.cpp
 @@ -39,6 +39,7 @@
diff --git a/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch
rename to pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch
diff --git a/pkgs/development/libraries/qt-5/5.10/qtscript.patch b/pkgs/development/libraries/qt-5/5.11/qtscript.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.10/qtscript.patch
rename to pkgs/development/libraries/qt-5/5.11/qtscript.patch
diff --git a/pkgs/development/libraries/qt-5/5.10/qtserialport.patch b/pkgs/development/libraries/qt-5/5.11/qtserialport.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.10/qtserialport.patch
rename to pkgs/development/libraries/qt-5/5.11/qtserialport.patch
diff --git a/pkgs/development/libraries/qt-5/5.10/qttools.patch b/pkgs/development/libraries/qt-5/5.11/qttools.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.10/qttools.patch
rename to pkgs/development/libraries/qt-5/5.11/qttools.patch
diff --git a/pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch
rename to pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch
new file mode 100644
index 00000000000..b94a4b76cba
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch
@@ -0,0 +1,12 @@
+diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake
+--- a/Source/WebKit2/PlatformQt.cmake
++++ b/Source/WebKit2/PlatformQt.cmake
+@@ -261,6 +261,7 @@
+ list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
+     ${GLIB_INCLUDE_DIRS}
+     ${GSTREAMER_INCLUDE_DIRS}
++    ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
+     ${Qt5Quick_INCLUDE_DIRS}
+     ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
+     ${SQLITE_INCLUDE_DIR}
+
diff --git a/pkgs/development/libraries/qt-5/5.11/srcs.nix b/pkgs/development/libraries/qt-5/5.11/srcs.nix
new file mode 100644
index 00000000000..f570b793a24
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/srcs.nix
@@ -0,0 +1,325 @@
+# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
+{ fetchurl, mirror }:
+
+{
+  qt3d = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qt3d-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1h3hb395vpbblwin5bx3zazwcz5gwf2fjawdcqd866mkmcb1am2d";
+      name = "qt3d-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtactiveqt = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtactiveqt-everywhere-src-5.11.0.tar.xz";
+      sha256 = "019ppkqi8kzd3sjxilig9sqqfw331d3nbq8c3d4xanwqsl6vxak9";
+      name = "qtactiveqt-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtandroidextras = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtandroidextras-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1yw1fsjbs4ibxi01nxk1431v7ky22ll9npxc5x7fpd4w3h6y73gw";
+      name = "qtandroidextras-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtbase = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtbase-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0rny87ypnkkvyp9p76nim77v6np0cdf1dbjfmcilklzphkdlcvpd";
+      name = "qtbase-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtcanvas3d = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtcanvas3d-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1kqcaks6lkz8cp9s3pwrvgrr8381rjzf5fbf2bzshdw7psphxiiz";
+      name = "qtcanvas3d-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtcharts = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtcharts-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0lg39vd6i0l76spjz6bhb1kkpbk2mgc0hxccj7733xxbxaz14vn4";
+      name = "qtcharts-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtconnectivity = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtconnectivity-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0wqq5q5saf007aphvpn5pvj6l0qp0z7wxvfba6v9iq5ylyqm6bnd";
+      name = "qtconnectivity-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtdatavis3d = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtdatavis3d-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1s7gmgh6g3aia74yiqahffrc6n8f4491vb7g3i4i10ilandipg34";
+      name = "qtdatavis3d-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtdeclarative = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtdeclarative-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1h2pbyr7dnak4q96373xpa6gk6rl528rnqima8xnvhdi2y5kgagf";
+      name = "qtdeclarative-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtdoc = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtdoc-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1y4cr3a9pi83mbabd8g6gz072dqgj26bla2qw2dgcv1v7ifhcpky";
+      name = "qtdoc-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtgamepad = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtgamepad-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0g52c03gdgz57h7szdxvc5hdy45l7q7m29yfzhwqc57hwdfl98bi";
+      name = "qtgamepad-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtgraphicaleffects = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtgraphicaleffects-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0xzr4421w7idlgndxnd68wwc2asabycjiskkyl1f8nwqv34lcy3j";
+      name = "qtgraphicaleffects-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtimageformats = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtimageformats-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0w0yy7zzln3v7dm7ksjxkzhq8r0a9nwk823wv4f1x7vsa3pnyh2q";
+      name = "qtimageformats-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtlocation = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtlocation-everywhere-src-5.11.0.tar.xz";
+      sha256 = "074cjqhr14mqlsqj9rzagzdcqnayyichp31lq02k05q07wg93xi8";
+      name = "qtlocation-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtmacextras = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtmacextras-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1dwlfngp0bs8v1c64p677dbdprv5fpcwva2xq7ir6zca5pma88yz";
+      name = "qtmacextras-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtmultimedia = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtmultimedia-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0g4x1w251imq58zp1px6yschwj6icsxzwl3fy7pjfbgd27qjhlzg";
+      name = "qtmultimedia-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtnetworkauth = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtnetworkauth-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1kr8hwjsb8a5cypvqj48vrnkcvm2rcni102dh6i909i70a7hcsym";
+      name = "qtnetworkauth-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtpurchasing = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtpurchasing-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1c92yv2yi38sic06nyr9r6zpq3y4sxnasmj14d3jmg50gc1ncqfs";
+      name = "qtpurchasing-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtquickcontrols = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtquickcontrols-everywhere-src-5.11.0.tar.xz";
+      sha256 = "01ziibf4afdhb5b3gfci8maprmviqwhdvma2z1jlq2ck45cpsqi6";
+      name = "qtquickcontrols-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtquickcontrols2 = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtquickcontrols2-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1hsa8n4dlqpyz9xq2kq1hsxrxsjc7ywzzfhqijylgzzclvlqgb7y";
+      name = "qtquickcontrols2-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtremoteobjects = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtremoteobjects-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1chn1xxhapfwvhrlv4chwfgf2dw8x8kn1lssdmpmg5s420z3pbq9";
+      name = "qtremoteobjects-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtscript = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtscript-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1ib8a5gsxarbm2j94j5d097ly3ap4snqkx2imz3sl6xk6gknm4i5";
+      name = "qtscript-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtscxml = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtscxml-everywhere-src-5.11.0.tar.xz";
+      sha256 = "00wb89ris8fyivhz9qpqn72mzpkh6mqdjss82j3q10g3c142072k";
+      name = "qtscxml-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtsensors = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtsensors-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1az22rdkpc1m44qb3dyh7cpiprplkvynzjr629ai05i8ngbfdi0g";
+      name = "qtsensors-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtserialbus = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtserialbus-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0r3crk7gw0xs6wk1gvw2k8r9s9vam3sfwrji1njhswavii9fbp85";
+      name = "qtserialbus-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtserialport = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtserialport-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1cbf1jsginp5p3y17cyb6dfhsafxal0bn9pya6aybz0q799zgvl5";
+      name = "qtserialport-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtspeech = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtspeech-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1bgfg0akqf1nfzm28n8dhvhj0p1niwxrfs763gj7m0g6vpwjbhd1";
+      name = "qtspeech-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtsvg = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtsvg-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0m0zglp0m5gv75ivma6l3hm8brb0cf44dhbc6lqwfdwacxhgx3jb";
+      name = "qtsvg-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qttools = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qttools-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1nb77bfs63nyy0wkhsci9qbqmahncy3sdcrwj4qr1prc4y2cm4wx";
+      name = "qttools-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qttranslations = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qttranslations-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0778y8vxa26wr4vgqi79si1dpflfyxdn926hpzjc1k1mx7y94gpi";
+      name = "qttranslations-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtvirtualkeyboard = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtvirtualkeyboard-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1g9wj4j29lysqp6wxnck6s7h36qj87g3lbapvkfsqchvm00yckci";
+      name = "qtvirtualkeyboard-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtwayland = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwayland-everywhere-src-5.11.0.tar.xz";
+      sha256 = "09s1ckqj0cgjmmi7jylsf039vgzlq7i9rr4swb590fkz427lx0b8";
+      name = "qtwayland-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtwebchannel = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwebchannel-everywhere-src-5.11.0.tar.xz";
+      sha256 = "05fa5pwvk24cjp8m6pbw3ma95vnls762crpjdgvygfk0h8xilxmh";
+      name = "qtwebchannel-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtwebengine = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwebengine-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0iabqkan99msp0jab0hndap6jqkf9b1ggd4n7glkcvf60gb59msx";
+      name = "qtwebengine-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtwebglplugin = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwebglplugin-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1al7dv7i9rg4z4p8vnipbjbbgc6113lbfjggxxap3sn6hqs986fm";
+      name = "qtwebglplugin-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtwebsockets = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwebsockets-everywhere-src-5.11.0.tar.xz";
+      sha256 = "1drr6nxxbkwpmz39bhyfmmsqjhy11bj3w1nc3q9dwhpcbf04an3x";
+      name = "qtwebsockets-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtwebview = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwebview-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0a89v8mj5pb7a7whyhasf4ms0n34ghfmv2qp0pyxnq56f2bsjbl4";
+      name = "qtwebview-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtwinextras = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtwinextras-everywhere-src-5.11.0.tar.xz";
+      sha256 = "0qrf6vf9i1cvfcyg22d4f611bl3xi5qb3vcbb2idk24jg9q48cqw";
+      name = "qtwinextras-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtx11extras = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtx11extras-everywhere-src-5.11.0.tar.xz";
+      sha256 = "13vbx61wcd8pnpgk3j5r665pm03s7jp2s98apvc6fhp1njlr0rhi";
+      name = "qtx11extras-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+  qtxmlpatterns = {
+    version = "5.11.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.11/5.11.0/submodules/qtxmlpatterns-everywhere-src-5.11.0.tar.xz";
+      sha256 = "13nj2pa706sy874bqbv7y94ypicr4k09x6n2jyxkw93flb5pi8qr";
+      name = "qtxmlpatterns-everywhere-src-5.11.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 0c7af9e185d..15e19c77567 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -191,7 +191,7 @@ stdenv.mkDerivation {
     [
       "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields
       ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
-      ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
+      ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"''
       ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
     ]
 
@@ -243,10 +243,13 @@ stdenv.mkDerivation {
       "-gui"
       "-widgets"
       "-opengl desktop"
-      "-qml-debug"
       "-icu"
       "-pch"
     ]
+    ++ lib.optionals (compareVersion "5.11.0" < 0)
+    [
+      "-qml-debug"
+    ]
     ++ lib.optionals (compareVersion "5.9.0" < 0)
     [
       "-c++11"
@@ -387,7 +390,7 @@ stdenv.mkDerivation {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ qknight ttuegel periklis ];
+    maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
     platforms = platforms.unix;
   };
 
diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
index fc0a751f48a..f9b8cdc8cf0 100644
--- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
@@ -10,6 +10,7 @@ qtModule {
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
   '';
+  configureFlags = lib.optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-qml-debug" ];
   devTools = [
     "bin/qml"
     "bin/qmlcachegen"
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index d73bc370f99..8691e20ec45 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -1,23 +1,40 @@
-{ qtModule, stdenv, lib
-, qtbase, qtdeclarative, qtlocation, qtsensors
+{ qtModule, stdenv, lib, fetchurl
+, qtbase, qtdeclarative, qtlocation, qtsensors, qtwebchannel
 , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
-, sqlite, systemd, glib, gst_all_1
+, sqlite, systemd, glib, gst_all_1, cmake
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
 , darwin
 , substituteAll
 , flashplayerFix ? false
+, src ? null
+, version ? null
 }:
 
-let inherit (lib) optional optionals getLib; in
-
+let
+  inherit (lib) optional optionals getLib;
+  hyphen = stdenv.mkDerivation rec {
+    name = "hyphen-2.8.8";
+    src = fetchurl {
+      url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-${name}.tar.gz";
+      sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705";
+    };
+    buildInputs = [ perl ];
+  };
+in
 qtModule {
   name = "qtwebkit";
-  qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ];
+  qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ qtwebchannel ];
   buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
-    ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ]);
+    ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ])
+    ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ];
   nativeBuildInputs = [
     bison2 flex gdb gperf perl pkgconfig python2 ruby
-  ];
+  ] ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ cmake ];
+
+  cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ];
+
+  inherit src;
+  inherit version;
 
   __impureHostDeps = optionals (stdenv.isDarwin) [
     "/usr/lib/libicucore.dylib"
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 11e4ae1c26c..e18564aaabe 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -8,7 +8,7 @@ args:
 
 let
   inherit (args) name;
-  version = args.version or srcs."${name}".version;
+  version = if (args.version or null) == null then srcs."${name}".version else args.version;
   src = args.src or srcs."${name}".src;
 in
 
@@ -53,7 +53,7 @@ mkDerivation (args // {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ qknight ttuegel periklis ];
+    maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
     platforms = platforms.unix;
   } // (args.meta or {});
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10c6e2bbce1..92b25fed9b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11307,10 +11307,10 @@ with pkgs;
 
   libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5;
 
-  qt510 = recurseIntoAttrs (makeOverridable
-    (import ../development/libraries/qt-5/5.10) {
+  qt511 = recurseIntoAttrs (makeOverridable
+    (import ../development/libraries/qt-5/5.11) {
       inherit newScope;
-      inherit stdenv fetchurl makeSetupHook makeWrapper;
+      inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper;
       bison = bison2; # error: too few arguments to function 'int yylex(...
       inherit cups;
       harfbuzz = harfbuzz-icu;
@@ -11320,10 +11320,10 @@ with pkgs;
       inherit (gnome3) gtk3 dconf;
     });
 
-  libsForQt510 = recurseIntoAttrs (lib.makeScope qt510.newScope mkLibsForQt5);
+  libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5);
 
-  qt5 = qt510;
-  libsForQt5 = libsForQt510;
+  qt5 = qt511;
+  libsForQt5 = libsForQt511;
 
   qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
 

From 6c46706fa6ed4c250bf9072fce92e172f115febe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sat, 26 May 2018 09:08:32 +0200
Subject: [PATCH 2/8] sddm: Fixes build with Qt 5.11

---
 .../display-managers/sddm/default.nix         | 11 ++++----
 .../display-managers/sddm/qt511.patch         | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/display-managers/sddm/qt511.patch

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index a41f917a7ec..27b23bb571f 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -16,15 +16,14 @@ in mkDerivation rec {
     sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq";
   };
 
-  patches = [ ./sddm-ignore-config-mtime.patch ];
+  patches = [
+    ./sddm-ignore-config-mtime.patch
+    ./qt511.patch
+  ];
 
   postPatch =
-    # Module Qt5::Test must be included in `find_package` before it is used.
-    ''
-      sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|'
-    ''
     # Fix missing include for gettimeofday()
-    + ''
+    ''
       sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp
     '';
 
diff --git a/pkgs/applications/display-managers/sddm/qt511.patch b/pkgs/applications/display-managers/sddm/qt511.patch
new file mode 100644
index 00000000000..6430e60ed41
--- /dev/null
+++ b/pkgs/applications/display-managers/sddm/qt511.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 005c9ad..71b46d7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +93,7 @@ find_package(XCB REQUIRED)
+ find_package(XKB REQUIRED)
+ 
+ # Qt 5
+-find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools)
++find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools Test)
+ 
+ # find qt5 imports dir
+ get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index c9d935a..bb85ddd 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -2,9 +2,8 @@ set(QT_USE_QTTEST TRUE)
+ 
+ include_directories(../src/common)
+ 
+-
+ set(ConfigurationTest_SRCS ConfigurationTest.cpp ../src/common/ConfigReader.cpp)
+ add_executable(ConfigurationTest ${ConfigurationTest_SRCS})
+ add_test(NAME Configuration COMMAND ConfigurationTest)
+ 
+-qt5_use_modules(ConfigurationTest Test)
++target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test)

From a95a38ff3bcce815d2651ca51860dd9a020faf1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sat, 26 May 2018 09:09:06 +0200
Subject: [PATCH 3/8] konversation: Fixes build with Qt 5.11

---
 pkgs/applications/networking/irc/konversation/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 96218ef87b5..c41b6116b29 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,6 +1,7 @@
 { mkDerivation
 , lib
 , fetchurl
+, fetchpatch
 , extra-cmake-modules
 , kdoctools
 , kbookmarks
@@ -69,6 +70,13 @@ in mkDerivation rec {
     kdoctools
   ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://cgit.kde.org/konversation.git/patch/?id=20018b3d0798421c9cb8a9d983e5a5b34bd88e8d";
+      sha256 = "0y5m5zimfhc0d1xnkzs05c8ig11lhwdn04fk76vi7966hx8wggnn";
+    })
+  ];
+
   meta = {
     description = "Integrated IRC client for KDE";
     license = with lib.licenses; [ gpl2 ];

From 5fe81d07ba0b03789eb81fe7d4d3019e7ee122ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sat, 26 May 2018 09:12:36 +0200
Subject: [PATCH 4/8] phonon: 4.9.1 -> 4.10.1

This update fixes also the compilation with Qt 5.11.
---
 pkgs/development/libraries/phonon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 8e1ee8196c3..82574864ec4 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -6,7 +6,7 @@
 with lib;
 
 let
-  v = "4.9.1";
+  v = "4.10.1";
 
   soname = if withQt5 then "phonon4qt5" else "phonon";
   buildsystemdir = "share/cmake/${soname}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
-    sha256 = "177647r2jqfm32hqcz2nqfqv6v48hn5ab2vc31svba2wz23fkgk7";
+    sha256 = "1dwdw0hm6685psrp7v9frhkhqvsxrbdnm3gw794j5z7g3brqvag5";
   };
 
   buildInputs =

From 121b15f0c0d96e756d0b97b2727271de794a300d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sat, 26 May 2018 09:13:38 +0200
Subject: [PATCH 5/8] pyqt5: Fixes build with Qt 5.11

---
 pkgs/development/python-modules/pyqt/5.x.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index d9de2edce68..b669c145641 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,5 +1,5 @@
-{ lib, fetchurl, pythonPackages, pkgconfig, makeWrapper, qmake, fetchpatch
-, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
+{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper
+, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
 , withWebSockets ? false, qtwebsockets
 , withConnectivity ? false, qtconnectivity
 }:
@@ -73,6 +73,16 @@ in buildPythonPackage {
       url = https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/pyqt5-cura-crash.patch?id=6cfe64a3d1827e0ed9cc62f1683a53b582315f4f;
       sha256 = "02a0mw1z8p9hhqhl4bgjrmf1xq82xjmpivn5bg6r4yv6pidsh7ck";
     })
+    (fetchpatch {
+      name = "pyqt-qt5.11.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pyqt-qt5.11.patch?h=packages/pyqt5&id=d01240b801203d3865b2f61fa19090cc20e55a97";
+      sha256 = "0qa7w1agjg9da99lvnqwwxnm3pp7qd683h7zggq4c269y2km812h";
+    })
+    (fetchpatch {
+      name = "pyqt-support-new-qt.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pyqt-support-new-qt.patch?h=packages/pyqt5&id=d01240b801203d3865b2f61fa19090cc20e55a97";
+      sha256 = "1nkl96f4bki37zw6iwvd4vq8z8gg45q5m1cbkbaw72395i0m7p5j";
+    })
   ];
 
   postInstall = ''

From 4ed62d6b881241c3d0ed6ad62b0c0514734661bf Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 5 Jun 2018 08:06:35 +0200
Subject: [PATCH 6/8] qt5: revert qtbase commit that removes macOS 10.10 code
 paths

We use MACOSX_DEPLOYMENT_TARGET=10.10 in nixpkgs and some darwin
packages like CoreFoundation are based on the 10.10 sources from
opensource.apple.com.
---
 .../libraries/qt-5/5.11/default.nix           |   6 +-
 .../5.11/qtbase-revert-no-macos10.10.patch    | 102 ++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch

diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index fa3ac8f8503..b50ff61219f 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -37,7 +37,11 @@ let
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
   patches = {
-    qtbase = [ ./qtbase.patch ./qtbase-darwin.patch ];
+    qtbase = [
+      ./qtbase.patch
+      ./qtbase-darwin.patch
+      ./qtbase-revert-no-macos10.10.patch
+    ];
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch
new file mode 100644
index 00000000000..e39934802cd
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch
@@ -0,0 +1,102 @@
+Revert "Remove code paths for macOS < 10.11"
+
+This reverts commit 138a65e0cfa80b13fd018a01e7d8b33341a3cfd3.
+
+From 138a65e0cfa80b13fd018a01e7d8b33341a3cfd3 Mon Sep 17 00:00:00 2001
+From: Jake Petroules <jake.petroules@qt.io>
+Date: Thu, 8 Feb 2018 11:05:42 -0800
+Subject: [PATCH] Remove code paths for macOS < 10.11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: I5ae02d88aa3dcd97d1f2ebf6255a68643e5d6daa
+Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
+Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
+Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
+---
+ .../fontdatabases/mac/qfontengine_coretext.mm            | 16 +++-------------
+ src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm    |  6 +-----
+ src/plugins/platforms/cocoa/qnswindowdelegate.mm         | 16 ----------------
+ 3 files changed, 4 insertions(+), 34 deletions(-)
+
+diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+index 98b753ef..489d9cd0 100644
+--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
++++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+@@ -47,18 +47,28 @@
+ 
+ #include <cmath>
+ 
+-#if defined(Q_OS_MACOS)
++#if defined(Q_OS_OSX) && !QT_OSX_DEPLOYMENT_TARGET_BELOW(__MAC_10_11)
+ #import <AppKit/AppKit.h>
+ #endif
+ 
+-#if defined(QT_PLATFORM_UIKIT)
++#if defined(QT_PLATFORM_UIKIT) && !QT_IOS_DEPLOYMENT_TARGET_BELOW(__IPHONE_8_2)
+ #import <UIKit/UIKit.h>
+ #endif
+ 
+ // These are available cross platform, exported as kCTFontWeightXXX from CoreText.framework,
+ // but they are not documented and are not in public headers so are private API and exposed
+ // only through the NSFontWeightXXX and UIFontWeightXXX aliases in AppKit and UIKit (rdar://26109857)
+-#if defined(Q_OS_MACOS)
++#if QT_MAC_DEPLOYMENT_TARGET_BELOW(__MAC_10_11, __IPHONE_8_2)
++#define kCTFontWeightUltraLight -0.8
++#define kCTFontWeightThin -0.6
++#define kCTFontWeightLight -0.4
++#define kCTFontWeightRegular 0
++#define kCTFontWeightMedium 0.23
++#define kCTFontWeightSemibold 0.3
++#define kCTFontWeightBold 0.4
++#define kCTFontWeightHeavy 0.56
++#define kCTFontWeightBlack 0.62
++#elif defined(Q_OS_OSX)
+ #define kCTFontWeightUltraLight NSFontWeightUltraLight
+ #define kCTFontWeightThin NSFontWeightThin
+ #define kCTFontWeightLight NSFontWeightLight
+diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
+index 94f2125b..272cd9f3 100644
+--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
++++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
+@@ -162,7 +162,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate);
+     // resetting our mCurrentDir, set the delegate
+     // here to make sure it gets the correct value.
+     [mSavePanel setDelegate:self];
+-    mOpenPanel.accessoryViewDisclosed = YES;
++
++#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_11)
++    if (__builtin_available(macOS 10.11, *))
++        mOpenPanel.accessoryViewDisclosed = YES;
++#endif
+ 
+     if (mOptions->isLabelExplicitlySet(QFileDialogOptions::Accept))
+         [mSavePanel setPrompt:[self strip:options->labelText(QFileDialogOptions::Accept)]];
+diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
+index 6e5623d6..cdecd86d 100644
+--- a/src/plugins/platforms/cocoa/qnswindowdelegate.mm
++++ b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
+@@ -80,6 +80,22 @@ static QRegExp whitespaceRegex = QRegExp(QStringLiteral("\\s*"));
+     return NSRectFromCGRect(m_cocoaWindow->screen()->availableGeometry().toCGRect());
+ }
+ 
++#if QT_MACOS_DEPLOYMENT_TARGET_BELOW(__MAC_10_11)
++/*
++    AppKit on OS X 10.10 wrongly calls windowWillUseStandardFrame:defaultFrame
++    from -[NSWindow _frameForFullScreenMode] when going into fullscreen, resulting
++    in black bars on top and bottom of the window. By implementing the following
++    method, AppKit will choose that instead, and resolve the right fullscreen
++    geometry.
++*/
++- (NSSize)window:(NSWindow *)window willUseFullScreenContentSize:(NSSize)proposedSize
++{
++    Q_UNUSED(proposedSize);
++    Q_ASSERT(window == m_cocoaWindow->nativeWindow());
++    return NSSizeFromCGSize(m_cocoaWindow->screen()->geometry().size().toCGSize());
++}
++#endif
++
+ - (BOOL)window:(NSWindow *)window shouldPopUpDocumentPathMenu:(NSMenu *)menu
+ {
+     Q_UNUSED(window);

From 738df73f2acc96f1d06d4ef6b8dbaf8bee7ef9f1 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 9 Jun 2018 22:18:10 +0200
Subject: [PATCH 7/8] qt5: update darwin patch for 5.11

---
 .../libraries/qt-5/5.11/qtbase-darwin.patch        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch
index 8c9d50bdf5d..86c55f08398 100644
--- a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch
+++ b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch
@@ -20,6 +20,20 @@ index 341d3bccf2..3368234c26 100644
      for (NSString *ifName in wifiInterfaces) {
              scanThread->interfaceName = QString::fromNSString(ifName);
              scanThread->start();
+diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcoco
+ascreen.mm
+index a17a02b6..d76c42fa 100644
+--- a/src/plugins/platforms/cocoa/qcocoascreen.mm
++++ b/src/plugins/platforms/cocoa/qcocoascreen.mm
+@@ -114,7 +114,7 @@ void QCocoaScreen::updateGeometry()
+         return;
+
+     // The reference screen for the geometry is always the primary screen
+-    QRectF primaryScreenGeometry = QRectF::fromCGRect([[NSScreen screens] firstObject].frame);
++    QRectF primaryScreenGeometry = QRectF::fromCGRect([[[NSScreen screens] firstObject] frame]);
+     m_geometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.frame), primaryScreenGeometry).toRect();
+     m_availableGeometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.visibleFrame), primaryScreenGeometry).toRect();
+
 diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
 index 54254455e4..e10f62909a 100644
 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm

From 4f33a90a5ead266def817773f7e4eb0b7be898c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Fri, 8 Jun 2018 11:01:41 +0200
Subject: [PATCH 8/8] virtualbox: Fixes build with Qt5.11

---
 .../virtualization/virtualbox/default.nix       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3c5d3e6dc1b..da092bed47b 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
-, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2
-, libXrandr, libXinerama
+{ stdenv, fetchurl, lib, fetchpatch, iasl, dev86, pam, libxslt, libxml2
+, libX11, xproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
+, zlib, libpng, glib, lvm2, libXrandr, libXinerama
 , pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
 , alsaLib, curl, libvpx, gawk, nettools, dbus
 , xorriso, makeself, perl
@@ -94,9 +94,14 @@ in stdenv.mkDerivation {
 
   patches =
      optional enableHardening ./hardened.patch
-  ++ [ ./qtx11extras.patch ];
-
-
+  ++ [
+    ./qtx11extras.patch
+    (fetchpatch {
+      name = "010-qt-5.11.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/010-qt-5.11.patch?h=packages/virtualbox";
+      sha256 = "0hjx99pg40wqyggnrpylrp5zngva4xrnk7r90i0ynrqc7n84g9pn";
+    })
+  ];
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \