1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: minor fixups to ioutils for building in qt creator context

Browse Source 
Change-Id: If82a5387a03f400cde04d582dd7e8567a2b661a0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2018-03-06 19:07:11 +01:00
parent 0158b18509
commit 04b93bfb21
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qmake/library/ioutils.cpp
View File

@ -258,9 +258,8 @@ bool IoUtils::touchFile(const QString &targetFileName, const QString &referenceF
# endif # endif
return true; return true;
} }
#endif
#ifdef Q_OS_UNIX #if defined(QT_BUILD_QMAKE) && defined(Q_OS_UNIX)
bool IoUtils::readLinkTarget(const QString &symlinkPath, QString *target) bool IoUtils::readLinkTarget(const QString &symlinkPath, QString *target)
{ {
const QByteArray localSymlinkPath = QFile::encodeName(symlinkPath); const QByteArray localSymlinkPath = QFile::encodeName(symlinkPath);
@ -295,4 +294,6 @@ bool IoUtils::readLinkTarget(const QString &symlinkPath, QString *target)
} }
#endif #endif
#endif // PROEVALUATOR_FULL
QT_END_NAMESPACE QT_END_NAMESPACE

8
qmake/library/ioutils.h
View File

@ -29,6 +29,8 @@
#ifndef IOUTILS_H #ifndef IOUTILS_H
#define IOUTILS_H #define IOUTILS_H
#include "qmake_global.h"
#include <qstring.h> #include <qstring.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -39,7 +41,7 @@ namespace QMakeInternal {
This class provides replacement functionality for QFileInfo, QFile & QDir, This class provides replacement functionality for QFileInfo, QFile & QDir,
as these are abysmally slow. as these are abysmally slow.
*/ */
class IoUtils { class QMAKE_EXPORT IoUtils {
public: public:
enum FileType { enum FileType {
FileNotFound = 0, FileNotFound = 0,
@ -64,9 +66,9 @@ public:
#endif #endif
#if defined(PROEVALUATOR_FULL) #if defined(PROEVALUATOR_FULL)
static bool touchFile(const QString &targetFileName, const QString &referenceFileName, QString *errorString); static bool touchFile(const QString &targetFileName, const QString &referenceFileName, QString *errorString);
#endif # if defined(QT_BUILD_QMAKE) && defined(Q_OS_UNIX)
#ifdef Q_OS_UNIX
static bool readLinkTarget(const QString &symlinkPath, QString *target); static bool readLinkTarget(const QString &symlinkPath, QString *target);
# endif
#endif #endif
}; };