diff options
author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-04-29 15:17:36 +0200 |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-29 15:17:36 +0200 |
commit | e709077eff4d8b05cc9022d85dcb48587d96c720 (patch) | |
tree | 4b8262771ebf03739bcf79fb8dfc0838f3bc82b0 /src/corelib/plugin/qfactoryloader.cpp | |
parent | 4d312a6e635ce0cde0ae5c439541f315d7fddff3 (diff) |
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/qfactoryloader.cpp')
-rw-r--r-- | src/corelib/plugin/qfactoryloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index 87decc6693..62d565adb2 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> |