quazip: Qt 5 infrastructure update

pkgs/development/libraries/quazip/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   installFlags = "INSTALL_ROOT=$(out)";
 
-  buildInputs = [ zlib (qt.base or qt) ];
+  buildInputs = [ zlib qt ];
 
   meta = {
     description = "Provides access to ZIP archives from Qt programs";

pkgs/top-level/all-packages.nix

@@ -2992,7 +2992,7 @@ let
   screen-message = callPackage ../tools/X11/screen-message { };
 
   screencloud = callPackage ../applications/graphics/screencloud {
-    quazip = quazip.override { qt = qt4; };
+    quazip = qt5.quazip.override { qt = qt4; };
   };
 
   scrot = callPackage ../tools/graphics/scrot { };
@@ -8112,10 +8112,6 @@ let
 
   qoauth = callPackage ../development/libraries/qoauth { };
 
-  quazip = callPackage ../development/libraries/quazip {
-    qt = qt5;
-  };
-
   qt3 = callPackage ../development/libraries/qt-3 {
     openglSupport = mesaSupported;
     libpng = libpng12;
@@ -8185,6 +8181,10 @@ let
       withDocumentation = true;
     };
 
+    quazip = callPackage ../development/libraries/quazip {
+      qt = qtbase;
+    };
+
     qwt = callPackage ../development/libraries/qwt/6.nix { };
 
     signon = callPackage ../development/libraries/signon { };