summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_qpf.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/qfontengine_qpf.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/qfontengine_qpf.cpp')
-rw-r--r--src/gui/text/qfontengine_qpf.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp
index 23f263b0bd..3299dc1e0d 100644
--- a/src/gui/text/qfontengine_qpf.cpp
+++ b/src/gui/text/qfontengine_qpf.cpp
@@ -449,9 +449,7 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng
freetype = QFreetypeFace::getFace(face_id);
if (!freetype) {
QString newPath =
-#ifndef QT_NO_SETTINGS
QLibraryInfo::location(QLibraryInfo::LibrariesPath) +
-#endif
QLatin1String("/fonts/") +
QFileInfo(QFile::decodeName(face_id.filename)).fileName();
face_id.filename = QFile::encodeName(newPath);