From 4dd2de9c7676220d2ac47f679ae05719078da0d0 Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Sun, 24 Jun 2012 19:16:21 +0800 Subject: Move QPlatformInputContextPlugin/Factory to QtGui PlatformSupport is no longer shared and there should be no plugin factory in it otherwise it will break plugin loading. Since PlatformInputContext is already in QtGui, so move QPlatformInput- ContextPlugin/Factory to resolve the platforminputcontexts plugin loading problem. And remove platformsupport-private dependency from existing inputcontexts plugin. Change-Id: If4cb766470b8f9c8b72157da86cb33b4e1ff09e3 Reviewed-by: Pekka Vuorela --- .../inputcontext/qplatforminputcontextfactory_p.h | 78 ---------------------- 1 file changed, 78 deletions(-) delete mode 100644 src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h (limited to 'src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h') diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h b/src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h deleted file mode 100644 index a7ed2ebfb3..0000000000 --- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtGui 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$ -** -****************************************************************************/ - -#ifndef QPLATFORMINPUTCONTEXTFACTORY_H -#define QPLATFORMINPUTCONTEXTFACTORY_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - - -class QPlatformInputContext; - -class QPlatformInputContextFactory -{ -public: - static QStringList keys(); - static QPlatformInputContext *create(const QString &key); - static QPlatformInputContext *create(); -}; - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // QPLATFORMINPUTCONTEXTFACTORY_H - -- cgit v1.2.3