summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2018-06-12 16:55:52 +0300
committerOrgad Shaneh <orgads@gmail.com>2018-06-13 11:20:12 +0000
commitde6b81399e4cb9f80c4c5bc95c7e32545b2934a3 (patch)
treeb0ff5340b5879cdbe0ef9afb805d9f0a98e812be
parent33fea7e7a9155632f7ac3804a1a6d1d35324b6d0 (diff)
Qmake: Fix compilation with QMAKE_USE_CACHE
Change-Id: Ib2872093d1e82a59baad94104dafe8329a9e8942 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r--qmake/generators/makefiledeps.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp
index c68eeb13d6..ffccdefbe1 100644
--- a/qmake/generators/makefiledeps.cpp
+++ b/qmake/generators/makefiledeps.cpp
@@ -1050,7 +1050,7 @@ void QMakeSourceFileInfo::saveCache(const QString &cf)
QFile file(QMakeLocalFileName(cf).local());
if(file.open(QIODevice::WriteOnly)) {
QTextStream stream(&file);
- stream << qmake_version() << endl << endl; //version
+ stream << QMAKE_VERSION_STR << endl << endl; //version
{ //cache verification
QMap<QString, QStringList> verify = getCacheVerification();
stream << verify.count() << endl;
@@ -1105,11 +1105,11 @@ void QMakeSourceFileInfo::loadCache(const QString &cf)
return;
QFile file;
- if(!file.open(QIODevice::ReadOnly, fd))
+ if (!file.open(fd, QIODevice::ReadOnly))
return;
QTextStream stream(&file);
- if(stream.readLine() == qmake_version()) { //version check
+ if (stream.readLine() == QMAKE_VERSION_STR) { //version check
stream.skipWhiteSpace();
bool verified = true;