summaryrefslogtreecommitdiff
path: root/examples/webengine/quicknanobrowser/quickwindow.cpp
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2015-01-15 12:39:43 +0100
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2015-01-23 12:10:42 +0100
commit5d1883372fe107f70a39c9cea13f584a8cc61e0b (patch)
tree51a71f2d28454620d0820c5f850e99af8c4770be /examples/webengine/quicknanobrowser/quickwindow.cpp
parentd95b9295c970401939d2779cbdc9e2a8c7965277 (diff)
downloadqtwebengine-5d1883372fe107f70a39c9cea13f584a8cc61e0b.tar.gz
Clean the file structure of quicknanobrowser and quicktestbrowser
- Remove the unnecessary intermediate ApplicationEngine class - Rename quickwindow.qml to BrowserWindow.qml - Move the injected Utils QObject into utils.h Change-Id: I3b0551e2bf477fc94640c71736de26c46c1ab633 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'examples/webengine/quicknanobrowser/quickwindow.cpp')
-rw-r--r--examples/webengine/quicknanobrowser/quickwindow.cpp66
1 files changed, 0 insertions, 66 deletions
diff --git a/examples/webengine/quicknanobrowser/quickwindow.cpp b/examples/webengine/quicknanobrowser/quickwindow.cpp
deleted file mode 100644
index ec7b6f94a..000000000
--- a/examples/webengine/quicknanobrowser/quickwindow.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "quickwindow.h"
-
-#include "util.h"
-
-#include <QFileInfo>
-#include <QObject>
-#include <QQmlContext>
-#include <QQmlEngine>
-#include <QUrl>
-
-class Utils : public QObject {
- Q_OBJECT
-public:
- Utils(QObject* parent = 0) : QObject(parent) { }
- Q_INVOKABLE static QUrl fromUserInput(const QString& userInput) { return urlFromUserInput(userInput); }
-};
-
-#include "quickwindow.moc"
-
-ApplicationEngine::ApplicationEngine()
-{
- rootContext()->setContextProperty("utils", new Utils(this));
- load(QUrl("qrc:/quickwindow.qml"));
- QMetaObject::invokeMethod(rootObjects().first(), "load", Q_ARG(QVariant, startupUrl()));
-}