diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-12 09:40:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-15 17:20:15 +0000 |
| commit | 527406cbd99f44470ef87468b73c18df949e8ac7 (patch) | |
| tree | 4ee73cffee4bf8699ce45d902aa9b30c6ebb1cc4 /src/gui/kernel/qplatforminputcontextfactory.cpp | |
| parent | cd201b2c2c2849fea0c5a38ffd979cd9d5b24997 (diff) | |
Modernize the "settings" feature
Change-Id: I9b8a61ecb1413b513ae5c9e77d3ee1b3e8b6562c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/gui/kernel/qplatforminputcontextfactory.cpp')
| -rw-r--r-- | src/gui/kernel/qplatforminputcontextfactory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qplatforminputcontextfactory.cpp b/src/gui/kernel/qplatforminputcontextfactory.cpp index c59d89fabe..df7b95d8df 100644 --- a/src/gui/kernel/qplatforminputcontextfactory.cpp +++ b/src/gui/kernel/qplatforminputcontextfactory.cpp @@ -48,14 +48,14 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QPlatformInputContextFactoryInterface_iid, QLatin1String("/platforminputcontexts"), Qt::CaseInsensitive)) #endif QStringList QPlatformInputContextFactory::keys() { -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) return loader()->keyMap().values(); #else return QStringList(); @@ -70,7 +70,7 @@ QString QPlatformInputContextFactory::requested() QPlatformInputContext *QPlatformInputContextFactory::create(const QString& key) { -#ifndef QT_NO_SETTINGS +#if QT_CONFIG(settings) if (!key.isEmpty()) { QStringList paramList = key.split(QLatin1Char(':')); const QString platform = paramList.takeFirst().toLower(); |