Skip to content

Commit

Permalink
Qmake: Fix compilation with QMAKE_USE_CACHE
Browse files Browse the repository at this point in the history
Change-Id: Ib2872093d1e82a59baad94104dafe8329a9e8942
Reviewed-by: Oswald Buddenhagen <[email protected]>
  • Loading branch information
orgads committed Jun 13, 2018
1 parent 33fea7e commit de6b813
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions qmake/generators/makefiledeps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit de6b813

Please sign in to comment.