diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 74f81666c9647d8907575a2e0f4242512a377eb3..fc7d516aade295ed415a9dc094dfc627a1d777ff 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -45,6 +45,7 @@
 #include <cplusplus/ModelManagerInterface.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/pathchooser.h>
+#include <utils/qtcassert.h>
 #include <coreplugin/icore.h>
 
 #include <QtCore/QDir>
@@ -100,13 +101,19 @@ GenericTarget *GenericProject::activeTarget() const
 }
 
 QString GenericProject::filesFileName() const
-{ return m_filesFileName; }
+{
+    return m_filesFileName;
+}
 
 QString GenericProject::includesFileName() const
-{ return m_includesFileName; }
+{
+    return m_includesFileName;
+}
 
 QString GenericProject::configFileName() const
-{ return m_configFileName; }
+{
+    return m_configFileName;
+}
 
 static QStringList readLines(const QString &absoluteFileName)
 {
@@ -307,22 +314,34 @@ QStringList GenericProject::allIncludePaths() const
 }
 
 QStringList GenericProject::projectIncludePaths() const
-{ return m_projectIncludePaths; }
+{
+    return m_projectIncludePaths;
+}
 
 QStringList GenericProject::files() const
-{ return m_files; }
+{
+    return m_files;
+}
 
 QStringList GenericProject::generated() const
-{ return m_generated; }
+{
+    return m_generated;
+}
 
 QStringList GenericProject::includePaths() const
-{ return m_includePaths; }
+{
+    return m_includePaths;
+}
 
 void GenericProject::setIncludePaths(const QStringList &includePaths)
-{ m_includePaths = includePaths; }
+{
+    m_includePaths = includePaths;
+}
 
 QByteArray GenericProject::defines() const
-{ return m_defines; }
+{
+    return m_defines;
+}
 
 void GenericProject::setToolChain(ToolChain *tc)
 {
@@ -584,7 +603,7 @@ void GenericProjectFile::rename(const QString &newName)
 {
     // Can't happen
     Q_UNUSED(newName);
-    Q_ASSERT(false);
+    QTC_ASSERT(false, /**/);
 }
 
 Core::IFile::ReloadBehavior GenericProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.cpp b/src/plugins/genericprojectmanager/genericprojectmanager.cpp
index 864ef73e2cf3130a1cdc61093881bd618b818778..bf4d03f0bfcfbc705f7219db8aa8c522d7e9f50c 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.cpp
@@ -51,17 +51,20 @@ Manager::Manager()
     m_projectLanguage = Core::Context(ProjectExplorer::Constants::LANG_CXX);
 }
 
-Manager::~Manager()
-{ }
-
 Core::Context Manager::projectContext() const
-{ return m_projectContext; }
+{
+    return m_projectContext;
+}
 
 Core::Context Manager::projectLanguage() const
-{ return m_projectLanguage; }
+{
+    return m_projectLanguage;
+}
 
 QString Manager::mimeType() const
-{ return QLatin1String(Constants::GENERICMIMETYPE); }
+{
+    return QLatin1String(Constants::GENERICMIMETYPE);
+}
 
 ProjectExplorer::Project *Manager::openProject(const QString &fileName)
 {
@@ -83,19 +86,22 @@ ProjectExplorer::Project *Manager::openProject(const QString &fileName)
 }
 
 void Manager::registerProject(GenericProject *project)
-{ m_projects.append(project); }
+{
+    m_projects.append(project);
+}
 
 void Manager::unregisterProject(GenericProject *project)
-{ m_projects.removeAll(project); }
+{
+    m_projects.removeAll(project);
+}
 
 void Manager::notifyChanged(const QString &fileName)
 {
     foreach (GenericProject *project, m_projects) {
         if (fileName == project->filesFileName()) {
             project->refresh(GenericProject::Files);
-        }
-        else if (fileName == project->includesFileName() ||
-                 fileName == project->configFileName()) {
+        } else if (fileName == project->includesFileName()
+                   || fileName == project->configFileName()) {
             project->refresh(GenericProject::Configuration);
         }
     }
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.h b/src/plugins/genericprojectmanager/genericprojectmanager.h
index dcd58fccd81429b03c72fd3c966b91dd4ce5d007..729aa6b49a10a1ea899cc51b0a666989cb912d94 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.h
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.h
@@ -48,7 +48,6 @@ class Manager : public ProjectExplorer::IProjectManager
 
 public:
     Manager();
-    virtual ~Manager();
 
     virtual Core::Context projectContext() const;
     virtual Core::Context projectLanguage() const;
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
index 56504d56ec6bf87b304e193d80e40725b50b0d78..bbc1f3b8cc6b97cecd672d7a635de6fa4ba31111 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
@@ -50,14 +50,15 @@ GenericProjectNode::GenericProjectNode(GenericProject *project, Core::IFile *pro
     setDisplayName(QFileInfo(projectFile->fileName()).completeBaseName());
 }
 
-GenericProjectNode::~GenericProjectNode()
-{ }
-
 Core::IFile *GenericProjectNode::projectFile() const
-{ return m_projectFile; }
+{
+    return m_projectFile;
+}
 
 QString GenericProjectNode::projectFilePath() const
-{ return m_projectFile->fileName(); }
+{
+    return m_projectFile->fileName();
+}
 
 void GenericProjectNode::refresh()
 {
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.h b/src/plugins/genericprojectmanager/genericprojectnodes.h
index 3f9e74a6feba7c8e5b6c88d9fc79a929ce9d4156..3cbc8a5729eb4e77948b5b08a2cd7a3c21f9b36f 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.h
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.h
@@ -52,7 +52,6 @@ class GenericProjectNode : public ProjectExplorer::ProjectNode
 {
 public:
     GenericProjectNode(GenericProject *project, Core::IFile *projectFile);
-    virtual ~GenericProjectNode();
 
     Core::IFile *projectFile() const;
     QString projectFilePath() const;
diff --git a/src/plugins/genericprojectmanager/generictarget.cpp b/src/plugins/genericprojectmanager/generictarget.cpp
index bc0f60204812d7fb13a636ac55dba22a91947639..1d5d89fd1aad19903c12ac38164a65ae94827cd2 100644
--- a/src/plugins/genericprojectmanager/generictarget.cpp
+++ b/src/plugins/genericprojectmanager/generictarget.cpp
@@ -65,10 +65,6 @@ GenericTarget::GenericTarget(GenericProject *parent) :
     setIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
 }
 
-GenericTarget::~GenericTarget()
-{
-}
-
 ProjectExplorer::BuildConfigWidget *GenericTarget::createConfigWidget()
 {
     return new GenericBuildSettingsWidget(this);
@@ -106,10 +102,6 @@ GenericTargetFactory::GenericTargetFactory(QObject *parent) :
 {
 }
 
-GenericTargetFactory::~GenericTargetFactory()
-{
-}
-
 bool GenericTargetFactory::supportsTargetId(const QString &id) const
 {
     return id == QLatin1String(GENERIC_DESKTOP_TARGET_ID);
diff --git a/src/plugins/genericprojectmanager/generictarget.h b/src/plugins/genericprojectmanager/generictarget.h
index a1423926c90b8d36c7b9e5e838b0698137fd66fd..93dca5873497c2c8127f8fa001635198e03303fd 100644
--- a/src/plugins/genericprojectmanager/generictarget.h
+++ b/src/plugins/genericprojectmanager/generictarget.h
@@ -63,7 +63,6 @@ class GenericTarget : public ProjectExplorer::Target
 
 public:
     explicit GenericTarget(GenericProject *parent);
-    ~GenericTarget();
 
     ProjectExplorer::BuildConfigWidget *createConfigWidget();
 
@@ -85,7 +84,6 @@ class GenericTargetFactory : public ProjectExplorer::ITargetFactory
 
 public:
     explicit GenericTargetFactory(QObject *parent = 0);
-    ~GenericTargetFactory();
 
     bool supportsTargetId(const QString &id) const;