From 1696f45d9216f97654fedd580ed3db4b825089e0 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@digia.com>
Date: Sat, 17 Aug 2013 13:23:27 +0200
Subject: [PATCH] configure: Remove v8snapshot vestiges

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>
---
 .gitignore                       |  1 -
 configure                        | 29 -----------------------------
 tools/configure/configureapp.cpp |  9 ---------
 3 files changed, 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 14aa3a77a2..9e965e9c12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,7 +73,6 @@ bin/linguist*
 bin/lrelease*
 bin/lupdate*
 bin/lconvert*
-bin/mkv8snapshot*
 bin/moc*
 bin/makeqpf*
 bin/pixeltool*
diff --git a/configure b/configure
index b4ba4a6934..43eed32807 100755
--- a/configure
+++ b/configure
@@ -891,7 +891,6 @@ CFG_SKIP_MODULES=""
 CFG_COMPILE_EXAMPLES=yes
 CFG_RELEASE_QMAKE=no
 CFG_AUDIO_BACKEND=auto
-CFG_V8SNAPSHOT=auto
 CFG_QML_DEBUG=yes
 CFG_JAVASCRIPTCORE_JIT=auto
 CFG_PKGCONFIG=auto
@@ -6040,7 +6039,6 @@ fi
 # supported and on which compilers.
 #
 canBuildQtConcurrent="yes"
-canUseV8Snapshot="yes"
 
 case "$XPLATFORM" in
     hpux-g++*)
@@ -6175,33 +6173,6 @@ if [ "$CFG_WEBKIT" = "debug" ]; then
     QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug"
 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
 if [ "$CFG_QML_DEBUG" = "no" ]; then
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QML_NO_DEBUGGER"
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 430dae5e87..e2cddbc565 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -178,7 +178,6 @@ Configure::Configure(int& argc, char** argv)
     dictionary[ "AUDIO_BACKEND" ]   = "auto";
     dictionary[ "WMF_BACKEND" ]     = "auto";
     dictionary[ "WMSDK" ]           = "auto";
-    dictionary[ "V8SNAPSHOT" ]      = "auto";
     dictionary[ "QML_DEBUG" ]       = "yes";
     dictionary[ "PLUGIN_MANIFESTS" ] = "yes";
     dictionary[ "DIRECTWRITE" ]     = "no";
@@ -2132,8 +2131,6 @@ bool Configure::checkAvailability(const QString &part)
                     && !QStandardPaths::findExecutable(QStringLiteral("xgConsole.exe")).isEmpty();
     } else if (part == "WMSDK") {
         available = findFile("wmsdk.h");
-    } else if (part == "V8SNAPSHOT") {
-        available = true;
     } else if (part == "AUDIO_BACKEND") {
         available = true;
     } else if (part == "WMF_BACKEND") {
@@ -2251,8 +2248,6 @@ void Configure::autoDetection()
         dictionary["OPENSSL"] = checkAvailability("OPENSSL") ? "yes" : "no";
     if (dictionary["DBUS"] == "auto")
         dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no";
-    if (dictionary["V8SNAPSHOT"] == "auto")
-        dictionary["V8SNAPSHOT"] = (dictionary["V8"] == "yes") && checkAvailability("V8SNAPSHOT") ? "yes" : "no";
     if (dictionary["QML_DEBUG"] == "auto")
         dictionary["QML_DEBUG"] = dictionary["QML"] == "yes" ? "yes" : "no";
     if (dictionary["AUDIO_BACKEND"] == "auto")
@@ -2672,10 +2667,6 @@ void Configure::generateOutputVars()
     // We currently have no switch for QtConcurrent, so add it unconditionally.
     qtConfig += "concurrent";
 
-    // ### Vestige
-    if (dictionary[ "V8SNAPSHOT" ] == "yes")
-        qtConfig += "v8snapshot";
-
     if (dictionary[ "SYSTEM_PROXIES" ] == "yes")
         qtConfig += "system-proxies";