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/corelib/plugin | |
| 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/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/qfactoryloader.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/plugin/qfactoryloader_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index 87decc6..62d565a 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -41,7 +41,7 @@ #include "qfactoryloader_p.h" -#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY #include "qfactoryinterface.h" #include "qmap.h" #include <qdir.h> diff --git a/src/corelib/plugin/qfactoryloader_p.h b/src/corelib/plugin/qfactoryloader_p.h index 51426ba..10e6e2a 100644 --- a/src/corelib/plugin/qfactoryloader_p.h +++ b/src/corelib/plugin/qfactoryloader_p.h @@ -57,7 +57,7 @@ #include "QtCore/qstringlist.h" #include "private/qlibrary_p.h" -#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) +#ifndef QT_NO_LIBRARY QT_BEGIN_NAMESPACE |