Commit f3456c8f authored by Aurindam Jana's avatar Aurindam Jana Committed by hjk

Fix build for Qt 5 configured without -developer-build

This patch reverts 2b0c1fb3 and
affd4b9c

Change-Id: I65daf80a0e510f4103c2f2714a3ee583207e53d0
Reviewed-by: default avatarKai Koehne <kai.koehne@digia.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 3818efae
......@@ -6,7 +6,7 @@ QT += network \
sql
greaterThan(QT_MAJOR_VERSION, 4) {
QT += help printsupport core-private
QT += help printsupport
} else {
CONFIG += help
}
......
......@@ -45,8 +45,6 @@
#if QT_VERSION < 0x050000
#include <QAbstractFileEngine>
#else
#include <private/qabstractfileengine_p.h>
#endif
#ifndef Q_OS_WIN
......@@ -195,9 +193,13 @@ void FileUtils::removeFile(const QString &filePath, bool deleteFromFS)
static inline bool fileSystemRenameFile(const QString &orgFilePath,
const QString &newFilePath)
{
#if QT_VERSION < 0x050000
QAbstractFileEngine *fileEngine = QAbstractFileEngine::create(orgFilePath); // Due to QTBUG-3570
if (!fileEngine->caseSensitive() && orgFilePath.compare(newFilePath, Qt::CaseInsensitive) == 0)
return fileEngine->rename(newFilePath);
#endif
// QTBUG-3570 is also valid for Qt 5 but QAbstractFileEngine is now in a private header file and
// the symbol is not exported.
return QFile::rename(orgFilePath, newFilePath);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment