From c7560e7f4852d38a1019611ce90fe2098de27240 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Tue, 29 May 2012 10:36:45 +0900 Subject: [PATCH] load plugins properly when QT_NO_SETTINGS is defined Change-Id: I2d28d698f4bb5cc299f1ce83b1ecb7fa87bc5fdb Reviewed-by: Oswald Buddenhagen --- src/qml/qml/qqmlimport.cpp | 2 -- src/quick/scenegraph/qsgcontextplugin.cpp | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index f1e9074..5ea45f2 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1105,10 +1105,8 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) // Search order is applicationDirPath(), $QML_IMPORT_PATH, QLibraryInfo::ImportsPath -#ifndef QT_NO_SETTINGS QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath); addImportPath(installImportsPath); -#endif // QT_NO_SETTINGS // env import paths QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); diff --git a/src/quick/scenegraph/qsgcontextplugin.cpp b/src/quick/scenegraph/qsgcontextplugin.cpp index dd5ad49..7e0ae1e 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; } -- 2.7.4