diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-01-17 18:26:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-02 23:27:00 +0200 |
| commit | e437d5ff4b02b00e18e94930fe9d02547511ccb2 (patch) | |
| tree | 20dca2f8827aecfc33f49133d7c11165a5be3633 /qmake/generators/makefile.h | |
| parent | f7ddbcb3d589a1f7138663398538c332c491d85c (diff) | |
qmake: generate make dist target for subdir projects
The original dist target no longer copies files around, but
merely does the final packaging. It depends on a new recursive
distdir target, which handles copying distfiles to the distdir.
[ChangeLog][Tools][qmake] Added 'make dist' target for subdirs
projects (unix only)
Task-number: QTBUG-21910
Change-Id: Ib59139c3fe196caf832d8dcefab484ab91f1f5ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 6bb717b8de..12186ebae3 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -107,7 +107,7 @@ protected: bool writeDummyMakefile(QTextStream &t); virtual bool writeStubMakefile(QTextStream &t); virtual bool writeMakefile(QTextStream &t); - void writeDefaultVariables(QTextStream &t); + virtual void writeDefaultVariables(QTextStream &t); QString pkgConfigPrefix() const; QString pkgConfigFileName(bool fixify=true); @@ -136,7 +136,7 @@ protected: const QString &out_directory_cdin, const QString &makefilein); virtual void writeSubMakeCall(QTextStream &t, const QString &outDirectory_cdin, const QString &makeFileIn); - void writeSubTargets(QTextStream &t, QList<SubTarget*> subtargets, int flags); + virtual void writeSubTargets(QTextStream &t, QList<SubTarget*> subtargets, int flags); //extra compiler interface bool verifyExtraCompiler(const ProString &c, const QString &f); |