diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-04-29 13:17:36 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-29 13:17:36 (GMT) |
| commit | e709077eff4d8b05cc9022d85dcb48587d96c720 (patch) | |
| tree | 4b8262771ebf03739bcf79fb8dfc0838f3bc82b0 /src/gui/painting/qgraphicssystemfactory.cpp | |
| parent | 4d312a6e635ce0cde0ae5c439541f315d7fddff3 (diff) | |
| download | Qt-e709077eff4d8b05cc9022d85dcb48587d96c720.zip Qt-e709077eff4d8b05cc9022d85dcb48587d96c720.tar.gz Qt-e709077eff4d8b05cc9022d85dcb48587d96c720.tar.bz2 | |
Fix QT_NO_LIBRARY
Some class uses QFactoryLoader without checking if QT_NO_LIBRARY is not
defined. Remove QT_NO_SETTINGS used with QT_NO_LIBRARY for
QFactoryLoader because LIBRARY depends on SETTINGS.
Merge-request: 578
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
Diffstat (limited to 'src/gui/painting/qgraphicssystemfactory.cpp')
| -rw-r--r-- | src/gui/painting/qgraphicssystemfactory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp index 29f24a3..3c09894 100644 --- a/src/gui/painting/qgraphicssystemfactory.cpp +++ b/src/gui/painting/qgraphicssystemfactory.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QGraphicsSystemFactoryInterface_iid, QLatin1String("/graphicssystems"), Qt::CaseInsensitive)) #endif @@ -79,7 +79,7 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key) else if (system.isEmpty() || system == QLatin1String("native")) return 0; -#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY if (!ret) { if (QGraphicsSystemFactoryInterface *factory = qobject_cast<QGraphicsSystemFactoryInterface*>(loader()->instance(system))) ret = factory->create(system); @@ -100,7 +100,7 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key) */ QStringList QGraphicsSystemFactory::keys() { -#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY QStringList list = loader()->keys(); #else QStringList list; |