Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1

Change-Id: I46b53c8d8aaed59e548ccb8cadb60afd00ca7aa6

1 files changed, 0 insertions, 61 deletions

diff --git a/examples/declarative/calculator/main.cpp b/examples/declarative/calculator/main.cpp
deleted file mode 100644
index e10d3011..00000000
--- a/examples/declarative/calculator/main.cpp
+++ /dev/null
@@ -1,61 +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 demonstration applications 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 "qmlapplicationviewer.h"
-#include <QtWidgets/QApplication>
-#include <QtCore/QDebug>
-
-Q_DECL_EXPORT int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    qDebug() << "NOTE: The runtime property and the Orientation enum are only available"
-             << "through qmlviewer and are not available in the complied version.\n"
-             << "Run 'qmlviewer calculator.qmlproject' or load 'calculator.qmlproject'"
-             << "in Qt Creator and run the project.";
-
-    QmlApplicationViewer viewer;
-    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationLockLandscape);
-    viewer.setMainQmlFile(QLatin1String("qml/calculator/calculator.qml"));
-    viewer.showExpanded();
-
-    return app.exec();
-}