diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-02 08:25:43 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 03:15:43 +0100 |
commit | ab1e510121c8a679fdaca12ccd30e0f7ac12a26b (patch) | |
tree | 68c377ba468a667c43211f005ead5b49b16e49f3 /src/qml/qml/qquickapplication.cpp | |
parent | b143d3fb589e7ce7171c9975679fa47181a6a10f (diff) |
Migrate gui dependencies from QtQml to QtQuick.
Ensure that users of declarative that have no need for functionality
provided by the Qt Gui module do not have to link against it.
Any use of QtGui functionality is delegated to providers that can
be installed by another library; QtQuick adds default providers
for this functionality when linked against QtQml.
Task-number: QTBUG-24559
Change-Id: I5e6a58a4198732dc2f8f52f71abfa1152b871aa7
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qml/qml/qquickapplication.cpp')
-rw-r--r-- | src/qml/qml/qquickapplication.cpp | 124 |
1 files changed, 0 insertions, 124 deletions
diff --git a/src/qml/qml/qquickapplication.cpp b/src/qml/qml/qquickapplication.cpp deleted file mode 100644 index 198a917cb8..0000000000 --- a/src/qml/qml/qquickapplication.cpp +++ /dev/null @@ -1,124 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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. -** -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qquickapplication_p.h" -#include <private/qobject_p.h> -#include <QtGui/QGuiApplication> -#include <QtGui/QInputMethod> -#include <QtCore/QDebug> - -QT_BEGIN_NAMESPACE - -class QQuickApplicationPrivate : public QObjectPrivate -{ - Q_DECLARE_PUBLIC(QQuickApplication) -public: - QQuickApplicationPrivate() : active(QGuiApplication::activeWindow() != 0), - layoutDirection(QGuiApplication::layoutDirection()) {} - bool active; - Qt::LayoutDirection layoutDirection; -}; - -/* - This object and its properties are documented as part of the Qt object, - in qdeclarativengine.cpp -*/ - -QQuickApplication::QQuickApplication(QObject *parent) : QObject(*new QQuickApplicationPrivate(), parent) -{ - if (qApp) - qApp->installEventFilter(this); -} - -QQuickApplication::~QQuickApplication() -{ -} - -bool QQuickApplication::active() const -{ - Q_D(const QQuickApplication); - return d->active; -} - -Qt::LayoutDirection QQuickApplication::layoutDirection() const -{ - Q_D(const QQuickApplication); - return d->layoutDirection; -} - -QObject *QQuickApplication::inputPanel() const -{ - static bool warned = false; - if (!warned) { - qWarning() << "Qt.application.inputPanel is deprecated, use Qt.inputMethod instead"; - warned = true; - } - return qApp ? qApp->inputMethod() : 0; -} - -bool QQuickApplication::eventFilter(QObject *obj, QEvent *event) -{ - Q_UNUSED(obj) - Q_D(QQuickApplication); - if (event->type() == QEvent::ApplicationActivate - || event->type() == QEvent::ApplicationDeactivate) { - bool active = d->active; - if (event->type() == QEvent::ApplicationActivate) - active = true; - else if (event->type() == QEvent::ApplicationDeactivate) - active = false; - - if (d->active != active) { - d->active = active; - emit activeChanged(); - } - } - if (event->type() == QEvent::LayoutDirectionChange) { - Qt::LayoutDirection direction = QGuiApplication::layoutDirection(); - if (d->layoutDirection != direction) { - d->layoutDirection = direction; - emit layoutDirectionChanged(); - } - } - return false; -} - -QT_END_NAMESPACE |