diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-06 19:07:11 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-29 18:15:35 +0000 |
| commit | 04b93bfb2127a88f35d2b251e900163f982e7cfe (patch) | |
| tree | 9c070621ac6cde1584149c76bbf12b1a726bd47e | |
| parent | 0158b185091db424516fb4de57b909a6e7e815b2 (diff) | |
qmake: minor fixups to ioutils for building in qt creator context
Change-Id: If82a5387a03f400cde04d582dd7e8567a2b661a0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | qmake/library/ioutils.cpp | 5 | ||||
| -rw-r--r-- | qmake/library/ioutils.h | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/qmake/library/ioutils.cpp b/qmake/library/ioutils.cpp index 4aa3282e3b..fd84dff59d 100644 --- a/qmake/library/ioutils.cpp +++ b/qmake/library/ioutils.cpp @@ -258,9 +258,8 @@ bool IoUtils::touchFile(const QString &targetFileName, const QString &referenceF # endif return true; } -#endif -#ifdef Q_OS_UNIX +#if defined(QT_BUILD_QMAKE) && defined(Q_OS_UNIX) bool IoUtils::readLinkTarget(const QString &symlinkPath, QString *target) { const QByteArray localSymlinkPath = QFile::encodeName(symlinkPath); @@ -295,4 +294,6 @@ bool IoUtils::readLinkTarget(const QString &symlinkPath, QString *target) } #endif +#endif // PROEVALUATOR_FULL + QT_END_NAMESPACE diff --git a/qmake/library/ioutils.h b/qmake/library/ioutils.h index ad379404f3..32bf675f62 100644 --- a/qmake/library/ioutils.h +++ b/qmake/library/ioutils.h @@ -29,6 +29,8 @@ #ifndef IOUTILS_H #define IOUTILS_H +#include "qmake_global.h" + #include <qstring.h> QT_BEGIN_NAMESPACE @@ -39,7 +41,7 @@ namespace QMakeInternal { This class provides replacement functionality for QFileInfo, QFile & QDir, as these are abysmally slow. */ -class IoUtils { +class QMAKE_EXPORT IoUtils { public: enum FileType { FileNotFound = 0, @@ -64,9 +66,9 @@ public: #endif #if defined(PROEVALUATOR_FULL) static bool touchFile(const QString &targetFileName, const QString &referenceFileName, QString *errorString); -#endif -#ifdef Q_OS_UNIX +# if defined(QT_BUILD_QMAKE) && defined(Q_OS_UNIX) static bool readLinkTarget(const QString &symlinkPath, QString *target); +# endif #endif }; |