diff --git a/examples/iotdashboard/Box.cpp b/examples/iotdashboard/Box.cpp
index d1a254a0..b77d7240 100644
--- a/examples/iotdashboard/Box.cpp
+++ b/examples/iotdashboard/Box.cpp
@@ -13,9 +13,6 @@ QSK_SUBCONTROL( Box, Panel )
 Box::Box( const QString& title, QQuickItem* parent )
     : QskLinearBox( Qt::Vertical, parent )
 {
-    setAutoAddChildren( true );
-    setAutoLayoutChildren( true );
-
     setPanel( true );
     setSubcontrolProxy( QskBox::Panel, Box::Panel );
 
diff --git a/examples/iotdashboard/BoxWithButtons.cpp b/examples/iotdashboard/BoxWithButtons.cpp
index 153dd45d..7ad4ccce 100644
--- a/examples/iotdashboard/BoxWithButtons.cpp
+++ b/examples/iotdashboard/BoxWithButtons.cpp
@@ -18,7 +18,7 @@ QSK_SUBCONTROL( BoxWithButtons, Panel )
 namespace
 {
     class UpAndDownBox : public QskLinearBox
-    {   
+    {
       public:
         UpAndDownBox( QQuickItem* parent )
             : QskLinearBox( Qt::Vertical, parent )
diff --git a/examples/iotdashboard/CircularProgressBarSkinlet.cpp b/examples/iotdashboard/CircularProgressBarSkinlet.cpp
index 37e040a1..311a2ac8 100644
--- a/examples/iotdashboard/CircularProgressBarSkinlet.cpp
+++ b/examples/iotdashboard/CircularProgressBarSkinlet.cpp
@@ -11,14 +11,11 @@
 #include <QEasingCurve>
 #include <QPainter>
 
-namespace {
+namespace
+{
     class ArcNode : public QskPaintedNode
     {
-    public:
-        ArcNode() : QskPaintedNode()
-        {
-        }
-
+      public:
         void setGradient( const QskGradient& gradient )
         {
             m_gradient = gradient;
@@ -59,7 +56,7 @@ namespace {
             m_position = position;
         }
 
-        virtual void paint( QPainter* painter, const QSizeF& size ) override
+        void paint( QPainter* painter, const QSizeF& size ) override
         {
             int startAngle;
             int spanAngle;
@@ -81,7 +78,8 @@ namespace {
 
             painter->setRenderHint( QPainter::Antialiasing, true );
 
-            const QRectF r( 0.5 * m_width, 0.5 * m_width, size.width() - m_width, size.height() - m_width );
+            const QRectF r( 0.5 * m_width, 0.5 * m_width,
+                size.width() - m_width, size.height() - m_width );
 
             QGradientStops stops;
 
@@ -109,7 +107,7 @@ namespace {
             }
         }
 
-        virtual uint hash() const override
+        uint hash() const override
         {
             uint h = qHash( m_gradientType );
             h = qHash( m_width, h );
@@ -127,7 +125,7 @@ namespace {
             return h;
         }
 
-    private:
+      private:
         QskGradient m_gradient;
         QGradient::Type m_gradientType;
         double m_width;
@@ -150,8 +148,7 @@ CircularProgressBarSkinlet::~CircularProgressBarSkinlet()
 }
 
 QRectF CircularProgressBarSkinlet::subControlRect(
-    const QskSkinnable* /*skinnable*/, const QRectF& contentsRect,
-    QskAspect::Subcontrol /*subControl*/ ) const
+    const QskSkinnable*, const QRectF& contentsRect, QskAspect::Subcontrol ) const
 {
     return contentsRect;
 }
@@ -173,7 +170,8 @@ QSGNode* CircularProgressBarSkinlet::updateSubNode(
     return Inherited::updateSubNode( skinnable, nodeRole, node );
 }
 
-QSGNode* CircularProgressBarSkinlet::updateBarNode( const CircularProgressBar* bar, quint8 nodeRole, QSGNode* node ) const
+QSGNode* CircularProgressBarSkinlet::updateBarNode(
+    const CircularProgressBar* bar, quint8 nodeRole, QSGNode* node ) const
 {
     auto arcNode = static_cast< ArcNode* >( node );
 
diff --git a/examples/iotdashboard/Diagram.cpp b/examples/iotdashboard/Diagram.cpp
index 60c43f70..edb18a62 100644
--- a/examples/iotdashboard/Diagram.cpp
+++ b/examples/iotdashboard/Diagram.cpp
@@ -5,6 +5,15 @@
 
 #include "Diagram.h"
 
+QSK_SUBCONTROL( Diagram, Chart )
+QSK_SUBCONTROL( Diagram, Segments )
+QSK_SUBCONTROL( Diagram, ChartLine1 )
+QSK_SUBCONTROL( Diagram, ChartArea1 )
+QSK_SUBCONTROL( Diagram, ChartLine2 )
+QSK_SUBCONTROL( Diagram, ChartArea2 )
+QSK_SUBCONTROL( Diagram, ChartLine3 )
+QSK_SUBCONTROL( Diagram, ChartArea3 )
+
 class Diagram::PrivateData
 {
   public:
@@ -15,15 +24,6 @@ class Diagram::PrivateData
     QVector< Types > types;
 };
 
-QSK_SUBCONTROL( Diagram, Chart )
-QSK_SUBCONTROL( Diagram, Segments )
-QSK_SUBCONTROL( Diagram, ChartLine1 )
-QSK_SUBCONTROL( Diagram, ChartArea1 )
-QSK_SUBCONTROL( Diagram, ChartLine2 )
-QSK_SUBCONTROL( Diagram, ChartArea2 )
-QSK_SUBCONTROL( Diagram, ChartLine3 )
-QSK_SUBCONTROL( Diagram, ChartArea3 )
-
 Diagram::Diagram( QQuickItem* parent )
     : Inherited( parent )
     , m_data( new PrivateData() )
@@ -80,14 +80,4 @@ void Diagram::setChartPosition( Qsk::Position position )
     m_data->position = position;
 }
 
-QSizeF Diagram::contentsSizeHint( Qt::SizeHint which, const QSizeF& ) const
-{
-    if( which != Qt::PreferredSize )
-    {
-        return QSizeF();
-    }
-
-    return {};
-}
-
 #include "moc_Diagram.cpp"
diff --git a/examples/iotdashboard/Diagram.h b/examples/iotdashboard/Diagram.h
index c48e4b91..a996bc20 100644
--- a/examples/iotdashboard/Diagram.h
+++ b/examples/iotdashboard/Diagram.h
@@ -43,9 +43,6 @@ class Diagram : public QskControl
     Qsk::Position chartPosition() const;
     void setChartPosition( Qsk::Position );
 
-  protected:
-    QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
-
   private:
     class PrivateData;
     std::unique_ptr< PrivateData > m_data;
diff --git a/examples/iotdashboard/LightIntensity.cpp b/examples/iotdashboard/LightIntensity.cpp
index 156845d9..4e957fb8 100644
--- a/examples/iotdashboard/LightIntensity.cpp
+++ b/examples/iotdashboard/LightIntensity.cpp
@@ -143,10 +143,10 @@ LightDimmer::LightDimmer( const QskGradient& coldGradient,
     , m_warmGradient( warmGradient )
 {
     connect( this, &QQuickPaintedItem::widthChanged,
-             this, &LightDimmer::updateGradient );
+        this, &LightDimmer::updateGradient );
 
     connect( this, &QQuickPaintedItem::heightChanged,
-             this, &LightDimmer::updateGradient );
+        this, &LightDimmer::updateGradient );
 }
 
 void LightDimmer::updateGradient()
diff --git a/examples/iotdashboard/PieChartPainted.cpp b/examples/iotdashboard/PieChartPainted.cpp
index a23c34e0..1b4a3c50 100644
--- a/examples/iotdashboard/PieChartPainted.cpp
+++ b/examples/iotdashboard/PieChartPainted.cpp
@@ -103,7 +103,7 @@ PieChartPainted::PieChartPainted( const QColor& color, const QskGradient& gradie
         [this]() { m_animator->start(); } );
 }
 
-QSizeF PieChartPainted::contentsSizeHint( Qt::SizeHint /*sizeHint*/, const QSizeF& /*size*/ ) const
+QSizeF PieChartPainted::contentsSizeHint( Qt::SizeHint, const QSizeF& ) const
 {
     return {57, 57};
 }
diff --git a/examples/iotdashboard/PieChartPainted.h b/examples/iotdashboard/PieChartPainted.h
index 88fc34b7..de3a059f 100644
--- a/examples/iotdashboard/PieChartPainted.h
+++ b/examples/iotdashboard/PieChartPainted.h
@@ -20,7 +20,7 @@ class PieChartPainted : public QskControl
         int progress, int value, QQuickItem* parent = nullptr );
 
   protected:
-    virtual QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
+    QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
     void updateLayout() override;
 
   private:
diff --git a/examples/iotdashboard/PieChartSkinlet.cpp b/examples/iotdashboard/PieChartSkinlet.cpp
index 7dfbde45..4bc29c8c 100644
--- a/examples/iotdashboard/PieChartSkinlet.cpp
+++ b/examples/iotdashboard/PieChartSkinlet.cpp
@@ -17,12 +17,14 @@ PieChartSkinlet::PieChartSkinlet( QskSkin* skin )
     setNodeRoles( { PanelRole, LabelsRole } );
 }
 
-QRectF PieChartSkinlet::subControlRect( const QskSkinnable*, const QRectF& contentsRect, QskAspect::Subcontrol ) const
+QRectF PieChartSkinlet::subControlRect( const QskSkinnable*,
+    const QRectF& contentsRect, QskAspect::Subcontrol ) const
 {
     return contentsRect;
 }
 
-QSGNode* PieChartSkinlet::updateSubNode( const QskSkinnable* skinnable, quint8 nodeRole, QSGNode* node ) const
+QSGNode* PieChartSkinlet::updateSubNode( const QskSkinnable* skinnable,
+    quint8 nodeRole, QSGNode* node ) const
 {
     const auto pieChart = static_cast< const PieChart* >( skinnable );
 
@@ -71,7 +73,7 @@ QSGNode* PieChartSkinlet::updatePanelNode( const PieChart* pieChart, QSGNode* no
     return boxNode;
 }
 
-QSGNode* PieChartSkinlet::updateLabelsNode( const PieChart* pieChart, QSGNode* /*node*/ ) const
+QSGNode* PieChartSkinlet::updateLabelsNode( const PieChart* pieChart, QSGNode* ) const
 {
     const int labelsCount = pieChart->labels().count();
 
diff --git a/examples/iotdashboard/RoundedIcon.cpp b/examples/iotdashboard/RoundedIcon.cpp
index b619d11b..b3fdaab9 100644
--- a/examples/iotdashboard/RoundedIcon.cpp
+++ b/examples/iotdashboard/RoundedIcon.cpp
@@ -17,7 +17,8 @@ QSK_SUBCONTROL( RoundedIcon, Icon )
 QSK_STATE( RoundedIcon, Bright, ( QskAspect::FirstUserState << 1 ) )
 QSK_STATE( RoundedIcon, Small, ( QskAspect::FirstUserState << 2 ) )
 
-RoundedIcon::RoundedIcon( const QString& iconName, bool isBright, bool isSmall, QQuickItem* parent )
+RoundedIcon::RoundedIcon( const QString& iconName,
+        bool isBright, bool isSmall, QQuickItem* parent )
     : QskBox( parent )
 {
     setPanel( true );
diff --git a/examples/iotdashboard/RoundedIcon.h b/examples/iotdashboard/RoundedIcon.h
index 7098d19f..79ab20c8 100644
--- a/examples/iotdashboard/RoundedIcon.h
+++ b/examples/iotdashboard/RoundedIcon.h
@@ -17,12 +17,12 @@ class RoundedIcon : public QskBox
     QSK_SUBCONTROLS( Panel, Icon )
     QSK_STATES( Bright, Small ) // to differentiate between orange and purple and small vs. big
 
-    RoundedIcon( const QString& iconName, bool isBright, bool isSmall,
-                 QQuickItem* parent = nullptr );
+    RoundedIcon( const QString& iconName,
+        bool isBright, bool isSmall, QQuickItem* parent = nullptr );
 
   protected:
     void updateLayout() override;
-    virtual QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
+    QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
 
   private:
     QskGraphicLabel* m_graphicLabel = nullptr;
diff --git a/examples/iotdashboard/TopBar.cpp b/examples/iotdashboard/TopBar.cpp
index be4d71dc..c6939908 100644
--- a/examples/iotdashboard/TopBar.cpp
+++ b/examples/iotdashboard/TopBar.cpp
@@ -43,7 +43,9 @@ namespace
     }
 }
 
-TopBarItem::TopBarItem( int index, const QString& name, const QskGradient& gradient, int progress, int value, QQuickItem* parent )
+TopBarItem::TopBarItem(
+        int index, const QString& name, const QskGradient& gradient,
+        int progress, int value, QQuickItem* parent )
     : QskLinearBox( Qt::Vertical, parent )
     , m_name( name )
 {
@@ -81,8 +83,6 @@ TopBar::TopBar( QQuickItem* parent )
     setPanel( true );
     setSubcontrolProxy( QskBox::Panel, Panel );
 
-    setAutoLayoutChildren( true );
-    setAutoAddChildren( true );
     setSizePolicy( QskSizePolicy::Preferred, QskSizePolicy::Fixed );
 
     const QStringList itemStrings = { "Living Room", "Bedroom", "Bathroom", "Kitchen" };
diff --git a/examples/iotdashboard/UsageDiagram.cpp b/examples/iotdashboard/UsageDiagram.cpp
index 81cfdf55..d3a0de86 100644
--- a/examples/iotdashboard/UsageDiagram.cpp
+++ b/examples/iotdashboard/UsageDiagram.cpp
@@ -65,7 +65,7 @@ namespace
       public:
         UsageDiagram( QQuickItem* parent = nullptr )
             : Diagram( parent )
-        { 
+        {
             // These values are calculated with a boost::math::cubic_b_spline.
             // We just output the values here to get rid of the dependency:
 
@@ -126,7 +126,7 @@ namespace
 
             for( size_t i = 0; i < count; i++ )
                 points += QPointF( i, values[i] );
-                        
+
             addDataPoints( points, Diagram::Area );
         }
     };
@@ -144,7 +144,7 @@ UsageDiagramLegend::UsageDiagramLegend( QQuickItem* parent )
     addItem( new LegendItem( UsageDiagramLegend::Electricity ) );
     addItem( new LegendItem( UsageDiagramLegend::Gas ) );
 }
- 
+
 UsageDiagramBox::UsageDiagramBox( QQuickItem* parent )
     : Box( QString(), parent )
 {
@@ -158,7 +158,7 @@ UsageDiagramBox::UsageDiagramBox( QQuickItem* parent )
 
     const char* days[] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" };
 
-    for( size_t i = 0; i < sizeof( days ) / sizeof( days[0] ) ; i++ )
+    for( size_t i = 0; i < sizeof( days ) / sizeof( days[0] ); i++ )
     {
         auto box = new QskBox( true );
         box->setSubcontrolProxy( QskBox::Panel, UsageDiagramBox::DaysBox );