summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qplatformfontdatabase.cpp
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2012-05-29 10:21:13 +0900
committerQt by Nokia <qt-info@nokia.com>2012-07-09 11:18:17 +0200
commitd04e06dc3279bd812d5a060c3f045b84ea345f35 (patch)
treea6022b61cfe388c31b7a3d654aeb80137b3ffb48 /src/gui/text/qplatformfontdatabase.cpp
parent5b0273fc7a27785b6079a3b39681c3db22926742 (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/gui/text/qplatformfontdatabase.cpp')
-rw-r--r--src/gui/text/qplatformfontdatabase.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp
index 7e2b890483..a101165aad 100644
--- a/src/gui/text/qplatformfontdatabase.cpp
+++ b/src/gui/text/qplatformfontdatabase.cpp
@@ -353,10 +353,8 @@ QString QPlatformFontDatabase::fontDir() const
{
QString fontpath = QString::fromLocal8Bit(qgetenv("QT_QPA_FONTDIR"));
if (fontpath.isEmpty()) {
-#ifndef QT_NO_SETTINGS
fontpath = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
fontpath += QLatin1String("/fonts");
-#endif
}
return fontpath;