AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deprecation warnings in QtGui, QtPlatformSupport.

Browse Source 
Change-Id: I355a059c5311928301907d5d1e3ecce00a94341d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint 2012-05-09 17:21:32 +02:00 committed by Qt by Nokia
parent 9b9895de8d
commit 8b9668c633
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qwindow.cpp
View File

@ -59,7 +59,7 @@
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QStyleHints> #include <QStyleHints>
#include <QPlatformCursor> #include <qpa/qplatformcursor.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

14
src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp
View File

@ -58,24 +58,22 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
QStringList QPlatformInputContextFactory::keys() QStringList QPlatformInputContextFactory::keys()
{ {
#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) #if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
QStringList list = loader()->keys(); return loader()->keyMap().values();
#else #else
QStringList list; return QStringList();
#endif #endif
return list;
} }
QPlatformInputContext *QPlatformInputContextFactory::create(const QString& key) QPlatformInputContext *QPlatformInputContextFactory::create(const QString& key)
{ {
QPlatformInputContext *ret = 0;
QStringList paramList = key.split(QLatin1Char(':')); QStringList paramList = key.split(QLatin1Char(':'));
QString platform = paramList.takeFirst().toLower(); const QString platform = paramList.takeFirst().toLower();
#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) #if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
if (QPlatformInputContextFactoryInterface *factory = qobject_cast<QPlatformInputContextFactoryInterface*>(loader()->instance(platform))) if (QPlatformInputContext *ret = qLoadPlugin1<QPlatformInputContext, QPlatformInputContextFactoryInterface>(loader(), platform, paramList))
ret = factory->create(platform, paramList); return ret;
#endif #endif
return ret; return 0;
} }
QPlatformInputContext *QPlatformInputContextFactory::create() QPlatformInputContext *QPlatformInputContextFactory::create()