diff --git a/src/plugins/qmakeprojectmanager/addlibrarywizard.h b/src/plugins/qmakeprojectmanager/addlibrarywizard.h
index 0c4cb4b7601..196d31885c9 100644
--- a/src/plugins/qmakeprojectmanager/addlibrarywizard.h
+++ b/src/plugins/qmakeprojectmanager/addlibrarywizard.h
@@ -76,8 +76,8 @@ public:
 
     Q_DECLARE_FLAGS(Platforms, Platform)
 
-    explicit AddLibraryWizard(const QString &fileName, QWidget *parent = 0);
-    ~AddLibraryWizard();
+    explicit AddLibraryWizard(const QString &fileName, QWidget *parent = nullptr);
+    ~AddLibraryWizard() override;
 
     LibraryKind libraryKind() const;
     QString proFile() const;
@@ -113,8 +113,8 @@ class DetailsPage : public QWizardPage
     Q_OBJECT
 public:
     DetailsPage(AddLibraryWizard *parent);
-    virtual void initializePage();
-    virtual bool isComplete() const;
+    void initializePage() override;
+    bool isComplete() const override;
     QString snippet() const;
 
 private:
@@ -128,7 +128,7 @@ class SummaryPage : public QWizardPage
     Q_OBJECT
 public:
     SummaryPage(AddLibraryWizard *parent);
-    virtual void initializePage();
+    void initializePage() override;
     QString snippet() const;
 private:
     AddLibraryWizard *m_libraryWizard = nullptr;
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h
index a2ed5ef749a..9e49c437127 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h
@@ -56,7 +56,7 @@ public:
                                                      QString *errorMessage);
 
 private:
-    typedef QMap<QString,QString> SubstitutionMap;
+    using SubstitutionMap = QMap<QString, QString>;
     static QString processTemplate(const QString &tmpl, const SubstitutionMap &substMap, QString *errorMessage);
     static QString cStringQuote(QString s);
 };
diff --git a/src/plugins/qmakeprojectmanager/externaleditors.h b/src/plugins/qmakeprojectmanager/externaleditors.h
index b7441501c41..422b0ca31dc 100644
--- a/src/plugins/qmakeprojectmanager/externaleditors.h
+++ b/src/plugins/qmakeprojectmanager/externaleditors.h
@@ -110,7 +110,7 @@ private:
     void processTerminated(const QString &binary);
 
     // A per-binary entry containing the socket
-    typedef QMap<QString, QTcpSocket*> ProcessCache;
+    using ProcessCache = QMap<QString, QTcpSocket*>;
 
     ProcessCache m_processCache;
 };
diff --git a/src/plugins/qmakeprojectmanager/librarydetailscontroller.h b/src/plugins/qmakeprojectmanager/librarydetailscontroller.h
index 91505a3e13e..7aab3b0cc51 100644
--- a/src/plugins/qmakeprojectmanager/librarydetailscontroller.h
+++ b/src/plugins/qmakeprojectmanager/librarydetailscontroller.h
@@ -39,7 +39,7 @@ class LibraryDetailsController : public QObject
 public:
     explicit LibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
                                       const QString &proFile,
-                                      QObject *parent = 0);
+                                      QObject *parent = nullptr);
     virtual bool isComplete() const = 0;
     virtual QString snippet() const = 0;
 
@@ -116,14 +116,14 @@ class NonInternalLibraryDetailsController : public LibraryDetailsController
 public:
     explicit NonInternalLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
                                                  const QString &proFile,
-                                                 QObject *parent = 0);
-    virtual bool isComplete() const;
-    virtual QString snippet() const;
+                                                 QObject *parent = nullptr);
+    bool isComplete() const override;
+    QString snippet() const override;
 protected:
-    virtual AddLibraryWizard::LinkageType suggestedLinkageType() const;
-    virtual AddLibraryWizard::MacLibraryType suggestedMacLibraryType() const;
-    virtual QString suggestedIncludePath() const;
-    virtual void updateWindowsOptionsEnablement();
+    AddLibraryWizard::LinkageType suggestedLinkageType() const override;
+    AddLibraryWizard::MacLibraryType suggestedMacLibraryType() const override;
+    QString suggestedIncludePath() const override;
+    void updateWindowsOptionsEnablement() override;
 private:
     void slotLinkageTypeChanged();
     void slotRemoveSuffixChanged(bool ena);
@@ -135,10 +135,10 @@ class PackageLibraryDetailsController : public NonInternalLibraryDetailsControll
     Q_OBJECT
 public:
     explicit PackageLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
-                                            const QString &proFile,
-                                            QObject *parent = 0);
-    virtual bool isComplete() const;
-    virtual QString snippet() const;
+                                             const QString &proFile,
+                                             QObject *parent = nullptr);
+    bool isComplete() const override;
+    QString snippet() const override;
 private:
     bool isLinkPackageGenerated() const;
 };
@@ -149,7 +149,7 @@ class SystemLibraryDetailsController : public NonInternalLibraryDetailsControlle
 public:
     explicit SystemLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
                                             const QString &proFile,
-                                            QObject *parent = 0);
+                                            QObject *parent = nullptr);
 };
 
 class ExternalLibraryDetailsController : public NonInternalLibraryDetailsController
@@ -158,9 +158,9 @@ class ExternalLibraryDetailsController : public NonInternalLibraryDetailsControl
 public:
     explicit ExternalLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
                                               const QString &proFile,
-                                              QObject *parent = 0);
+                                              QObject *parent = nullptr);
 protected:
-    virtual void updateWindowsOptionsEnablement();
+    void updateWindowsOptionsEnablement() override;
 };
 
 class InternalLibraryDetailsController : public LibraryDetailsController
@@ -169,14 +169,14 @@ class InternalLibraryDetailsController : public LibraryDetailsController
 public:
     explicit InternalLibraryDetailsController(Ui::LibraryDetailsWidget *libraryDetails,
                                               const QString &proFile,
-                                              QObject *parent = 0);
-    virtual bool isComplete() const;
-    virtual QString snippet() const;
+                                              QObject *parent = nullptr);
+    bool isComplete() const override;
+    QString snippet() const override;
 protected:
-    virtual AddLibraryWizard::LinkageType suggestedLinkageType() const;
-    virtual AddLibraryWizard::MacLibraryType suggestedMacLibraryType() const;
-    virtual QString suggestedIncludePath() const;
-    virtual void updateWindowsOptionsEnablement();
+    AddLibraryWizard::LinkageType suggestedLinkageType() const override;
+    AddLibraryWizard::MacLibraryType suggestedMacLibraryType() const override;
+    QString suggestedIncludePath() const override;
+    void updateWindowsOptionsEnablement() override;
 private:
     void slotCurrentLibraryChanged();
     void updateProFile();
diff --git a/src/plugins/qmakeprojectmanager/profilehighlighter.h b/src/plugins/qmakeprojectmanager/profilehighlighter.h
index 9d85861af85..d76852435a5 100644
--- a/src/plugins/qmakeprojectmanager/profilehighlighter.h
+++ b/src/plugins/qmakeprojectmanager/profilehighlighter.h
@@ -43,7 +43,7 @@ public:
     };
 
     ProFileHighlighter();
-    void highlightBlock(const QString &text);
+    void highlightBlock(const QString &text) override;
 
 private:
     const TextEditor::Keywords m_keywords;
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
index a698653d7e7..0c5c0ef6fd3 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h
@@ -44,7 +44,7 @@ class QmakeProjectConfigWidget : public ProjectExplorer::NamedWidget
     Q_OBJECT
 public:
     QmakeProjectConfigWidget(QmakeBuildConfiguration *bc);
-    ~QmakeProjectConfigWidget();
+    ~QmakeProjectConfigWidget() override;
 
 private:
     // User changes in our widgets
diff --git a/src/plugins/qmakeprojectmanager/wizards/filespage.h b/src/plugins/qmakeprojectmanager/wizards/filespage.h
index 96d7145aced..dbfefb3927d 100644
--- a/src/plugins/qmakeprojectmanager/wizards/filespage.h
+++ b/src/plugins/qmakeprojectmanager/wizards/filespage.h
@@ -41,8 +41,8 @@ class FilesPage : public QWizardPage
     Q_OBJECT
 
 public:
-    explicit FilesPage(QWidget *parent = 0);
-    virtual bool isComplete() const;
+    explicit FilesPage(QWidget *parent = nullptr);
+    bool isComplete() const override;
 
     QString className() const;
     void setClassName(const QString &suggestedClassName);
diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h
index 82369889e9f..31eb5b7ce93 100644
--- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h
@@ -40,9 +40,9 @@ public:
     GuiAppWizard();
 
 private:
-    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const override;
 
-    Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
+    Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const override;
 
 private:
     static bool parametrizeTemplate(const QString &templatePath, const QString &templateName,
diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizard.h b/src/plugins/qmakeprojectmanager/wizards/librarywizard.h
index d96df97df61..f7edeb53305 100644
--- a/src/plugins/qmakeprojectmanager/wizards/librarywizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/librarywizard.h
@@ -39,9 +39,9 @@ public:
     LibraryWizard();
 
 protected:
-    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const override;
 
-    Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
+    Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const override;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qmakeprojectmanager/wizards/modulespage.h b/src/plugins/qmakeprojectmanager/wizards/modulespage.h
index 394326d1dfb..b867a434a42 100644
--- a/src/plugins/qmakeprojectmanager/wizards/modulespage.h
+++ b/src/plugins/qmakeprojectmanager/wizards/modulespage.h
@@ -41,7 +41,7 @@ class ModulesPage : public QWizardPage
     Q_OBJECT
 
 public:
-    explicit ModulesPage(QWidget* parent = 0);
+    explicit ModulesPage(QWidget* parent = nullptr);
 
     QStringList selectedModulesList() const;
     QStringList deselectedModulesList() const;
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.cpp b/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.cpp
index 1c87994374a..c11ce81d1d9 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.cpp
@@ -36,10 +36,7 @@ namespace QmakeProjectManager {
 namespace Internal {
 
 // ----------- QtProjectParameters
-QtProjectParameters::QtProjectParameters()
-  : type(ConsoleApp), flags(0), qtVersionSupport(SupportQt4And5)
-{
-}
+QtProjectParameters::QtProjectParameters() = default;
 
 QString QtProjectParameters::projectPath() const
 {
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.h b/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.h
index e82e2fb3ede..eb678d1311b 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.h
+++ b/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.h
@@ -57,9 +57,9 @@ struct QtProjectParameters {
     // Shared library: name of #define indicating compilation within library
     static QString libraryMacro(const QString &projectName);
 
-    Type type;
-    unsigned flags;
-    QtVersionSupport qtVersionSupport;
+    Type type = ConsoleApp;
+    unsigned flags = 0;
+    QtVersionSupport qtVersionSupport = SupportQt4And5;
     QString fileName;
     QString target;
     QString path;