1 files changed, 11 insertions, 6 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index f32bec650e..b5c150e1cb 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -124,9 +124,9 @@ protected:
     { return replaceExtraCompilerVariables(val, QStringList(in), QStringList(out), forShell); }
 
     //interface to the source file info
-    QMakeLocalFileName fixPathForFile(const QMakeLocalFileName &, bool);
-    QMakeLocalFileName findFileForDep(const QMakeLocalFileName &, const QMakeLocalFileName &);
-    QFileInfo findFileInfo(const QMakeLocalFileName &);
+    QMakeLocalFileName fixPathForFile(const QMakeLocalFileName &, bool) override;
+    QMakeLocalFileName findFileForDep(const QMakeLocalFileName &, const QMakeLocalFileName &) override;
+    QFileInfo findFileInfo(const QMakeLocalFileName &) override;
     QMakeProject *project;
 
     //escape
@@ -172,7 +172,7 @@ protected:
     { int ret; canExecute(cmdline, &ret); return ret; }
     bool canExecute(const QStringList &cmdline, int *argv0) const;
     inline bool canExecute(const QString &cmdline) const
-    { return canExecute(cmdline.split(' '), 0); }
+    { return canExecute(cmdline.split(' '), nullptr); }
 
     bool mkdir(const QString &dir) const;
     QString mkdir_p_asstring(const QString &dir, bool escape=true) const;
@@ -198,7 +198,7 @@ protected:
     //for prl
     QString prlFileName(bool fixify=true);
     void writePrlFile();
-    bool processPrlFile(QString &);
+    bool processPrlFile(QString &, bool baseOnly);
     virtual void writePrlFile(QTextStream &);
 
     //make sure libraries are found
@@ -246,9 +246,14 @@ protected:
 
     QString installMetaFile(const ProKey &replace_rule, const QString &src, const QString &dst);
 
+    virtual bool processPrlFileBase(QString &origFile, const QStringRef &origName,
+                                    const QStringRef &fixedBase, int slashOff);
+    bool processPrlFileCore(QString &origFile, const QStringRef &origName,
+                            const QString &fixedFile);
+
 public:
     MakefileGenerator();
-    virtual ~MakefileGenerator();
+    ~MakefileGenerator();
     QMakeProject *projectFile() const;
     void setProjectFile(QMakeProject *p);