diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 17 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeglobal_p.h | 8 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index d91d54fb..fa7134ed 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -2469,7 +2469,7 @@ const QMetaObject *QDeclarativeEnginePrivate::metaObjectForType(int t) const } } -bool QDeclarative_isFileCaseCorrect(const QString &fileName) +bool QDeclarative_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */) { #if defined(Q_OS_MAC) || defined(Q_OS_WIN32) QFileInfo info(fileName); @@ -2493,6 +2493,20 @@ bool QDeclarative_isFileCaseCorrect(const QString &fileName) int canonicalLength = canonical.length(); int length = qMin(absoluteLength, canonicalLength); + if (lengthIn >= 0) { + length = qMin(lengthIn, length); + } else { + // No length given: Limit to file name. Do not trigger + // on drive letters or folder names. + int lastSlash = absolute.lastIndexOf(QLatin1Char('/')); + if (lastSlash < 0) + lastSlash = absolute.lastIndexOf(QLatin1Char('\\')); + if (lastSlash >= 0) { + const int fileNameLength = absoluteLength - 1 - lastSlash; + length = qMin(length, fileNameLength); + } + } + for (int ii = 0; ii < length; ++ii) { const QChar &a = absolute.at(absoluteLength - 1 - ii); const QChar &c = canonical.at(canonicalLength - 1 - ii); @@ -2503,6 +2517,7 @@ bool QDeclarative_isFileCaseCorrect(const QString &fileName) return false; } #else + Q_UNUSED(lengthIn) Q_UNUSED(fileName) #endif return true; diff --git a/src/declarative/qml/qdeclarativeglobal_p.h b/src/declarative/qml/qdeclarativeglobal_p.h index ab9725ba..9f0d5655 100644 --- a/src/declarative/qml/qdeclarativeglobal_p.h +++ b/src/declarative/qml/qdeclarativeglobal_p.h @@ -84,8 +84,14 @@ struct QDeclarativeGraphics_DerivedObject : public QObject It may have false positives (say the case is correct when it isn't), but it should never have a false negative (say the case is incorrect when it is correct). + + Length specifies specifies the number of characters to be checked from + behind. That is, if a file name results from a relative path specification + like "foo/bar.qml" and is made absolute, the original length (11) should + be passed indicating that only the last part of the relative path should + be checked. */ -bool QDeclarative_isFileCaseCorrect(const QString &fileName); +bool QDeclarative_isFileCaseCorrect(const QString &fileName, int length = -1); /*! Makes the \a object a child of \a parent. Note that when using this method, |