Merge branch 'qt5'

This commit is contained in:
Thomas Tuegel 2015-07-01 16:59:14 -05:00
commit 32a1be47a2

View file

@ -44,10 +44,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"