diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 18:14:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-16 18:14:08 (GMT) |
| commit | fc007d0a99cc52e673c5d2606e5076831f6103b1 (patch) | |
| tree | 5ad98ad0fa614b9becf21f2419adb633666028c9 /src/corelib | |
| parent | f4ee70e849759adc710a56cf25e08a32b8250ebd (diff) | |
| parent | acc84a9d0d3427155298db3a8c0ad406d078de0e (diff) | |
| download | Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.zip Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.tar.gz Qt-fc007d0a99cc52e673c5d2606e5076831f6103b1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Check S60_VERSION instead of existence of certain files in bearer plugin
Fixed EPOCROOT references in createpackage.pl.
Restore 4.7.0 behavior that non-existing paths are possible.
QTBUG-4852 Turning on runtime nested exception support where available
Fix warnings
Fixed incorrect Symbian scoping.
QS60style: itemview selection indication works incorrectly
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index fcd17f7..efcc8f9 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -1550,10 +1550,11 @@ bool QDir::makeAbsolute() // ### What do the return values signify? QScopedPointer<QDirPrivate> dir(new QDirPrivate(*d_ptr.constData())); dir->setPath(absolutePath); - if (!(dir->fileEngine->fileFlags(QAbstractFileEngine::TypesMask) & QAbstractFileEngine::DirectoryType)) + d_ptr = dir.take(); + + if (!(d_ptr->fileEngine->fileFlags(QAbstractFileEngine::TypesMask) & QAbstractFileEngine::DirectoryType)) return false; - d_ptr = dir.take(); return true; } |