Cleanups in units

src/declarativeimports/core/units.cpp

@@ -131,7 +131,6 @@ void Units::updateDevicePixelRatio()
 
 int Units::gridUnit() const
 {
-    const int gridUnit = QFontMetrics(QApplication::font()).boundingRect("M").width();
     return m_gridUnit;
 }
 
@@ -185,5 +184,3 @@ bool Units::eventFilter(QObject *watched, QEvent *event)
     return QObject::eventFilter(watched, event);
 }
 
-#include "units.moc"
-

src/declarativeimports/core/units.h

@@ -36,7 +36,7 @@ class Units : public QObject
      * The fundamental unit of space that should be used for sizes, expressed in pixels.
      * Given the screen has an accurate DPI settings, it corresponds to a millimeter
      */
-    Q_PROPERTY(int gridUnit READ gridUnit NOTIFY gridUnitChanged())
+    Q_PROPERTY(int gridUnit READ gridUnit NOTIFY gridUnitChanged)
 
     /**
      * units.iconSizes provides access to platform-dependent icon sizing