feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix build for Qt 5 configured without -developer-build

Browse Source 
This patch reverts 2b0c1fb376 and
affd4b9ce1

Change-Id: I65daf80a0e510f4103c2f2714a3ee583207e53d0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Aurindam Jana
2012-11-29 12:20:21 +01:00
committed by hjk
parent 3818efae03
commit f3456c8f92
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/coreplugin.pro
View File

@@ -6,7 +6,7 @@ QT += network \
sql sql
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QT += help printsupport core-private QT += help printsupport
} else { } else {
CONFIG += help CONFIG += help
} }

6
src/plugins/coreplugin/fileutils.cpp
View File

@@ -45,8 +45,6 @@
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
#include <QAbstractFileEngine> #include <QAbstractFileEngine>
#else
#include <private/qabstractfileengine_p.h>
#endif #endif
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
@@ -195,9 +193,13 @@ void FileUtils::removeFile(const QString &filePath, bool deleteFromFS)
static inline bool fileSystemRenameFile(const QString &orgFilePath, static inline bool fileSystemRenameFile(const QString &orgFilePath,
const QString &newFilePath) const QString &newFilePath)
{ {
#if QT_VERSION < 0x050000
QAbstractFileEngine *fileEngine = QAbstractFileEngine::create(orgFilePath); // Due to QTBUG-3570 QAbstractFileEngine *fileEngine = QAbstractFileEngine::create(orgFilePath); // Due to QTBUG-3570
if (!fileEngine->caseSensitive() && orgFilePath.compare(newFilePath, Qt::CaseInsensitive) == 0) if (!fileEngine->caseSensitive() && orgFilePath.compare(newFilePath, Qt::CaseInsensitive) == 0)
return fileEngine->rename(newFilePath); 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); return QFile::rename(orgFilePath, newFilePath);
} }