Merge branch 'master.upstream' into staging.upstream

2015-07-05 13:06:02 -07:00
parent 2363660191 2d1aafef55
commit d605663ae2
155 changed files with 4271 additions and 2114 deletions
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -46,10 +46,11 @@ cp "@out@/bin/qmake" "$qtOut/bin"
 cat >"$qtOut/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $qtOut
-Plugins = $qtOut/lib/qt5/plugins
-Imports = $qtOut/lib/qt5/imports
-Qml2Imports = $qtOut/lib/qt5/qml
+Plugins = lib/qt5/plugins
+Imports = lib/qt5/imports
+Qml2Imports = lib/qt5/qml
 EOF
+export QMAKE="$qtOut/bin/qmake"

 envHooks+=(addQtModule)
 preConfigurePhases+=" setQMakePath"