diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-06 10:03:50 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-06 10:03:50 (GMT) |
| commit | 7588eaee83776b510eabdb9206e3cabcb3ee9dc2 (patch) | |
| tree | 4f0a6dfc4b5b737600ee799895e06c21bc3b3fb2 | |
| parent | 09ed1ed777dc21902d53da932125aee8dd952781 (diff) | |
| download | Qt-7588eaee83776b510eabdb9206e3cabcb3ee9dc2.zip Qt-7588eaee83776b510eabdb9206e3cabcb3ee9dc2.tar.gz Qt-7588eaee83776b510eabdb9206e3cabcb3ee9dc2.tar.bz2 | |
fix another broken merge
| -rw-r--r-- | src/gui/text/qfontengine_qpf.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp index e7826cc..76ba041 100644 --- a/src/gui/text/qfontengine_qpf.cpp +++ b/src/gui/text/qfontengine_qpf.cpp @@ -331,12 +331,12 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng #if defined(DEBUG_FONTENGINE) qDebug() << "found existing qpf:" << fileName; #endif - if (::access(encodedName, W_OK | R_OK) == 0) { - fd = QT_OPEN(encodedName, O_RDWR); + if (::access(encodedFileName, W_OK | R_OK) == 0) { + fd = QT_OPEN(encodedFileName, O_RDWR); } // read-write access failed - try read-only access - if (fd == -1 && ::access(encodedName, R_OK) == 0) { - fd = QT_OPEN(encodedName, O_RDONLY); + if (fd == -1 && ::access(encodedFileName, R_OK) == 0) { + fd = QT_OPEN(encodedFileName, O_RDONLY); if (fd == -1) { #if defined(DEBUG_FONTENGINE) qErrnoWarning("QFontEngineQPF: unable to open %s", encodedName.constData()); @@ -355,7 +355,7 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng qDebug() << "creating qpf on the fly:" << fileName; #endif if (::access(QFile::encodeName(qws_fontCacheDir()), W_OK) == 0) { - fd = QT_OPEN(encodedName, O_RDWR | O_EXCL | O_CREAT, 0644); + fd = QT_OPEN(encodedFileName, O_RDWR | O_EXCL | O_CREAT, 0644); if (fd == -1) { #if defined(DEBUG_FONTENGINE) qErrnoWarning(errno, "QFontEngineQPF: open() failed for %s", encodedName.constData()); |