diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-27 16:36:06 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-01 17:35:22 +0000 |
| commit | a8010b0fff47d903d4a1f80e3adb1a2ef41beb33 (patch) | |
| tree | 066c2d427f083ed6d1592835f6a4ccd08e330da1 /src/shared/proparser/qmakeevaluator.h | |
| parent | cf82f210804151452fce3cddb3cb2793dab976eb (diff) | |
| download | qt-creator-a8010b0fff47d903d4a1f80e3adb1a2ef41beb33.tar.gz | |
make VFS aware of exact vs. cumulative evaluation
the cumulative evaluation has a good chance to make a mess of the
virtual file contents created by the exact parsing, so better contain it
to its own namespace.
the ProFile cache also needs to keep the files separate. this
specifically addresses the side issue discussed in QTCREATORBUG-10779.
it also fixes attempts to deploy the wrong build when the variant is
selected through a cache file, as in QTCREATORBUG-15815.
in the project explorer, we don't track from which evaluation pass
particular files came from, so we try the cumulative first to get the
most contents, and fall back to the exact one if the former file is
empty (or does not exist at all).
Task-number: QTCREATORBUG-15815
Change-Id: I2c1eb16c97526fa275a1c6a2eae9266d385859ac
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/shared/proparser/qmakeevaluator.h')
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h index 8f7a2072b5..d1e734346b 100644 --- a/src/shared/proparser/qmakeevaluator.h +++ b/src/shared/proparser/qmakeevaluator.h @@ -30,6 +30,7 @@ #endif #include "qmakeparser.h" +#include "qmakevfs.h" #include "ioutils.h" #include <qlist.h> @@ -232,7 +233,7 @@ public: VisitReturn parseJsonInto(const QByteArray &json, const QString &into, ProValueMap *value); VisitReturn writeFile(const QString &ctx, const QString &fn, QIODevice::OpenMode mode, - bool exe, const QString &contents); + QMakeVfs::VfsFlags flags, const QString &contents); #ifndef QT_BOOTSTRAPPED void runProcess(QProcess *proc, const QString &command) const; #endif |