diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index 381f6a6e573..e152430c064 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -6,7 +6,7 @@ QT += network \ sql greaterThan(QT_MAJOR_VERSION, 4) { - QT += help printsupport + QT += help printsupport core-private } else { CONFIG += help } diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp index fc8f728bdd6..3f3c05b7c20 100644 --- a/src/plugins/coreplugin/fileutils.cpp +++ b/src/plugins/coreplugin/fileutils.cpp @@ -45,6 +45,8 @@ #if QT_VERSION < 0x050000 #include +#else +#include #endif #ifndef Q_OS_WIN @@ -193,8 +195,7 @@ void FileUtils::removeFile(const QString &filePath, bool deleteFromFS) static inline bool fileSystemRenameFile(const QString &orgFilePath, const QString &newFilePath) { - QFile f(orgFilePath); // Due to QTBUG-3570 - QAbstractFileEngine *fileEngine = f.fileEngine(); + QAbstractFileEngine *fileEngine = QAbstractFileEngine::create(orgFilePath); // Due to QTBUG-3570 if (!fileEngine->caseSensitive() && orgFilePath.compare(newFilePath, Qt::CaseInsensitive) == 0) return fileEngine->rename(newFilePath); return QFile::rename(orgFilePath, newFilePath);