diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp
index 6516c9af282..61bf810ba06 100644
--- a/src/libs/extensionsystem/pluginview.cpp
+++ b/src/libs/extensionsystem/pluginview.cpp
@@ -67,8 +67,8 @@
 
 using namespace ExtensionSystem;
 
-Q_DECLARE_METATYPE(ExtensionSystem::PluginSpec*);
-Q_DECLARE_METATYPE(ExtensionSystem::PluginCollection*);
+Q_DECLARE_METATYPE(ExtensionSystem::PluginSpec*)
+Q_DECLARE_METATYPE(ExtensionSystem::PluginCollection*)
 
 /*!
     \fn PluginView::PluginView(PluginManager *manager, QWidget *parent)
diff --git a/src/libs/qmleditorwidgets/colorbox.h b/src/libs/qmleditorwidgets/colorbox.h
index d129ae4629f..8c27f95cce7 100644
--- a/src/libs/qmleditorwidgets/colorbox.h
+++ b/src/libs/qmleditorwidgets/colorbox.h
@@ -93,6 +93,6 @@ private:
 
 } //QmlEditorWidgets
 
-QML_DECLARE_TYPE(QmlEditorWidgets::ColorBox);
+QML_DECLARE_TYPE(QmlEditorWidgets::ColorBox)
 
 #endif //COLORBOX_H
diff --git a/src/libs/qmleditorwidgets/colorbutton.h b/src/libs/qmleditorwidgets/colorbutton.h
index 4637e7e1267..bf340cb822c 100644
--- a/src/libs/qmleditorwidgets/colorbutton.h
+++ b/src/libs/qmleditorwidgets/colorbutton.h
@@ -69,6 +69,6 @@ private:
 
 } //QmlEditorWidgets
 
-QML_DECLARE_TYPE(QmlEditorWidgets::ColorButton);
+QML_DECLARE_TYPE(QmlEditorWidgets::ColorButton)
 
 #endif //COLORBUTTON_H
diff --git a/src/libs/qmleditorwidgets/huecontrol.h b/src/libs/qmleditorwidgets/huecontrol.h
index 49af3d88f40..c4684ded79f 100644
--- a/src/libs/qmleditorwidgets/huecontrol.h
+++ b/src/libs/qmleditorwidgets/huecontrol.h
@@ -70,6 +70,6 @@ private:
 
 } //QmlEditorWidgets
 
-QML_DECLARE_TYPE(QmlEditorWidgets::HueControl);
+QML_DECLARE_TYPE(QmlEditorWidgets::HueControl)
 
 #endif //HUECONTROL_H
diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
index 541ac4768c7..719028a5255 100644
--- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp
@@ -48,7 +48,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtDebug>
 
-Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*);
+Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
 
 using namespace Core;
 using namespace Core::Internal;
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
index 0273618c345..c3124a0b067 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
@@ -40,7 +40,7 @@
 #include <QtGui/QHeaderView>
 #include <QtGui/QCheckBox>
 
-Q_DECLARE_METATYPE(Core::IFile*);
+Q_DECLARE_METATYPE(Core::IFile*)
 
 using namespace Core;
 using namespace Core::Internal;
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index abc491adce7..31185c26474 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -50,7 +50,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtDebug>
 
-Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*);
+Q_DECLARE_METATYPE(Core::Internal::ShortcutItem*)
 
 using namespace Core;
 using namespace Core::Internal;
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index d6e268bf548..b9c64cf3aa7 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -2609,9 +2609,9 @@ void GdbEngine::handleShowModuleSymbols(const GdbResponse &response)
         Symbols rc;
         QFile file(fileName);
         file.open(QIODevice::ReadOnly);
-        // Object file /opt/dev/qt/lib/libQtNetworkMyns.so.4: 
+        // Object file /opt/dev/qt/lib/libQtNetworkMyns.so.4:
         // [ 0] A 0x16bd64 _DYNAMIC  moc_qudpsocket.cpp
-        // [12] S 0xe94680 _ZN4myns5QFileC1Ev section .plt  myns::QFile::QFile()  
+        // [12] S 0xe94680 _ZN4myns5QFileC1Ev section .plt  myns::QFile::QFile()
         foreach (const QByteArray &line, file.readAll().split('\n')) {
             if (line.isEmpty())
                 continue;
@@ -4425,6 +4425,6 @@ void addGdbOptionPages(QList<Core::IOptionsPage *> *opts)
 } // namespace Internal
 } // namespace Debugger
 
-Q_DECLARE_METATYPE(Debugger::Internal::MemoryAgentCookie);
-Q_DECLARE_METATYPE(Debugger::Internal::DisassemblerAgentCookie);
-Q_DECLARE_METATYPE(Debugger::Internal::GdbMi);
+Q_DECLARE_METATYPE(Debugger::Internal::MemoryAgentCookie)
+Q_DECLARE_METATYPE(Debugger::Internal::DisassemblerAgentCookie)
+Q_DECLARE_METATYPE(Debugger::Internal::GdbMi)
diff --git a/src/plugins/debugger/gdb/gdbmi.h b/src/plugins/debugger/gdb/gdbmi.h
index 7803d71ce54..87190827205 100644
--- a/src/plugins/debugger/gdb/gdbmi.h
+++ b/src/plugins/debugger/gdb/gdbmi.h
@@ -174,6 +174,6 @@ void extractGdbVersion(const QString &msg,
 } // namespace Internal
 } // namespace Debugger
 
-//Q_DECLARE_METATYPE(GdbDebugger::Internal::GdbMi);
+//Q_DECLARE_METATYPE(GdbDebugger::Internal::GdbMi)
 
 #endif // DEBUGGER_GDBMI_H
diff --git a/src/plugins/debugger/gdb/symbian.h b/src/plugins/debugger/gdb/symbian.h
index a93262b9151..791653f40ae 100644
--- a/src/plugins/debugger/gdb/symbian.h
+++ b/src/plugins/debugger/gdb/symbian.h
@@ -219,6 +219,6 @@ QPair<quint64, unsigned> parseGdbSetBreakpointRequest(const QByteArray &cmd);
 } // namespace Internal
 } // namespace Debugger
 
-Q_DECLARE_METATYPE(Debugger::Internal::MemoryRange);
+Q_DECLARE_METATYPE(Debugger::Internal::MemoryRange)
 
 #endif // SYMBIANUTILS_H
diff --git a/src/plugins/debugger/stackframe.h b/src/plugins/debugger/stackframe.h
index 22dfcbdb995..c90768c3b91 100644
--- a/src/plugins/debugger/stackframe.h
+++ b/src/plugins/debugger/stackframe.h
@@ -71,6 +71,6 @@ typedef QList<StackFrame> StackFrames;
 } // namespace Internal
 } // namespace Debugger
 
-Q_DECLARE_METATYPE(Debugger::Internal::StackFrame);
+Q_DECLARE_METATYPE(Debugger::Internal::StackFrame)
 
 #endif // DEBUGGER_STACKFRAME_H
diff --git a/src/plugins/debugger/tcf/json.h b/src/plugins/debugger/tcf/json.h
index 18c42a57b6f..711a087b1b8 100644
--- a/src/plugins/debugger/tcf/json.h
+++ b/src/plugins/debugger/tcf/json.h
@@ -95,6 +95,6 @@ private:
 } // namespace Internal
 } // namespace Debugger
 
-//Q_DECLARE_METATYPE(GdbDebugger::Internal::JsonValue);
+//Q_DECLARE_METATYPE(GdbDebugger::Internal::JsonValue)
 
 #endif // DEBUGGER_JSON_H
diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h
index 43169094956..8ef3048ca25 100644
--- a/src/plugins/debugger/watchdata.h
+++ b/src/plugins/debugger/watchdata.h
@@ -144,7 +144,7 @@ public:
 } // namespace Internal
 } // namespace Debugger
 
-Q_DECLARE_METATYPE(Debugger::Internal::WatchData);
+Q_DECLARE_METATYPE(Debugger::Internal::WatchData)
 
 
 #endif // DEBUGGER_WATCHDATA_H
diff --git a/src/plugins/fakevim/fakevimhandler.h b/src/plugins/fakevim/fakevimhandler.h
index 48bc9c4394c..2797d8c49b3 100644
--- a/src/plugins/fakevim/fakevimhandler.h
+++ b/src/plugins/fakevim/fakevimhandler.h
@@ -137,7 +137,7 @@ private:
 } // namespace Internal
 } // namespace FakeVim
 
-Q_DECLARE_METATYPE(FakeVim::Internal::ExCommand);
+Q_DECLARE_METATYPE(FakeVim::Internal::ExCommand)
 
 
 #endif // FAKEVIM_HANDLER_H
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index e8121cf21f6..2acb7226dfd 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -283,7 +283,7 @@ struct CommandItem
     QTreeWidgetItem *m_item;
 };
 
-Q_DECLARE_METATYPE(CommandItem *);
+Q_DECLARE_METATYPE(CommandItem *)
 
 namespace FakeVim {
 namespace Internal {
@@ -753,8 +753,8 @@ static int moveRightWeight(const QRect &cursor, const QRect &other)
     if (dx < 0)
         return -1;
     int w = 10000 * dx;
-    int dy1 = cursor.top() - other.bottom(); 
-    int dy2 = cursor.bottom() - other.top(); 
+    int dy1 = cursor.top() - other.bottom();
+    int dy2 = cursor.bottom() - other.top();
     w += dy1 * (dy1 > 0);
     w += dy2 * (dy2 > 0);
     qDebug() << "      DX: " << dx << dy1 << dy2 << w;
@@ -767,8 +767,8 @@ static int moveLeftWeight(const QRect &cursor, const QRect &other)
     if (dx < 0)
         return -1;
     int w = 10000 * dx;
-    int dy1 = cursor.top() - other.bottom(); 
-    int dy2 = cursor.bottom() - other.top(); 
+    int dy1 = cursor.top() - other.bottom();
+    int dy2 = cursor.bottom() - other.top();
     w += dy1 * (dy1 > 0);
     w += dy2 * (dy2 > 0);
     return w;
@@ -780,8 +780,8 @@ static int moveUpWeight(const QRect &cursor, const QRect &other)
     if (dy < 0)
         return -1;
     int w = 10000 * dy;
-    int dx1 = cursor.left() - other.right(); 
-    int dx2 = cursor.right() - other.left(); 
+    int dx1 = cursor.left() - other.right();
+    int dx2 = cursor.right() - other.left();
     w += dx1 * (dx1 > 0);
     w += dx2 * (dx2 > 0);
     return w;
@@ -793,8 +793,8 @@ static int moveDownWeight(const QRect &cursor, const QRect &other)
     if (dy < 0)
         return -1;
     int w = 10000 * dy;
-    int dx1 = cursor.left() - other.right(); 
-    int dx2 = cursor.right() - other.left(); 
+    int dx1 = cursor.left() - other.right();
+    int dx2 = cursor.right() - other.left();
     w += dx1 * (dx1 > 0);
     w += dx2 * (dx2 > 0);
     return w;
@@ -863,7 +863,7 @@ void FakeVimPluginPrivate::moveSomewhere(DistFunction f)
         QRect editorRect(w->mapToGlobal(w->geometry().topLeft()),
                 w->mapToGlobal(w->geometry().bottomRight()));
         //qDebug() << "   EDITOR: " << editorRect << editor;
-  
+
         int value = f(cursorRect, editorRect);
         if (value != -1 && value < bestValue) {
             bestValue = value;
diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp
index ab730dee28c..9ce057974c5 100644
--- a/src/plugins/help/helpindexfilter.cpp
+++ b/src/plugins/help/helpindexfilter.cpp
@@ -42,7 +42,7 @@ using namespace Locator;
 using namespace Help;
 using namespace Help::Internal;
 
-Q_DECLARE_METATYPE(ILocatorFilter*);
+Q_DECLARE_METATYPE(ILocatorFilter*)
 
 HelpIndexFilter::HelpIndexFilter()
 {
diff --git a/src/plugins/locator/locatorfiltersfilter.cpp b/src/plugins/locator/locatorfiltersfilter.cpp
index a0fe20c4643..480f339d17e 100644
--- a/src/plugins/locator/locatorfiltersfilter.cpp
+++ b/src/plugins/locator/locatorfiltersfilter.cpp
@@ -36,7 +36,7 @@
 using namespace Locator;
 using namespace Locator::Internal;
 
-Q_DECLARE_METATYPE(ILocatorFilter*);
+Q_DECLARE_METATYPE(ILocatorFilter*)
 
 LocatorFiltersFilter::LocatorFiltersFilter(LocatorPlugin *plugin,
                                                LocatorWidget *locatorWidget):
diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp
index 7ead829b469..49d9e30def0 100644
--- a/src/plugins/locator/locatorwidget.cpp
+++ b/src/plugins/locator/locatorwidget.cpp
@@ -65,8 +65,8 @@
 #include <QtGui/QScrollBar>
 #include <QtGui/QTreeView>
 
-Q_DECLARE_METATYPE(Locator::ILocatorFilter*);
-Q_DECLARE_METATYPE(Locator::FilterEntry);
+Q_DECLARE_METATYPE(Locator::ILocatorFilter*)
+Q_DECLARE_METATYPE(Locator::FilterEntry)
 
 namespace Locator {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index df1c26ca01d..67379198f78 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -138,7 +138,7 @@ signals:
 
 } // namespace ProjectExplorer
 
-Q_DECLARE_METATYPE(ProjectExplorer::BuildConfiguration *);
+Q_DECLARE_METATYPE(ProjectExplorer::BuildConfiguration *)
 
 // Default directory to run custom (build) commands in.
 #define DEFAULT_WORKING_DIR "%{buildDir}"
diff --git a/src/plugins/projectexplorer/buildsteplist.h b/src/plugins/projectexplorer/buildsteplist.h
index 394c1ebea37..de14e81a719 100644
--- a/src/plugins/projectexplorer/buildsteplist.h
+++ b/src/plugins/projectexplorer/buildsteplist.h
@@ -83,6 +83,6 @@ private:
 
 } // namespace ProjectExplorer
 
-Q_DECLARE_METATYPE(ProjectExplorer::BuildStepList *);
+Q_DECLARE_METATYPE(ProjectExplorer::BuildStepList *)
 
 #endif // PROJECTEXPLORER_BUILDSTEPLIST_H
diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h
index f03f4b24f46..8a91dce03f8 100644
--- a/src/plugins/projectexplorer/deployconfiguration.h
+++ b/src/plugins/projectexplorer/deployconfiguration.h
@@ -114,6 +114,6 @@ public:
 
 } // namespace ProjectExplorer
 
-Q_DECLARE_METATYPE(ProjectExplorer::DeployConfiguration *);
+Q_DECLARE_METATYPE(ProjectExplorer::DeployConfiguration *)
 
 #endif // PROJECTEXPLORER_DEPLOYCONFIGURATION_H
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index dac07ca8716..41113dca7cf 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -117,8 +117,8 @@
 #include <QtGui/QMainWindow>
 #include <QtGui/QWizard>
 
-Q_DECLARE_METATYPE(Core::IEditorFactory*);
-Q_DECLARE_METATYPE(Core::IExternalEditor*);
+Q_DECLARE_METATYPE(Core::IEditorFactory*)
+Q_DECLARE_METATYPE(Core::IExternalEditor*)
 
 namespace {
 bool debug = false;
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index c2bcd078f5e..86e3d832912 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -60,7 +60,7 @@ struct FactoryAndId
 } // namespace Internal
 } // namespace ProjectExplorer
 
-Q_DECLARE_METATYPE(ProjectExplorer::Internal::FactoryAndId);
+Q_DECLARE_METATYPE(ProjectExplorer::Internal::FactoryAndId)
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 2f84e0ada4b..aba83af7dad 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -238,6 +238,6 @@ private:
 
 }
 
-Q_DECLARE_METATYPE(ProjectExplorer::ToolChainType);
+Q_DECLARE_METATYPE(ProjectExplorer::ToolChainType)
 
 #endif // TOOLCHAIN_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h b/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h
index 1438f85c9fb..46e28e2011a 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/basiclayouts.h
@@ -168,9 +168,9 @@ public:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QBoxLayoutObject);
-QML_DECLARE_TYPE(QHBoxLayoutObject);
-QML_DECLARE_TYPE(QVBoxLayoutObject);
+QML_DECLARE_TYPE(QBoxLayoutObject)
+QML_DECLARE_TYPE(QHBoxLayoutObject)
+QML_DECLARE_TYPE(QVBoxLayoutObject)
 
 
 class BasicLayouts {
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index cfb099bc77a..4252cfd2a6e 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -648,7 +648,7 @@ public:
 
 protected:
     void paintEvent(QPaintEvent *event)
-    {        
+    {
         QFontMetrics fm(font());
         if (fm.width(text()) > (contentsRect().width() - 6) && text().length() > 4) {
             QPainter p(this);
@@ -1390,11 +1390,11 @@ public:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTabObject);
-QML_DECLARE_TYPE(MyGroupBox);
-QML_DECLARE_TYPE(WidgetLoader);
-QML_DECLARE_TYPE(WidgetFrame);
-QML_DECLARE_TYPE(AnimatedToolButton);
+QML_DECLARE_TYPE(QTabObject)
+QML_DECLARE_TYPE(MyGroupBox)
+QML_DECLARE_TYPE(WidgetLoader)
+QML_DECLARE_TYPE(WidgetFrame)
+QML_DECLARE_TYPE(AnimatedToolButton)
 
 void BasicWidgets::registerDeclarativeTypes()
 {
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h
index 0e4583dfd81..87986816fd8 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.h
@@ -57,42 +57,42 @@
 #include "filewidget.h"
 #include "layoutwidget.h"
 
-QML_DECLARE_TYPE(QWidget);
+QML_DECLARE_TYPE(QWidget)
 
 //display
-QML_DECLARE_TYPE(QLabel);
-QML_DECLARE_TYPE(QProgressBar);
-QML_DECLARE_TYPE(QLCDNumber);
+QML_DECLARE_TYPE(QLabel)
+QML_DECLARE_TYPE(QProgressBar)
+QML_DECLARE_TYPE(QLCDNumber)
 
 //input
-QML_DECLARE_TYPE(QLineEdit);
-QML_DECLARE_TYPE(QTextEdit);
-QML_DECLARE_TYPE(QPlainTextEdit);
-QML_DECLARE_TYPE(QSpinBox);
-QML_DECLARE_TYPE(QDoubleSpinBox);
-QML_DECLARE_TYPE(QSlider);
-QML_DECLARE_TYPE(QDateTimeEdit);
-QML_DECLARE_TYPE(QDateEdit);
-QML_DECLARE_TYPE(QTimeEdit);
-QML_DECLARE_TYPE(QFontComboBox);
-QML_DECLARE_TYPE(QDial);
-QML_DECLARE_TYPE(QScrollBar);
-QML_DECLARE_TYPE(QCalendarWidget);
-QML_DECLARE_TYPE(QComboBox);
+QML_DECLARE_TYPE(QLineEdit)
+QML_DECLARE_TYPE(QTextEdit)
+QML_DECLARE_TYPE(QPlainTextEdit)
+QML_DECLARE_TYPE(QSpinBox)
+QML_DECLARE_TYPE(QDoubleSpinBox)
+QML_DECLARE_TYPE(QSlider)
+QML_DECLARE_TYPE(QDateTimeEdit)
+QML_DECLARE_TYPE(QDateEdit)
+QML_DECLARE_TYPE(QTimeEdit)
+QML_DECLARE_TYPE(QFontComboBox)
+QML_DECLARE_TYPE(QDial)
+QML_DECLARE_TYPE(QScrollBar)
+QML_DECLARE_TYPE(QCalendarWidget)
+QML_DECLARE_TYPE(QComboBox)
 
 //buttons
-QML_DECLARE_TYPE(QPushButton);
-QML_DECLARE_TYPE(QToolButton);
-QML_DECLARE_TYPE(QCheckBox);
-QML_DECLARE_TYPE(QRadioButton);
+QML_DECLARE_TYPE(QPushButton)
+QML_DECLARE_TYPE(QToolButton)
+QML_DECLARE_TYPE(QCheckBox)
+QML_DECLARE_TYPE(QRadioButton)
 
 //containers
-QML_DECLARE_TYPE(QGroupBox);
-QML_DECLARE_TYPE(QFrame);
-QML_DECLARE_TYPE(QScrollArea);
-QML_DECLARE_TYPE(QTabWidget);
-QML_DECLARE_TYPE(FileWidget);
-QML_DECLARE_TYPE(LayoutWidget);
+QML_DECLARE_TYPE(QGroupBox)
+QML_DECLARE_TYPE(QFrame)
+QML_DECLARE_TYPE(QScrollArea)
+QML_DECLARE_TYPE(QTabWidget)
+QML_DECLARE_TYPE(FileWidget)
+QML_DECLARE_TYPE(LayoutWidget)
 
 
 class Action : public QAction {
@@ -104,12 +104,12 @@ public:
 QML_DECLARE_TYPE(QMenu);
 QML_DECLARE_TYPE(Action);
 
-//QML_DECLARE_TYPE(QToolBox);
+//QML_DECLARE_TYPE(QToolBox)
 
 //itemviews
-//QML_DECLARE_TYPE(QListView);
-//QML_DECLARE_TYPE(QTreeView);
-//QML_DECLARE_TYPE(QTableView);
+//QML_DECLARE_TYPE(QListView)
+//QML_DECLARE_TYPE(QTreeView)
+//QML_DECLARE_TYPE(QTableView)
 
 //top-level windows?
 class BasicWidgets {
diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h
index 355cfc7faa1..ccf93602b76 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.h
@@ -94,6 +94,6 @@ private:
 
 };
 
-QML_DECLARE_TYPE(QmlDesigner::BehaviorWidget);
+QML_DECLARE_TYPE(QmlDesigner::BehaviorWidget)
 
 #endif// BEHAVIORDIALOG_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h b/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
index eff3ff23c36..197293deddc 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
@@ -67,7 +67,7 @@ public:
     bool noColor() const { return m_noColor; }
     void setNoColor(bool f) { m_noColor = f; update(); }
     bool showArrow() const { return m_showArrow; }
-    void setShowArrow(bool b) { m_showArrow = b; }      
+    void setShowArrow(bool b) { m_showArrow = b; }
 
 signals:
     void colorChanged();
@@ -213,7 +213,7 @@ private:
     void setup();
     void updateGradient();
     int currentColorIndex() const { return m_colorIndex; }
-    void setCurrentIndex(int i);    
+    void setCurrentIndex(int i);
 
     QColor m_activeColor;
     QmlItemNode m_itemNode;
@@ -311,8 +311,8 @@ public:
 
 } //QmlDesigner
 
-QML_DECLARE_TYPE(QmlDesigner::ColorButton);
-QML_DECLARE_TYPE(QmlDesigner::HueControl);
-QML_DECLARE_TYPE(QmlDesigner::ColorBox);
+QML_DECLARE_TYPE(QmlDesigner::ColorButton)
+QML_DECLARE_TYPE(QmlDesigner::HueControl)
+QML_DECLARE_TYPE(QmlDesigner::ColorBox)
 
 #endif //COLORWIDGET_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/fontwidget.h b/src/plugins/qmldesigner/components/propertyeditor/fontwidget.h
index 99d1cca5ad2..2db59092480 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/fontwidget.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/fontwidget.h
@@ -98,6 +98,6 @@ private: //variables
 
 } // namespace QmlDesigner
 
-QML_DECLARE_TYPE(QmlDesigner::FontWidget);
+QML_DECLARE_TYPE(QmlDesigner::FontWidget)
 
 #endif // FONTWIDGET_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
index 55ba8061e75..ff34461ca9b 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h
@@ -140,12 +140,12 @@ private: //variables
     bool m_isInModel;
     bool m_isBound;
     bool m_isValid; // if the property value belongs to a non-existing complexProperty it is invalid
-    PropertyEditorNodeWrapper *m_complexNode;    
+    PropertyEditorNodeWrapper *m_complexNode;
 };
 
-QML_DECLARE_TYPE(PropertyEditorValue);
-QML_DECLARE_TYPE(PropertyEditorNodeWrapper);
-QML_DECLARE_TYPE(QDeclarativePropertyMap);
+QML_DECLARE_TYPE(PropertyEditorValue)
+QML_DECLARE_TYPE(PropertyEditorNodeWrapper)
+QML_DECLARE_TYPE(QDeclarativePropertyMap)
 
 
 #endif // PROPERTYEDITORVALUE_H
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h b/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h
index ba86d1b5090..bc953783242 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/qlayoutobject.h
@@ -53,7 +53,7 @@ public:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QLayoutObject);
+QML_DECLARE_TYPE(QLayoutObject)
 
 QT_END_HEADER
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h b/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h
index 6a99239e84b..b2a97861c83 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/qproxylayoutitem.h
@@ -92,8 +92,8 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QProxyLayout);
-QML_DECLARE_TYPE(QProxyLayoutItem);
+QML_DECLARE_TYPE(QProxyLayout)
+QML_DECLARE_TYPE(QProxyLayoutItem)
 
 QT_END_HEADER
 
diff --git a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
index bdbd24fad75..271744dd4c2 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp
@@ -40,7 +40,7 @@
 #include <QDebug>
 #include <QApplication>
 
-QML_DECLARE_TYPE(QmlDesigner::ResetWidget);
+QML_DECLARE_TYPE(QmlDesigner::ResetWidget)
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/include/propertyabstractcontainer.h b/src/plugins/qmldesigner/designercore/include/propertyabstractcontainer.h
index 44b9a437e7e..7d5b1413681 100644
--- a/src/plugins/qmldesigner/designercore/include/propertyabstractcontainer.h
+++ b/src/plugins/qmldesigner/designercore/include/propertyabstractcontainer.h
@@ -36,5 +36,5 @@ private:
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::PropertyAbstractContainer);
+Q_DECLARE_METATYPE(QmlDesigner::PropertyAbstractContainer)
 #endif // PROPERTYABSTRACTCONTAINER_H
diff --git a/src/plugins/qmldesigner/designercore/include/propertybindingcontainer.h b/src/plugins/qmldesigner/designercore/include/propertybindingcontainer.h
index 6067ecda596..68d75bce9c5 100644
--- a/src/plugins/qmldesigner/designercore/include/propertybindingcontainer.h
+++ b/src/plugins/qmldesigner/designercore/include/propertybindingcontainer.h
@@ -34,5 +34,5 @@ QDataStream &operator>>(QDataStream &in, PropertyBindingContainer &container);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::PropertyBindingContainer);
+Q_DECLARE_METATYPE(QmlDesigner::PropertyBindingContainer)
 #endif // PROPERTYBINDINGCONTAINER_H
diff --git a/src/plugins/qmldesigner/designercore/include/propertyvaluecontainer.h b/src/plugins/qmldesigner/designercore/include/propertyvaluecontainer.h
index e5db91c7898..5948ec8241b 100644
--- a/src/plugins/qmldesigner/designercore/include/propertyvaluecontainer.h
+++ b/src/plugins/qmldesigner/designercore/include/propertyvaluecontainer.h
@@ -37,6 +37,6 @@ QDataStream &operator>>(QDataStream &in, PropertyValueContainer &container);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::PropertyValueContainer);
+Q_DECLARE_METATYPE(QmlDesigner::PropertyValueContainer)
 
 #endif // PROPERTYVALUECONTAINER_H
diff --git a/src/plugins/qmldesigner/designercore/instances/addimportcommand.h b/src/plugins/qmldesigner/designercore/instances/addimportcommand.h
index 1576a225973..748e40b47f6 100644
--- a/src/plugins/qmldesigner/designercore/instances/addimportcommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/addimportcommand.h
@@ -34,6 +34,6 @@ QDataStream &operator>>(QDataStream &in, AddImportCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::AddImportCommand);
+Q_DECLARE_METATYPE(QmlDesigner::AddImportCommand)
 
 #endif // ADDIMPORTCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/changebindingscommand.h b/src/plugins/qmldesigner/designercore/instances/changebindingscommand.h
index 60f680d105b..ab3f310d186 100644
--- a/src/plugins/qmldesigner/designercore/instances/changebindingscommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/changebindingscommand.h
@@ -27,6 +27,6 @@ QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::ChangeBindingsCommand);
+Q_DECLARE_METATYPE(QmlDesigner::ChangeBindingsCommand)
 
 #endif // CHANGEBINDINGSCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/changefileurlcommand.h b/src/plugins/qmldesigner/designercore/instances/changefileurlcommand.h
index dfc735cf093..3a31c5b89e6 100644
--- a/src/plugins/qmldesigner/designercore/instances/changefileurlcommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/changefileurlcommand.h
@@ -25,6 +25,6 @@ QDataStream &operator>>(QDataStream &in, ChangeFileUrlCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::ChangeFileUrlCommand);
+Q_DECLARE_METATYPE(QmlDesigner::ChangeFileUrlCommand)
 
 #endif // CHANGEFILEURLCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/changeidscommand.h b/src/plugins/qmldesigner/designercore/instances/changeidscommand.h
index 8ca80a4cbb6..a80e9802094 100644
--- a/src/plugins/qmldesigner/designercore/instances/changeidscommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/changeidscommand.h
@@ -27,6 +27,6 @@ QDataStream &operator>>(QDataStream &in, ChangeIdsCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::ChangeIdsCommand);
+Q_DECLARE_METATYPE(QmlDesigner::ChangeIdsCommand)
 
 #endif // CHANGEIDSCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/changestatecommand.h b/src/plugins/qmldesigner/designercore/instances/changestatecommand.h
index 14eb70e6199..66f1748228b 100644
--- a/src/plugins/qmldesigner/designercore/instances/changestatecommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/changestatecommand.h
@@ -27,6 +27,6 @@ QDataStream &operator>>(QDataStream &in, ChangeStateCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::ChangeStateCommand);
+Q_DECLARE_METATYPE(QmlDesigner::ChangeStateCommand)
 
 #endif // CHANGESTATECOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/changevaluescommand.h b/src/plugins/qmldesigner/designercore/instances/changevaluescommand.h
index b37ab285104..eb8932a710a 100644
--- a/src/plugins/qmldesigner/designercore/instances/changevaluescommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/changevaluescommand.h
@@ -27,6 +27,6 @@ QDataStream &operator>>(QDataStream &in, ChangeValuesCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::ChangeValuesCommand);
+Q_DECLARE_METATYPE(QmlDesigner::ChangeValuesCommand)
 
 #endif // CHANGEVALUESCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/childrenchangedcommand.h b/src/plugins/qmldesigner/designercore/instances/childrenchangedcommand.h
index e38f3df34a4..1b3c45706cc 100644
--- a/src/plugins/qmldesigner/designercore/instances/childrenchangedcommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/childrenchangedcommand.h
@@ -27,6 +27,6 @@ QDataStream &operator>>(QDataStream &in, ChildrenChangedCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::ChildrenChangedCommand);
+Q_DECLARE_METATYPE(QmlDesigner::ChildrenChangedCommand)
 
 #endif // CHILDRENCHANGEDCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/clearscenecommand.h b/src/plugins/qmldesigner/designercore/instances/clearscenecommand.h
index 24aa637adf2..2e593971f53 100644
--- a/src/plugins/qmldesigner/designercore/instances/clearscenecommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/clearscenecommand.h
@@ -16,6 +16,6 @@ QDataStream &operator>>(QDataStream &in, ClearSceneCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::ClearSceneCommand);
+Q_DECLARE_METATYPE(QmlDesigner::ClearSceneCommand)
 
 #endif // CLEARSCENECOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/completecomponentcommand.h b/src/plugins/qmldesigner/designercore/instances/completecomponentcommand.h
index 2bc5e0f8393..d085135fe2e 100644
--- a/src/plugins/qmldesigner/designercore/instances/completecomponentcommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/completecomponentcommand.h
@@ -25,6 +25,6 @@ QDataStream &operator>>(QDataStream &in, CompleteComponentCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::CompleteComponentCommand);
+Q_DECLARE_METATYPE(QmlDesigner::CompleteComponentCommand)
 
 #endif // COMPLETECOMPONENT_H
diff --git a/src/plugins/qmldesigner/designercore/instances/componentcompletedcommand.h b/src/plugins/qmldesigner/designercore/instances/componentcompletedcommand.h
index c39177777cf..e9d1b1cd001 100644
--- a/src/plugins/qmldesigner/designercore/instances/componentcompletedcommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/componentcompletedcommand.h
@@ -24,6 +24,6 @@ QDataStream &operator>>(QDataStream &in, ComponentCompletedCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::ComponentCompletedCommand);
+Q_DECLARE_METATYPE(QmlDesigner::ComponentCompletedCommand)
 
 #endif // COMPONENTCOMPLETEDCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/createinstancescommand.h b/src/plugins/qmldesigner/designercore/instances/createinstancescommand.h
index 655515ebe9d..87b137d0bfb 100644
--- a/src/plugins/qmldesigner/designercore/instances/createinstancescommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/createinstancescommand.h
@@ -27,6 +27,6 @@ QDataStream &operator>>(QDataStream &in, CreateInstancesCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::CreateInstancesCommand);
+Q_DECLARE_METATYPE(QmlDesigner::CreateInstancesCommand)
 
 #endif // CREATEINSTANCESCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/createscenecommand.h b/src/plugins/qmldesigner/designercore/instances/createscenecommand.h
index 70e5091c731..6e1ec4af667 100644
--- a/src/plugins/qmldesigner/designercore/instances/createscenecommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/createscenecommand.h
@@ -18,6 +18,6 @@ QDataStream &operator>>(QDataStream &in, CreateSceneCommand &command);
 
 }
 
-Q_DECLARE_METATYPE(QmlDesigner::CreateSceneCommand);
+Q_DECLARE_METATYPE(QmlDesigner::CreateSceneCommand)
 
 #endif // CREATESCENECOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/idcontainer.h b/src/plugins/qmldesigner/designercore/instances/idcontainer.h
index ae3a0fe5836..603cb063848 100644
--- a/src/plugins/qmldesigner/designercore/instances/idcontainer.h
+++ b/src/plugins/qmldesigner/designercore/instances/idcontainer.h
@@ -29,6 +29,6 @@ QDataStream &operator>>(QDataStream &in, IdContainer &container);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::IdContainer);
+Q_DECLARE_METATYPE(QmlDesigner::IdContainer)
 
 #endif // IDCONTAINER_H
diff --git a/src/plugins/qmldesigner/designercore/instances/imagecontainer.h b/src/plugins/qmldesigner/designercore/instances/imagecontainer.h
index c27606ceb2c..a31029577c4 100644
--- a/src/plugins/qmldesigner/designercore/instances/imagecontainer.h
+++ b/src/plugins/qmldesigner/designercore/instances/imagecontainer.h
@@ -26,6 +26,6 @@ QDataStream &operator>>(QDataStream &in, ImageContainer &container);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::ImageContainer);
+Q_DECLARE_METATYPE(QmlDesigner::ImageContainer)
 
 #endif // IMAGECONTAINER_H
diff --git a/src/plugins/qmldesigner/designercore/instances/informationchangedcommand.h b/src/plugins/qmldesigner/designercore/instances/informationchangedcommand.h
index 91a01ae1c29..94ba7e1f22c 100644
--- a/src/plugins/qmldesigner/designercore/instances/informationchangedcommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/informationchangedcommand.h
@@ -27,6 +27,6 @@ QDataStream &operator>>(QDataStream &in, InformationChangedCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::InformationChangedCommand);
+Q_DECLARE_METATYPE(QmlDesigner::InformationChangedCommand)
 
 #endif // INFORMATIONCHANGEDCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/informationcontainer.h b/src/plugins/qmldesigner/designercore/instances/informationcontainer.h
index f69c3a19d29..11a967f8b36 100644
--- a/src/plugins/qmldesigner/designercore/instances/informationcontainer.h
+++ b/src/plugins/qmldesigner/designercore/instances/informationcontainer.h
@@ -42,6 +42,6 @@ QDataStream &operator>>(QDataStream &in, InformationContainer &container);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::InformationContainer);
+Q_DECLARE_METATYPE(QmlDesigner::InformationContainer)
 
 #endif // INFORMATIONCONTAINER_H
diff --git a/src/plugins/qmldesigner/designercore/instances/instancecontainer.h b/src/plugins/qmldesigner/designercore/instances/instancecontainer.h
index e153b561885..3944cf72833 100644
--- a/src/plugins/qmldesigner/designercore/instances/instancecontainer.h
+++ b/src/plugins/qmldesigner/designercore/instances/instancecontainer.h
@@ -35,5 +35,5 @@ private:
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::InstanceContainer);
+Q_DECLARE_METATYPE(QmlDesigner::InstanceContainer)
 #endif // INSTANCECONTAINER_H
diff --git a/src/plugins/qmldesigner/designercore/instances/pixmapchangedcommand.h b/src/plugins/qmldesigner/designercore/instances/pixmapchangedcommand.h
index c0ca5f4bbeb..5140de68321 100644
--- a/src/plugins/qmldesigner/designercore/instances/pixmapchangedcommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/pixmapchangedcommand.h
@@ -24,6 +24,6 @@ QDataStream &operator>>(QDataStream &in, PixmapChangedCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::PixmapChangedCommand);
+Q_DECLARE_METATYPE(QmlDesigner::PixmapChangedCommand)
 
 #endif // PIXMAPCHANGEDCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/removeinstancescommand.h b/src/plugins/qmldesigner/designercore/instances/removeinstancescommand.h
index ee7db6b285c..4bcb9afffb2 100644
--- a/src/plugins/qmldesigner/designercore/instances/removeinstancescommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/removeinstancescommand.h
@@ -27,6 +27,6 @@ QDataStream &operator>>(QDataStream &in, RemoveInstancesCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::RemoveInstancesCommand);
+Q_DECLARE_METATYPE(QmlDesigner::RemoveInstancesCommand)
 
 #endif // REMOVEINSTANCESCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/removepropertiescommand.h b/src/plugins/qmldesigner/designercore/instances/removepropertiescommand.h
index 122fb38f594..b2997efe6a1 100644
--- a/src/plugins/qmldesigner/designercore/instances/removepropertiescommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/removepropertiescommand.h
@@ -26,6 +26,6 @@ QDataStream &operator>>(QDataStream &in, RemovePropertiesCommand &command);
 
 }
 
-Q_DECLARE_METATYPE(QmlDesigner::RemovePropertiesCommand);
+Q_DECLARE_METATYPE(QmlDesigner::RemovePropertiesCommand)
 
 #endif // REMOVEPROPERTIESCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/reparentinstancescommand.h b/src/plugins/qmldesigner/designercore/instances/reparentinstancescommand.h
index bae137b5cdd..338ad660adc 100644
--- a/src/plugins/qmldesigner/designercore/instances/reparentinstancescommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/reparentinstancescommand.h
@@ -27,6 +27,6 @@ QDataStream &operator>>(QDataStream &in, ReparentInstancesCommand &command);
 
 } //
 
-Q_DECLARE_METATYPE(QmlDesigner::ReparentInstancesCommand);
+Q_DECLARE_METATYPE(QmlDesigner::ReparentInstancesCommand)
 
 #endif // REPARENTINSTANCESCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/servernodeinstance.h b/src/plugins/qmldesigner/designercore/instances/servernodeinstance.h
index ab82af8ef4f..e7c1476f1ac 100644
--- a/src/plugins/qmldesigner/designercore/instances/servernodeinstance.h
+++ b/src/plugins/qmldesigner/designercore/instances/servernodeinstance.h
@@ -188,6 +188,6 @@ CORESHARED_EXPORT bool operator==(const ServerNodeInstance &first, const ServerN
 CORESHARED_EXPORT QDebug operator<<(QDebug debug, const ServerNodeInstance &instance);
 }
 
-Q_DECLARE_METATYPE(QmlDesigner::ServerNodeInstance);
+Q_DECLARE_METATYPE(QmlDesigner::ServerNodeInstance)
 
 #endif // SERVERNODEINSTANCE_H
diff --git a/src/plugins/qmldesigner/designercore/instances/statepreviewimagechangedcommand.h b/src/plugins/qmldesigner/designercore/instances/statepreviewimagechangedcommand.h
index 6b60751067e..a6383d2882e 100644
--- a/src/plugins/qmldesigner/designercore/instances/statepreviewimagechangedcommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/statepreviewimagechangedcommand.h
@@ -25,6 +25,6 @@ QDataStream &operator>>(QDataStream &in, StatePreviewImageChangedCommand &comman
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::StatePreviewImageChangedCommand);
+Q_DECLARE_METATYPE(QmlDesigner::StatePreviewImageChangedCommand)
 
 #endif // STATEPREVIEWIMAGECHANGEDCOMMAND_H
diff --git a/src/plugins/qmldesigner/designercore/instances/valueschangedcommand.h b/src/plugins/qmldesigner/designercore/instances/valueschangedcommand.h
index 5730726101a..f41f650ff6c 100644
--- a/src/plugins/qmldesigner/designercore/instances/valueschangedcommand.h
+++ b/src/plugins/qmldesigner/designercore/instances/valueschangedcommand.h
@@ -27,7 +27,7 @@ QDataStream &operator>>(QDataStream &in, ValuesChangedCommand &command);
 
 } // namespace QmlDesigner
 
-Q_DECLARE_METATYPE(QmlDesigner::ValuesChangedCommand);
+Q_DECLARE_METATYPE(QmlDesigner::ValuesChangedCommand)
 
 
 #endif // VALUESCHANGEDCOMMAND_H
diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
index 4f097857f24..2dab4c42c83 100644
--- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp
+++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
@@ -37,7 +37,7 @@
 
 using namespace QmlJSTools::Internal;
 
-Q_DECLARE_METATYPE(LocatorData::Entry);
+Q_DECLARE_METATYPE(LocatorData::Entry)
 
 FunctionFilter::FunctionFilter(LocatorData *data, QObject *parent)
     : Locator::ILocatorFilter(parent)
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
index ff79f9aa781..63a6bc0d771 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
+++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
@@ -60,8 +60,8 @@ protected:
 
 } // namespace QmlProjectManager
 
-QML_DECLARE_TYPE(QmlProjectManager::QmlProjectItem);
-QML_DECLARE_TYPE(QmlProjectManager::QmlProjectContentItem);
-Q_DECLARE_METATYPE(QList<QmlProjectManager::QmlProjectContentItem *>);
+QML_DECLARE_TYPE(QmlProjectManager::QmlProjectItem)
+QML_DECLARE_TYPE(QmlProjectManager::QmlProjectContentItem)
+Q_DECLARE_METATYPE(QList<QmlProjectManager::QmlProjectContentItem *>)
 
 #endif // QMLPROJECTITEM_H
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index dcb590e6318..559a143b3cb 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -607,6 +607,6 @@ private:
 
 } // namespace TextEditor
 
-Q_DECLARE_METATYPE(TextEditor::BaseTextEditor::Link);
+Q_DECLARE_METATYPE(TextEditor::BaseTextEditor::Link)
 
 #endif // BASETEXTEDITOR_H