diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-05-29 10:21:13 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-09 11:18:17 +0200 |
| commit | d04e06dc3279bd812d5a060c3f045b84ea345f35 (patch) | |
| tree | a6022b61cfe388c31b7a3d654aeb80137b3ffb48 /src/corelib/global/qlibraryinfo.cpp | |
| parent | 5b0273fc7a27785b6079a3b39681c3db22926742 (diff) | |
Remove Library dependency on Settings
made QLibraryInfo available with QT_NO_SETTINGS.
QKdeTheme is removed when QT_NO_SETTINGS is defined.
Change-Id: I63d619bb305e6c23985d9ea50c72d39a697b7a4b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 1bd17ce9ff..9953eef5e1 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -162,6 +162,8 @@ QSettings *QLibraryInfoPrivate::findConfiguration() return 0; //no luck } +#endif // QT_NO_SETTINGS + /*! \class QLibraryInfo \brief The QLibraryInfo class provides information about the Qt library. @@ -306,7 +308,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) if (!QLibraryInfoPrivate::haveGroup(group) && (group == FinalPaths || !(group = FinalPaths, QLibraryInfoPrivate::haveGroup(FinalPaths)))) -#else +#elif !defined(QT_NO_SETTINGS) if (!QLibraryInfoPrivate::configuration()) #endif { @@ -320,6 +322,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) if (path) ret = QString::fromLocal8Bit(path); +#ifndef QT_NO_SETTINGS } else { QString key; QString defaultValue; @@ -362,6 +365,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) ret = QDir::fromNativeSeparators(ret); } +#endif // QT_NO_SETTINGS } if (!ret.isEmpty() && QDir::isRelativePath(ret)) { @@ -427,8 +431,6 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) \sa location() */ -#endif // QT_NO_SETTINGS - QT_END_NAMESPACE #if defined(Q_CC_GNU) && defined(ELF_INTERPRETER) |