summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2018-08-02 23:34:53 +0200
committerAlessandro Portale <alessandro.portale@qt.io>2018-08-08 17:30:23 +0000
commit182aca8487ad06396a29757fd86189364fce832b (patch)
treeafe2fe6af2da0b04fa17df26df6fc8642f247ede /qmake/generators/unix
parent24115f5a9ceb6b87465d5a14566b655ae66bba8c (diff)
qmake: Apply modernize-use-override
Add overrides to functions, except for destructors. Change-Id: I6e4640aa95a5c97d6bd6f6d8692d3290c421344e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'qmake/generators/unix')
-rw-r--r--qmake/generators/unix/unixmake.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index da5cdb320c..c5e42aa1ae 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -38,7 +38,7 @@ class UnixMakefileGenerator : public MakefileGenerator
bool include_deps;
QString libtoolFileName(bool fixify=true);
void writeLibtoolFile(); // for libtool
- void writePrlFile(QTextStream &);
+ void writePrlFile(QTextStream &) override;
public:
UnixMakefileGenerator();
@@ -46,23 +46,23 @@ public:
protected:
virtual bool doPrecompiledHeaders() const { return project->isActiveConfig("precompile_header"); }
- virtual bool doDepends() const { return !Option::mkfile::do_stub_makefile && MakefileGenerator::doDepends(); }
+ bool doDepends() const override { return !Option::mkfile::do_stub_makefile && MakefileGenerator::doDepends(); }
#ifdef Q_OS_WIN // MinGW x-compiling for QNX
- virtual QString installRoot() const;
+ QString installRoot() const override;
#endif
- virtual QString defaultInstall(const QString &);
- virtual ProString fixLibFlag(const ProString &lib);
+ QString defaultInstall(const QString &) override;
+ ProString fixLibFlag(const ProString &lib) override;
- virtual bool findLibraries(bool linkPrl, bool mergeLflags);
- virtual QString escapeFilePath(const QString &path) const;
+ bool findLibraries(bool linkPrl, bool mergeLflags) override;
+ QString escapeFilePath(const QString &path) const override;
ProString escapeFilePath(const ProString &path) const { return MakefileGenerator::escapeFilePath(path); }
- virtual QStringList &findDependencies(const QString &);
- virtual void init();
+ QStringList &findDependencies(const QString &) override;
+ void init() override;
- virtual void writeDefaultVariables(QTextStream &t);
- virtual void writeSubTargets(QTextStream &t, QList<SubTarget*> subtargets, int flags);
+ void writeDefaultVariables(QTextStream &t) override;
+ void writeSubTargets(QTextStream &t, QList<SubTarget*> subtargets, int flags) override;
void writeMakeParts(QTextStream &);
- bool writeMakefile(QTextStream &);
+ bool writeMakefile(QTextStream &) override;
private:
void init2();