Changeset 561 for trunk/src/gui/inputmethod/qinputcontextfactory.cpp

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:

• . (modified) (1 prop)
• src/gui/inputmethod/qinputcontextfactory.cpp (modified) (10 diffs)

trunk/src/gui/inputmethod/qinputcontextfactory.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** 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.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** 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
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -72 +72 @@
 #include "qmacinputcontext_p.h"
 #endif
+
+
+
 
 #include "private/qfactoryloader_p.h"
@@ -87 +90 @@
     \brief The QInputContextFactory class creates QInputContext objects.
 
-    \ingroup appearance
 
     The input context factory creates a QInputContext object for a
@@ -146 +148 @@
     }
 #endif
+
+
+
+
+
 #if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
     Q_UNUSED(key);
@@ -183 +190 @@
     result << QLatin1String("mac");
 #endif
+
+
+
 #if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
     result += loader()->keys();
@@ -216 +226 @@
 #if defined(Q_WS_MAC)
     if (key == QLatin1String("mac"))
+
+
+
+
         return QStringList(QString());
 #endif
@@ -242 +256 @@
         return QInputContext::tr( "XIM" );
 #endif
+
+
+
+
 #if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
     Q_UNUSED(key);
@@ -273 +291 @@
         return QInputContext::tr( "Mac OS X input method" );
 #endif
+
+
+
+
 #if defined(QT_NO_LIBRARY) || defined(QT_NO_SETTINGS)
     Q_UNUSED(key);