Changeset 561 for trunk/src/gui/inputmethod/qinputcontextfactory.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/gui/inputmethod/qinputcontextfactory.cpp
r2 r561 2 2 ** 3 3 ** 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) 5 6 ** 6 7 ** This file is part of the QtGui module of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 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. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** 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. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 72 72 #include "qmacinputcontext_p.h" 73 73 #endif 74 #ifdef Q_WS_S60 75 #include "qcoefepinputcontext_p.h" 76 #endif 74 77 75 78 #include "private/qfactoryloader_p.h" … … 87 90 \brief The QInputContextFactory class creates QInputContext objects. 88 91 89 \ingroup appearance90 92 91 93 The input context factory creates a QInputContext object for a … … 146 148 } 147 149 #endif 150 #if defined(Q_WS_S60) 151 if (key == QLatin1String("coefep")) { 152 result = new QCoeFepInputContext; 153 } 154 #endif 148 155 #if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS) 149 156 Q_UNUSED(key); … … 183 190 result << QLatin1String("mac"); 184 191 #endif 192 #if defined(Q_WS_S60) 193 result << QLatin1String("coefep"); 194 #endif 185 195 #if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) 186 196 result += loader()->keys(); … … 216 226 #if defined(Q_WS_MAC) 217 227 if (key == QLatin1String("mac")) 228 return QStringList(QString()); 229 #endif 230 #if defined(Q_WS_S60) 231 if (key == QLatin1String("coefep")) 218 232 return QStringList(QString()); 219 233 #endif … … 242 256 return QInputContext::tr( "XIM" ); 243 257 #endif 258 #ifdef Q_WS_S60 259 if (key == QLatin1String("coefep")) 260 return QInputContext::tr( "FEP" ); 261 #endif 244 262 #if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS) 245 263 Q_UNUSED(key); … … 273 291 return QInputContext::tr( "Mac OS X input method" ); 274 292 #endif 293 #if defined(Q_WS_S60) 294 if (key == QLatin1String("coefep")) 295 return QInputContext::tr( "S60 FEP input method" ); 296 #endif 275 297 #if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS) 276 298 Q_UNUSED(key);
Note:
See TracChangeset
for help on using the changeset viewer.