From 366376ab3b614c66b31d95ee93b86db5d31aae5f Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Thu, 18 Sep 2014 18:50:56 +0200
Subject: webengine: remove unneeded startup timer and error page from demo

The new release has built in error page support and the startup
freeze seems gone with our own gl surface implementation.

Change-Id: I30ef8db409a1e70a19ac5d2a3c2444cbef9e5262
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
 basicsuite/webengine/ErrorPage.qml | 71 --------------------------------------
 basicsuite/webengine/main.qml      | 32 +----------------
 2 files changed, 1 insertion(+), 102 deletions(-)
 delete mode 100644 basicsuite/webengine/ErrorPage.qml

(limited to 'basicsuite/webengine')

diff --git a/basicsuite/webengine/ErrorPage.qml b/basicsuite/webengine/ErrorPage.qml
deleted file mode 100644
index daa25d0..0000000
--- a/basicsuite/webengine/ErrorPage.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.1
-
-Rectangle {
-    id: errorPage
-    property alias mainMessage: errorMessage.text;
-    property bool displayingError: false;
-    anchors.fill: parent
-    color: "lightgray"
-    visible: displayingError
-
-    Rectangle {
-        color: "white"
-        anchors.centerIn: parent
-        height: parent.height / 3
-        width: Math.max(parent.width / 2, errorMessage.width + 20)
-
-        border {
-            color: "dimgray"
-            width: 0.5
-        }
-
-        radius: 20
-        Text {
-            id: errorMessage
-            color: "dimgray"
-            font.pixelSize: 20
-            anchors.centerIn: parent
-        }
-    }
-
-}
diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml
index 2e1f259..39ac91d 100644
--- a/basicsuite/webengine/main.qml
+++ b/basicsuite/webengine/main.qml
@@ -56,49 +56,19 @@ Rectangle {
     width: 1280
     height: 800
 
-    property url defaultUrl: Qt.resolvedUrl("about:blank")
+    property url defaultUrl: Qt.resolvedUrl("content/index.html")
     function load(url) { mainWebView.url = url }
 
-    ErrorPage {
-        id: errorPage
-        anchors.fill: parent
-        displayingError: false
-    }
-
     WebEngineView {
         id: mainWebView
         anchors.fill: parent
         url: defaultUrl
-        visible: !errorPage.displayingError
         onLoadingChanged: {
             if (!loading) {
                 addressBar.cursorPosition = 0
             }
-            var loadError = loadRequest.errorDomain
-            if (loadError == WebEngineView.NoErrorDomain) {
-                errorPage.displayingError = false
-                return;
-            }
-            errorPage.displayingError = true
-            if (loadError == WebEngineView.InternalErrorDomain)
-                errorPage.mainMessage = "Internal error"
-            else if (loadError == WebEngineView.ConnectionErrorDomain)
-                errorPage.mainMessage = "Unable to connect to the Internet"
-            else if (loadError == WebEngineView.CertificateErrorDomain)
-                errorPage.mainMessage = "Certificate error"
-            else if (loadError == WebEngineView.DnsErrorDomain)
-                errorPage.mainMessage = "Unable to resolve the server's DNS address"
-            else // HTTP and FTP
-                errorPage.mainMessage = "Protocol error"
         }
         onActiveFocusChanged: activeFocus ? hideTimer.running = true : toolBar.state = "address"
-
-        Timer {
-            interval: 1500
-            running: false
-            onTriggered: defaultUrl = Qt.resolvedUrl("content/index.html")
-            Component.onCompleted: start()
-        }
     }
 
     MultiPointTouchArea {
-- 
cgit v1.2.3