mirror of https://github.com/vitalif/phantomjs
Qt: allow static build of WebKit.
This is applying allow-static-qtwebkit.patch already used for the deploy script. http://code.google.com/p/phantomjs/issues/detail?id=2261.5
parent
61c4e4b261
commit
ee4cc1125f
|
@ -7599,13 +7599,6 @@ if [ "$CFG_GUI" = "no" ]; then
|
||||||
canBuildWebKit="no"
|
canBuildWebKit="no"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$CFG_SHARED" = "no" ]; then
|
|
||||||
echo
|
|
||||||
echo "WARNING: Using static linking will disable the WebKit module."
|
|
||||||
echo
|
|
||||||
canBuildWebKit="no"
|
|
||||||
fi
|
|
||||||
|
|
||||||
CFG_CONCURRENT="yes"
|
CFG_CONCURRENT="yes"
|
||||||
if [ "$canBuildQtConcurrent" = "no" ]; then
|
if [ "$canBuildQtConcurrent" = "no" ]; then
|
||||||
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT"
|
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT"
|
||||||
|
|
Loading…
Reference in New Issue