diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-05-29 10:36:45 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 19:51:58 +0200 |
| commit | c7560e7f4852d38a1019611ce90fe2098de27240 (patch) | |
| tree | 68e419140b42db2bbc0205356a0da1b8f0a09e80 /src/quick/scenegraph/qsgcontextplugin.cpp | |
| parent | ad5ee12241b3cfdd37674e28b131df646fd96146 (diff) | |
load plugins properly when QT_NO_SETTINGS is defined
Change-Id: I2d28d698f4bb5cc299f1ce83b1ecb7fa87bc5fdb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/quick/scenegraph/qsgcontextplugin.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgcontextplugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgcontextplugin.cpp b/src/quick/scenegraph/qsgcontextplugin.cpp index dd5ad490b9..7e0ae1e383 100644 --- a/src/quick/scenegraph/qsgcontextplugin.cpp +++ b/src/quick/scenegraph/qsgcontextplugin.cpp @@ -56,7 +56,7 @@ QSGContextPlugin::~QSGContextPlugin() { } -#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QSGContextFactoryInterface_iid, QLatin1String("/scenegraph"))) #endif @@ -97,7 +97,7 @@ QSGAdaptionPluginData *contextFactory() if (device.isEmpty()) device = QString::fromLocal8Bit(qgetenv("QMLSCENE_DEVICE")); -#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY if (!device.isEmpty()) { const int index = loader()->indexOf(device); if (index != -1) @@ -113,7 +113,7 @@ QSGAdaptionPluginData *contextFactory() #endif } -#endif // QT_NO_LIBRARY || QT_NO_SETTINGS +#endif // QT_NO_LIBRARY } return plugin; } |