diff --git a/cmake/QskConfigMacros.cmake b/cmake/QskConfigMacros.cmake
index 6b9261cc..de5b9f23 100644
--- a/cmake/QskConfigMacros.cmake
+++ b/cmake/QskConfigMacros.cmake
@@ -54,7 +54,7 @@ macro(qsk_enable_pedantic_flags)
 
             add_compile_options( -Wnon-virtual-dtor )
             add_compile_options( -Woverloaded-virtual )
-            add_compile_options( -Wfloat-equal )
+            # add_compile_options( -Wfloat-equal )
 
         if ( CMAKE_CXX_COMPILER_ID MATCHES "GNU" )
 
diff --git a/playground/fonts/main.cpp b/playground/fonts/main.cpp
index 03fb9751..e402d561 100644
--- a/playground/fonts/main.cpp
+++ b/playground/fonts/main.cpp
@@ -88,7 +88,7 @@ namespace
         }
 
       protected:
-        void changeEvent( QEvent* event )
+        void changeEvent( QEvent* event ) override
         {
             if ( event->type() == QEvent::StyleChange )
                 updateText();
diff --git a/playground/plots/QskPlotCurveData.h b/playground/plots/QskPlotCurveData.h
index 47f76626..7213b386 100644
--- a/playground/plots/QskPlotCurveData.h
+++ b/playground/plots/QskPlotCurveData.h
@@ -31,7 +31,7 @@ class QskPlotCurveData : public QObject
          */
         BoundingRectangle = 1 << 2
     };
-    Q_ENUM( Hint );
+    Q_ENUM( Hint )
 
     Q_DECLARE_FLAGS( Hints, Hint )
 
diff --git a/playground/plots/QskPlotItem.h b/playground/plots/QskPlotItem.h
index 3f343d8a..8c61d44a 100644
--- a/playground/plots/QskPlotItem.h
+++ b/playground/plots/QskPlotItem.h
@@ -42,7 +42,7 @@ class QskPlotItem : public QObject, public QskSkinnable
         PlotCoordinates
     };
 
-    Q_ENUM( CoordinateType );
+    Q_ENUM( CoordinateType )
 
     enum ChangeFlag
     {
@@ -54,9 +54,9 @@ class QskPlotItem : public QObject, public QskSkinnable
 
         CanvasGeometryChanged = 1 << 2
     };
-    Q_ENUM( ChangeFlag );
+    Q_ENUM( ChangeFlag )
 
-    Q_DECLARE_FLAGS( ChangeFlags, ChangeFlag );
+    Q_DECLARE_FLAGS( ChangeFlags, ChangeFlag )
 
     QskPlotItem( QObject* = nullptr );
     ~QskPlotItem() override;
@@ -99,7 +99,7 @@ class QskPlotItem : public QObject, public QskSkinnable
     void resetDirty();
     bool isDirty() const;
 
-    virtual void updateNode( QSGNode* );
+    void updateNode( QSGNode* ) override;
     virtual void transformationChanged( ChangeFlags );
 
   Q_SIGNALS:
diff --git a/playground/plots/QskPlotView.cpp b/playground/plots/QskPlotView.cpp
index 8c346f37..69aec589 100644
--- a/playground/plots/QskPlotView.cpp
+++ b/playground/plots/QskPlotView.cpp
@@ -285,12 +285,12 @@ void QskPlotView::updateNode( QSGNode* node )
 {
     if ( !m_data->orphanedNodes.empty() )
     {
-        for ( auto node : m_data->orphanedNodes )
+        for ( auto orphanedNode : m_data->orphanedNodes )
         {
             if ( auto parentNode = node->parent() )
-                parentNode->removeChildNode( node );
+                parentNode->removeChildNode( orphanedNode );
 
-            delete node;
+            delete orphanedNode;
         }
 
         m_data->orphanedNodes.clear();
diff --git a/src/common/QskFontRole.h b/src/common/QskFontRole.h
index 3a1fb594..2af4670c 100644
--- a/src/common/QskFontRole.h
+++ b/src/common/QskFontRole.h
@@ -26,7 +26,7 @@ class QSK_EXPORT QskFontRole
         Headline,
         Display
     };
-    Q_ENUM( Category );
+    Q_ENUM( Category )
 
     enum Emphasis : quint8
     {
@@ -38,7 +38,7 @@ class QSK_EXPORT QskFontRole
         High,
         VeryHigh
     };
-    Q_ENUM( Emphasis );
+    Q_ENUM( Emphasis )
 
     constexpr QskFontRole( Category = Body, Emphasis = Normal ) noexcept;
 
diff --git a/src/controls/QskGesture.h b/src/controls/QskGesture.h
index cc2849ec..e68fca2f 100644
--- a/src/controls/QskGesture.h
+++ b/src/controls/QskGesture.h
@@ -137,7 +137,7 @@ class QSK_EXPORT QskSwipeGesture : public QskGesture
     ~QskSwipeGesture() override;
 
     void setAngle( qreal angle );
-    inline qreal angle() const { return m_angle; };
+    inline qreal angle() const { return m_angle; }
 
   private:
     qreal m_angle;
diff --git a/src/controls/QskItem.cpp b/src/controls/QskItem.cpp
index 9b2d1eb7..e77cea62 100644
--- a/src/controls/QskItem.cpp
+++ b/src/controls/QskItem.cpp
@@ -218,7 +218,8 @@ namespace
             }
         }
 
-        void itemChildRemoved( QQuickItem* parentItem, QQuickItem* )
+        void itemChildRemoved(
+            QQuickItem* parentItem, QQuickItem* ) override
         {
             update( parentItem );
         }
diff --git a/src/controls/QskMainView.h b/src/controls/QskMainView.h
index 35950c68..00721cdb 100644
--- a/src/controls/QskMainView.h
+++ b/src/controls/QskMainView.h
@@ -28,7 +28,7 @@ class QSK_EXPORT QskMainView : public QskLinearBox
     void setFooter( QskControl* );
 
   protected:
-    void focusInEvent( QFocusEvent* );
+    void focusInEvent( QFocusEvent* ) override;
 
   private:
     class PrivateData;
diff --git a/src/controls/QskSkinHintTable.cpp b/src/controls/QskSkinHintTable.cpp
index 6c68dcbf..bf2678f4 100644
--- a/src/controls/QskSkinHintTable.cpp
+++ b/src/controls/QskSkinHintTable.cpp
@@ -246,8 +246,8 @@ QskAspect QskSkinHintTable::resolvedAnimator(
 
         Q_FOREVER
         {
-            auto it = m_hints->find( aspect );
-            if ( it != m_hints->cend() )
+            auto it = m_hints->constFind( aspect );
+            if ( it != m_hints->constEnd() )
             {
                 hint = it.value().value< QskAnimationHint >();
                 return aspect;
diff --git a/src/controls/QskSkinTransition.cpp b/src/controls/QskSkinTransition.cpp
index 748c93e4..bcaf1bed 100644
--- a/src/controls/QskSkinTransition.cpp
+++ b/src/controls/QskSkinTransition.cpp
@@ -547,7 +547,7 @@ inline void WindowAnimator::storeAnimator(
     const QskControl* control, const QskAspect aspect,
     const QVariant& value1, const QVariant& value2, QskAnimationHint hint )
 {
-    if ( m_animatorMap.find( aspect ) == m_animatorMap.cend() )
+    if ( !m_animatorMap.contains( aspect ) )
     {
         m_animatorMap.insert( aspect,
             HintAnimator( control, aspect, value1, value2, hint ) );
diff --git a/src/controls/QskWindow.cpp b/src/controls/QskWindow.cpp
index d94067f2..5d520db7 100644
--- a/src/controls/QskWindow.cpp
+++ b/src/controls/QskWindow.cpp
@@ -446,8 +446,8 @@ void QskWindow::resizeEvent( QResizeEvent* event )
     const auto newRect = qskItemGeometry( rootItem );
     if ( newRect != oldRect )
     {
-        QskGeometryChangeEvent event( newRect, oldRect );
-        QCoreApplication::sendEvent( rootItem, &event );
+        QskGeometryChangeEvent ev( newRect, oldRect );
+        QCoreApplication::sendEvent( rootItem, &ev );
     }
 
     if ( isExposed() )
diff --git a/src/dialogs/QskDialogSubWindow.h b/src/dialogs/QskDialogSubWindow.h
index 077ef65f..416a4a0c 100644
--- a/src/dialogs/QskDialogSubWindow.h
+++ b/src/dialogs/QskDialogSubWindow.h
@@ -85,7 +85,7 @@ class QSK_EXPORT QskDialogSubWindow : public QskSubWindow
 
     void updateLayout() override;
 
-    QSizeF layoutSizeHint( Qt::SizeHint, const QSizeF& ) const;
+    QSizeF layoutSizeHint( Qt::SizeHint, const QSizeF& ) const override;
 
   private:
     void initButtonBox();
diff --git a/src/nodes/QskGradientMaterial.cpp b/src/nodes/QskGradientMaterial.cpp
index 1a64f699..f6e490b0 100644
--- a/src/nodes/QskGradientMaterial.cpp
+++ b/src/nodes/QskGradientMaterial.cpp
@@ -54,7 +54,7 @@ namespace
         }
 
 #if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
-        // make Qt 5/6 APIs matchaing
+        // make Qt 5/6 APIs matching
 
         QSGMaterialShader* createShader(
             QSGRendererInterface::RenderMode ) const override final
diff --git a/src/nodes/QskGraduationRenderer.cpp b/src/nodes/QskGraduationRenderer.cpp
index a9616946..85727324 100644
--- a/src/nodes/QskGraduationRenderer.cpp
+++ b/src/nodes/QskGraduationRenderer.cpp
@@ -32,7 +32,7 @@ namespace
         {
         }
 
-        inline qreal map( qreal v ) const { return t + f * v; };
+        inline qreal map( qreal v ) const { return t + f * v; }
 
       private:
         const qreal t;
diff --git a/src/nodes/QskTreeNode.h b/src/nodes/QskTreeNode.h
index 78d31ffa..eb12b8f6 100644
--- a/src/nodes/QskTreeNode.h
+++ b/src/nodes/QskTreeNode.h
@@ -25,7 +25,7 @@ class QSK_EXPORT QskTreeNode final : public QSGNode
     QskTreeNode( QSGNodePrivate& );
 
   private:
-    bool m_isBlocked = false;;
+    bool m_isBlocked = false;
 };
 
 QSK_EXPORT QskTreeNode* qskTreeNodeCast( QSGNode* );
@@ -45,7 +45,7 @@ class QSK_EXPORT QskItemNode final : public QSGTransformNode
     bool isSubtreeBlocked() const override;
 
   private:
-    bool m_isBlocked = false;;
+    bool m_isBlocked = false;
 };
 
 QSK_EXPORT QskItemNode* qskItemNodeCast( QSGNode* );