Merge branch 'bugfix/qt-5/closure-size-static-libs' into merge/qt-5.10.0
This commit is contained in:
@@ -4,7 +4,6 @@ qtDocPrefix=@qtDocPrefix@
|
||||
|
||||
. @fix_qt_builtin_paths@
|
||||
. @fix_qt_module_paths@
|
||||
. @fix_qt_static_libs@
|
||||
|
||||
providesQtRuntime() {
|
||||
[ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ]
|
||||
@@ -63,12 +62,3 @@ postPatchMkspecs() {
|
||||
if [ -z "$dontPatchMkspecs" ]; then
|
||||
postPhases="${postPhases}${postPhases:+ }postPatchMkspecs"
|
||||
fi
|
||||
|
||||
postMoveQtStaticLibs() {
|
||||
if [ "z${!outputLib}" != "z${!outputDev}" ]; then
|
||||
fixQtStaticLibs "${!outputLib}" "${!outputDev}"
|
||||
fi
|
||||
}
|
||||
if [ -z "$dontMoveQtStaticLibs" ]; then
|
||||
postPhases="${postPhases}${postPhases:+ }postMoveQtStaticLibs"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user