diff options
Diffstat (limited to 'examples/hybridshell/main.cpp')
| -rw-r--r-- | examples/hybridshell/main.cpp | 43 |
1 files changed, 38 insertions, 5 deletions
diff --git a/examples/hybridshell/main.cpp b/examples/hybridshell/main.cpp index 949bb65..d57966f 100644 --- a/examples/hybridshell/main.cpp +++ b/examples/hybridshell/main.cpp @@ -1,8 +1,40 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com> +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QWebChannel module on Qt labs. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + #include <QtGui/QGuiApplication> #include <QtQml> - -#include "qtquick2applicationviewer.h" +#include <QQuickView> #include "shell.h" @@ -11,9 +43,10 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); qmlRegisterType<Shell>("Qt.labs", 1, 0, "HybridShell"); - QtQuick2ApplicationViewer viewer; - viewer.setMainQmlFile(app.applicationDirPath() + QStringLiteral("/qml/hybridshell/main.qml")); - viewer.showExpanded(); + QQuickView viewer; + viewer.engine()->addImportPath(app.applicationDirPath() + QStringLiteral("/../../src/")); + viewer.setSource(QUrl::fromLocalFile(QStringLiteral(SOURCE_DIR) + QStringLiteral("/main.qml"))); + viewer.show(); return app.exec(); } |