diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-06 16:07:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-06 18:26:47 +0200 |
| commit | f1b9ba8c6ee6b991ef4e513bc4f39045fd55d1e6 (patch) | |
| tree | cd587156a07344e98aca0cd1511075fe272bfec5 /src/qml/qml/qqmltypeloader.cpp | |
| parent | 27deff6d2b5a9eb1d98cd7b377ab934a35086664 (diff) | |
| parent | 1d3b9db5b54d8ae99c6b149c8d3d91eda19b5838 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 022083c596..ffba342491 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1683,14 +1683,7 @@ QString QQmlTypeLoader::absoluteFilePath(const QString &path) StringSet **fileSet = m_importDirCache.value(QHashedStringRef(dirPath.constData(), dirPath.length())); if (!fileSet) { QHashedString dirPathString(dirPath.toString()); - bool exists = false; -#ifdef Q_OS_UNIX - struct stat statBuf; - if (::stat(QFile::encodeName(dirPathString).constData(), &statBuf) == 0) - exists = S_ISDIR(statBuf.st_mode); -#else - exists = QDir(dirPathString).exists(); -#endif + bool exists = QDir(dirPathString).exists(); QStringHash<bool> *files = exists ? new QStringHash<bool> : 0; m_importDirCache.insert(dirPathString, files); fileSet = m_importDirCache.value(dirPathString); @@ -1755,14 +1748,7 @@ bool QQmlTypeLoader::directoryExists(const QString &path) StringSet **fileSet = m_importDirCache.value(QHashedStringRef(dirPath.constData(), dirPath.length())); if (!fileSet) { QHashedString dirPathString(dirPath.toString()); - bool exists = false; -#ifdef Q_OS_UNIX - struct stat statBuf; - if (::stat(QFile::encodeName(dirPathString).constData(), &statBuf) == 0) - exists = S_ISDIR(statBuf.st_mode); -#else - exists = QDir(dirPathString).exists(); -#endif + bool exists = QDir(dirPathString).exists(); QStringHash<bool> *files = exists ? new QStringHash<bool> : 0; m_importDirCache.insert(dirPathString, files); fileSet = m_importDirCache.value(dirPathString); |