AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Remove v8snapshot vestiges

Browse Source 
Change-Id: I0a43320ca0ab7cc416b07396ebc795215d84fe10
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Sergio Ahumada 2013-08-17 13:23:27 +02:00 committed by The Qt Project
parent ca06fcfb43
commit 1696f45d92
3 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -73,7 +73,6 @@ bin/linguist*
bin/lrelease* bin/lrelease*
bin/lupdate* bin/lupdate*
bin/lconvert* bin/lconvert*
bin/mkv8snapshot*
bin/moc* bin/moc*
bin/makeqpf* bin/makeqpf*
bin/pixeltool* bin/pixeltool*

29
configure vendored
View File

@ -891,7 +891,6 @@ CFG_SKIP_MODULES=""
CFG_COMPILE_EXAMPLES=yes CFG_COMPILE_EXAMPLES=yes
CFG_RELEASE_QMAKE=no CFG_RELEASE_QMAKE=no
CFG_AUDIO_BACKEND=auto CFG_AUDIO_BACKEND=auto
CFG_V8SNAPSHOT=auto
CFG_QML_DEBUG=yes CFG_QML_DEBUG=yes
CFG_JAVASCRIPTCORE_JIT=auto CFG_JAVASCRIPTCORE_JIT=auto
CFG_PKGCONFIG=auto CFG_PKGCONFIG=auto
@ -6040,7 +6039,6 @@ fi
# supported and on which compilers. # supported and on which compilers.
# #
canBuildQtConcurrent="yes" canBuildQtConcurrent="yes"
canUseV8Snapshot="yes"
case "$XPLATFORM" in case "$XPLATFORM" in
hpux-g++*) hpux-g++*)
@ -6175,33 +6173,6 @@ if [ "$CFG_WEBKIT" = "debug" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug" QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug"
fi fi
# ### Vestige
QT_CONFIG="$QT_CONFIG v8"
# Detect snapshot support
if [ "$CFG_ARCH" != "$CFG_HOST_ARCH" ]; then
case "$CFG_HOST_ARCH,$CFG_ARCH" in
i386,arm)
;;
*) canUseV8Snapshot="no"
;;
esac
else
if [ -n "$_SBOX_DIR" -a "$CFG_ARCH" = "arm" ]; then
# QEMU crashes when building inside Scratchbox with an ARM target
canUseV8Snapshot="no"
fi
fi
if [ "$CFG_V8SNAPSHOT" = "auto" ]; then
CFG_V8SNAPSHOT="$canUseV8Snapshot"
fi
if [ "$CFG_V8SNAPSHOT" = "yes" -a "$canUseV8Snapshot" = "no" ]; then
echo "Error: V8 snapshot was requested, but is not supported on this platform."
exit 1
fi
if [ "$CFG_V8SNAPSHOT" = "yes" ]; then
QT_CONFIG="$QT_CONFIG v8snapshot"
fi
# ### Vestige # ### Vestige
if [ "$CFG_QML_DEBUG" = "no" ]; then if [ "$CFG_QML_DEBUG" = "no" ]; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QML_NO_DEBUGGER" QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QML_NO_DEBUGGER"

9
tools/configure/configureapp.cpp
View File

@ -178,7 +178,6 @@ Configure::Configure(int& argc, char** argv)
dictionary[ "AUDIO_BACKEND" ] = "auto"; dictionary[ "AUDIO_BACKEND" ] = "auto";
dictionary[ "WMF_BACKEND" ] = "auto"; dictionary[ "WMF_BACKEND" ] = "auto";
dictionary[ "WMSDK" ] = "auto"; dictionary[ "WMSDK" ] = "auto";
dictionary[ "V8SNAPSHOT" ] = "auto";
dictionary[ "QML_DEBUG" ] = "yes"; dictionary[ "QML_DEBUG" ] = "yes";
dictionary[ "PLUGIN_MANIFESTS" ] = "yes"; dictionary[ "PLUGIN_MANIFESTS" ] = "yes";
dictionary[ "DIRECTWRITE" ] = "no"; dictionary[ "DIRECTWRITE" ] = "no";
@ -2132,8 +2131,6 @@ bool Configure::checkAvailability(const QString &part)
&& !QStandardPaths::findExecutable(QStringLiteral("xgConsole.exe")).isEmpty(); && !QStandardPaths::findExecutable(QStringLiteral("xgConsole.exe")).isEmpty();
} else if (part == "WMSDK") { } else if (part == "WMSDK") {
available = findFile("wmsdk.h"); available = findFile("wmsdk.h");
} else if (part == "V8SNAPSHOT") {
available = true;
} else if (part == "AUDIO_BACKEND") { } else if (part == "AUDIO_BACKEND") {
available = true; available = true;
} else if (part == "WMF_BACKEND") { } else if (part == "WMF_BACKEND") {
@ -2251,8 +2248,6 @@ void Configure::autoDetection()
dictionary["OPENSSL"] = checkAvailability("OPENSSL") ? "yes" : "no"; dictionary["OPENSSL"] = checkAvailability("OPENSSL") ? "yes" : "no";
if (dictionary["DBUS"] == "auto") if (dictionary["DBUS"] == "auto")
dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no"; dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no";
if (dictionary["V8SNAPSHOT"] == "auto")
dictionary["V8SNAPSHOT"] = (dictionary["V8"] == "yes") && checkAvailability("V8SNAPSHOT") ? "yes" : "no";
if (dictionary["QML_DEBUG"] == "auto") if (dictionary["QML_DEBUG"] == "auto")
dictionary["QML_DEBUG"] = dictionary["QML"] == "yes" ? "yes" : "no"; dictionary["QML_DEBUG"] = dictionary["QML"] == "yes" ? "yes" : "no";
if (dictionary["AUDIO_BACKEND"] == "auto") if (dictionary["AUDIO_BACKEND"] == "auto")
@ -2672,10 +2667,6 @@ void Configure::generateOutputVars()
// We currently have no switch for QtConcurrent, so add it unconditionally. // We currently have no switch for QtConcurrent, so add it unconditionally.
qtConfig += "concurrent"; qtConfig += "concurrent";
// ### Vestige
if (dictionary[ "V8SNAPSHOT" ] == "yes")
qtConfig += "v8snapshot";
if (dictionary[ "SYSTEM_PROXIES" ] == "yes") if (dictionary[ "SYSTEM_PROXIES" ] == "yes")
qtConfig += "system-proxies"; qtConfig += "system-proxies";