Made the setup-hook more friendly to packages which use qt4 more normally

(that is, they are aware that the header files are in $QTDIR/include/*/)

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

pkgs/development/libraries/qt-4/setup-hook.sh

@@ -1,5 +1,10 @@
 export QTDIR=@out@
 
-for d in @out@/include/*; do
+if [ -z "$normalQt" ]; then
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d"
+  # This helps for g++, but not for moc. And no qt4 package should expect
-done
+  # having all qt4 header files dirs into -I. But the KDE nix expressions want
+  # this.
+  for d in @out@/include/*; do
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d"
+  done
+fi