diff options
| author | axis <qt-info@nokia.com> | 2009-08-21 14:29:28 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-21 14:29:28 (GMT) |
| commit | e190e700d707c3000f813c106c27d8f5aeda44d0 (patch) | |
| tree | 63fa8d66040ca5680b0a1b3d108a17ec2139f1e9 /src/corelib/io/qfsfileengine_win.cpp | |
| parent | 71a8a5c97315c114d55190594a7175552bfd41a6 (diff) | |
| parent | ae42be87658ad97fad48706141779ec42c02212e (diff) | |
| download | Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.zip Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.tar.gz Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.tar.bz2 | |
Merge branch 'master' of git@scm:qt/qt-s60-public
This brings support for the S60 platform into Qt.
Diffstat (limited to 'src/corelib/io/qfsfileengine_win.cpp')
| -rw-r--r-- | src/corelib/io/qfsfileengine_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 81d365a..1fabc94 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -1290,7 +1290,7 @@ static QString readSymLink(const QString &link) static QString readLink(const QString &link) { #if !defined(Q_OS_WINCE) -#if !defined(QT_NO_LIBRARY) +#if !defined(QT_NO_LIBRARY) && !defined(Q_CC_MWERKS) QString ret; bool neededCoInit = false; @@ -1347,7 +1347,7 @@ static QString readLink(const QString &link) bool QFSFileEngine::link(const QString &newName) { #if !defined(Q_OS_WINCE) -#if !defined(QT_NO_LIBRARY) +#if !defined(QT_NO_LIBRARY) && !defined(Q_CC_MWERKS) bool ret = false; QString linkName = newName; |