* qt-4 -> qt-4.4.

* kde-4.2 shouldn't depend on poppler built with qt 4.5.

svn path=/nixpkgs/trunk/; revision=17084

pkgs/desktops/kde-4.2/default.nix

@@ -1,6 +1,8 @@
 pkgs:
 
 rec {
+  inherit (pkgs) qt4;
+  
 ### SUPPORT
   automoc4 = import ./support/automoc4 {
     inherit (pkgs) stdenv fetchurl cmake;

pkgs/desktops/kde-4.3/default.nix

@@ -1,6 +1,8 @@
 pkgs:
 
 rec {
+  inherit (pkgs) qt4;
+
 ### SUPPORT
   automoc4 = import ./support/automoc4 {
     inherit (pkgs) stdenv fetchurl lib cmake;

pkgs/top-level/all-packages.nix

@@ -3997,19 +3997,20 @@ let
     dbus = dbus.libs;
   };
 
-  poppler = import ../development/libraries/poppler {
-    inherit fetchurl stdenv qt4 cairo freetype fontconfig zlib libjpeg
-      pkgconfig;
+  poppler = makeOverridable (import ../development/libraries/poppler) {
+    inherit fetchurl stdenv cairo freetype fontconfig zlib libjpeg pkgconfig;
     inherit (gtkLibs) glib gtk;
-    qt4Support = getConfig [ "poppler" "qt4Support" ] false;
+    qt4Support = false;
   };
 
-  popplerQt4 = import ../development/libraries/poppler {
-    inherit fetchurl stdenv cairo freetype fontconfig zlib libjpeg
-      pkgconfig;
-    qt4 = qt45;
-    inherit (gtkLibs) glib gtk;
+  popplerQt44 = poppler.override {
     qt4Support = true;
+    qt4 = qt44;
+  };
+  
+  popplerQt45 = poppler.override {
+    qt4Support = true;
+    qt4 = qt45;
   };
   
   popt = import ../development/libraries/popt {
@@ -4040,7 +4041,9 @@ let
     mysqlSupport = true;
   };
 
-  qt4 = import ../development/libraries/qt-4 {
+  qt4 = qt44;
+
+  qt44 = import ../development/libraries/qt-4.4 {
     inherit fetchurl stdenv fetchsvn zlib libjpeg libpng which mysql mesa openssl cups dbus
       fontconfig freetype pkgconfig libtiff;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
@@ -7851,11 +7854,14 @@ let
 
   kde42 = import ../desktops/kde-4.2 (pkgs // {
     openexr = openexr_1_6_1;
+    qt4 = qt44;
+    popplerQt4 = popplerQt44;
   });
   
   kde43 = import ../desktops/kde-4.3 (pkgs // {
     openexr = openexr_1_6_1;
     qt4 = qt45;
+    popplerQt4 = popplerQt45;
   });
   
   kdelibs = kde3.kdelibs;