diff options
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/makefiledeps.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/makefiledeps.h | 2 | ||||
-rw-r--r-- | qmake/main.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index 7c4be64aa8..0ff64c4fbc 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -246,7 +246,7 @@ bool QMakeSourceFileInfo::mocable(const QString &file) return false; } -QMakeSourceFileInfo::QMakeSourceFileInfo(const QString &cf) +QMakeSourceFileInfo::QMakeSourceFileInfo() { //dep_mode dep_mode = Recursive; diff --git a/qmake/generators/makefiledeps.h b/qmake/generators/makefiledeps.h index 7e39396754..b97ace42a6 100644 --- a/qmake/generators/makefiledeps.h +++ b/qmake/generators/makefiledeps.h @@ -86,7 +86,7 @@ protected: public: - QMakeSourceFileInfo(const QString &cachefile=""); + QMakeSourceFileInfo(); virtual ~QMakeSourceFileInfo(); QVector<QMakeLocalFileName> dependencyPaths() const { return depdirs; } diff --git a/qmake/main.cpp b/qmake/main.cpp index dd1cca9633..7a2532eb0e 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -265,6 +265,8 @@ static bool copyFileTimes(QFile &targetFile, const QString &sourceFilePath, return false; } } +#else + Q_UNUSED(mustEnsureWritability); #endif if (!IoUtils::touchFile(targetFile.fileName(), sourceFilePath, errorString)) return false; |