Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/inputmethod/qinputcontextfactory.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the QtGui module of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    7272#include "qmacinputcontext_p.h"
    7373#endif
     74#ifdef Q_WS_S60
     75#include "qcoefepinputcontext_p.h"
     76#endif
    7477
    7578#include "private/qfactoryloader_p.h"
     
    8790    \brief The QInputContextFactory class creates QInputContext objects.
    8891
    89     \ingroup appearance
    9092
    9193    The input context factory creates a QInputContext object for a
     
    146148    }
    147149#endif
     150#if defined(Q_WS_S60)
     151    if (key == QLatin1String("coefep")) {
     152        result = new QCoeFepInputContext;
     153    }
     154#endif
    148155#if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
    149156    Q_UNUSED(key);
     
    183190    result << QLatin1String("mac");
    184191#endif
     192#if defined(Q_WS_S60)
     193    result << QLatin1String("coefep");
     194#endif
    185195#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
    186196    result += loader()->keys();
     
    216226#if defined(Q_WS_MAC)
    217227    if (key == QLatin1String("mac"))
     228        return QStringList(QString());
     229#endif
     230#if defined(Q_WS_S60)
     231    if (key == QLatin1String("coefep"))
    218232        return QStringList(QString());
    219233#endif
     
    242256        return QInputContext::tr( "XIM" );
    243257#endif
     258#ifdef Q_WS_S60
     259    if (key == QLatin1String("coefep"))
     260        return QInputContext::tr( "FEP" );
     261#endif
    244262#if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
    245263    Q_UNUSED(key);
     
    273291        return QInputContext::tr( "Mac OS X input method" );
    274292#endif
     293#if defined(Q_WS_S60)
     294    if (key == QLatin1String("coefep"))
     295        return QInputContext::tr( "S60 FEP input method" );
     296#endif
    275297#if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
    276298    Q_UNUSED(key);
Note: See TracChangeset for help on using the changeset viewer.