diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-08 16:11:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-08 16:11:33 +0100 |
| commit | 72e5124b8517662ca2cd25deb5806bc04d20c022 (patch) | |
| tree | 5950af37125647a6f14369eab667c7d611d1ac69 /qmake/generators/metamakefile.h | |
| parent | a19c22ebf8775f73b840f52b7e03869166ca0dab (diff) | |
| parent | a12f6ba302e54c1570c54aa4c722f2dafbf794af (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
tests/auto/opengl/qgl/tst_qgl.cpp
Change-Id: I3c601351c984c1f4b00478d3c47ac9eeb021e892
Diffstat (limited to 'qmake/generators/metamakefile.h')
| -rw-r--r-- | qmake/generators/metamakefile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/metamakefile.h b/qmake/generators/metamakefile.h index 85106a674d..aff2f422a6 100644 --- a/qmake/generators/metamakefile.h +++ b/qmake/generators/metamakefile.h @@ -69,7 +69,7 @@ public: virtual bool init() = 0; virtual int type() const { return -1; } - virtual bool write(const QString &oldpwd) = 0; + virtual bool write() = 0; }; QT_END_NAMESPACE |