diff --git a/src/common/QskGradient.h b/src/common/QskGradient.h
index 5df88b8c..441aaa4f 100644
--- a/src/common/QskGradient.h
+++ b/src/common/QskGradient.h
@@ -230,7 +230,7 @@ inline const QskGradientStops& QskGradient::stops() const noexcept
 #if 1
     /*
         Returning a const& so that it is possible to write:
-            for ( const auto& stop : qAsConst( gradient.stops() ) )
+            for ( const auto& stop : gradient.stops() )
 
         Once we have changed QskGradientStop from QColor to QRgb
         we should check if there is a better solution possible
diff --git a/src/common/QskObjectCounter.cpp b/src/common/QskObjectCounter.cpp
index c26b80fd..0ec9ee4c 100644
--- a/src/common/QskObjectCounter.cpp
+++ b/src/common/QskObjectCounter.cpp
@@ -162,7 +162,7 @@ void CounterHook::addObject( QObject* object )
 {
     const bool isItem = qskIsItem( object );
 
-    for ( auto counterData : qAsConst( m_counterDataSet ) )
+    for ( auto counterData : std::as_const( m_counterDataSet ) )
     {
         counterData->counter[ QskObjectCounter::Objects ].increment();
 
@@ -182,7 +182,7 @@ void CounterHook::removeObject( QObject* object )
 {
     const bool isItem = qskIsItem( object );
 
-    for ( auto counterData : qAsConst( m_counterDataSet ) )
+    for ( auto counterData : std::as_const( m_counterDataSet ) )
     {
         counterData->counter[ QskObjectCounter::Objects ].decrement();
 
diff --git a/src/controls/QskFocusIndicator.cpp b/src/controls/QskFocusIndicator.cpp
index c688dffb..34380e34 100644
--- a/src/controls/QskFocusIndicator.cpp
+++ b/src/controls/QskFocusIndicator.cpp
@@ -57,7 +57,7 @@ class QskFocusIndicator::PrivateData
   public:
     void resetConnections()
     {
-        for ( const auto& connection : qAsConst( connections ) )
+        for ( const auto& connection : std::as_const( connections ) )
             QObject::disconnect( connection );
 
         connections.clear();
diff --git a/src/controls/QskGestureRecognizer.cpp b/src/controls/QskGestureRecognizer.cpp
index a5c376b2..fea738a1 100644
--- a/src/controls/QskGestureRecognizer.cpp
+++ b/src/controls/QskGestureRecognizer.cpp
@@ -132,7 +132,7 @@ namespace
         {
             Timer* timer = nullptr;
 
-            for ( auto t : qAsConst( m_table ) )
+            for ( auto t : std::as_const( m_table ) )
             {
                 if ( t->recognizer() == nullptr ||
                     t->recognizer() == recognizer )
@@ -153,7 +153,7 @@ namespace
 
         void stopTimer( const QskGestureRecognizer* recognizer )
         {
-            for ( auto timer : qAsConst( m_table ) )
+            for ( auto timer : std::as_const( m_table ) )
             {
                 if ( timer->recognizer() == recognizer )
                 {
diff --git a/src/controls/QskQuick.cpp b/src/controls/QskQuick.cpp
index d333b9e5..07d23196 100644
--- a/src/controls/QskQuick.cpp
+++ b/src/controls/QskQuick.cpp
@@ -463,7 +463,7 @@ void qskItemUpdateRecursive( QQuickItem* item )
 
 static const QQuickPointerTouchEvent* qskPointerPressEvent( const QQuickWindowPrivate* wd )
 {
-    for ( const auto event : qAsConst( wd->pointerEventInstances ) )
+    for ( const auto event : std::as_const( wd->pointerEventInstances ) )
     {
         if ( auto touchEvent = event->asPointerTouchEvent() )
         {
diff --git a/src/controls/QskShortcutMap.cpp b/src/controls/QskShortcutMap.cpp
index 6bd058f0..c7d518ec 100644
--- a/src/controls/QskShortcutMap.cpp
+++ b/src/controls/QskShortcutMap.cpp
@@ -173,7 +173,7 @@ void QskShortcutHandler::remove( int id )
         Finally let's check if we can disconnect
         from the destroyed signals
      */
-    for ( const auto& entry : qAsConst( m_invokeDataMap ) )
+    for ( const auto& entry : std::as_const( m_invokeDataMap ) )
     {
         if ( item == nullptr && receiver == nullptr )
             break;
@@ -276,7 +276,7 @@ bool QskShortcutHandler::invoke( QQuickItem* item, const QKeySequence& sequence
 {
     bool found = false;
 
-    for ( const auto& entry : qAsConst( m_invokeDataMap ) )
+    for ( const auto& entry : std::as_const( m_invokeDataMap ) )
     {
         auto& data = entry.second;
 
diff --git a/src/controls/QskSkinManager.cpp b/src/controls/QskSkinManager.cpp
index a41fcfca..218d2747 100644
--- a/src/controls/QskSkinManager.cpp
+++ b/src/controls/QskSkinManager.cpp
@@ -365,7 +365,7 @@ class QskSkinManager::PrivateData
     {
         if ( !pluginsRegistered )
         {
-            for ( const auto& path : qAsConst( pluginPaths ) )
+            for ( const auto& path : std::as_const( pluginPaths ) )
                 registerPlugins( path + QStringLiteral( "/skins" ) );
 
             pluginsRegistered = true;
diff --git a/src/controls/QskSkinlet.cpp b/src/controls/QskSkinlet.cpp
index b1e73ace..d19a1e93 100644
--- a/src/controls/QskSkinlet.cpp
+++ b/src/controls/QskSkinlet.cpp
@@ -368,7 +368,7 @@ void QskSkinlet::updateNode( QskSkinnable* skinnable, QSGNode* parentNode ) cons
         replaceChildNode( DebugRole, parentNode, oldNode, newNode );
     }
 
-    for ( const auto nodeRole : qAsConst( m_data->nodeRoles ) )
+    for ( const auto nodeRole : std::as_const( m_data->nodeRoles ) )
     {
         Q_ASSERT( nodeRole < FirstReservedRole );
 
diff --git a/src/dialogs/QskDialogButtonBox.cpp b/src/dialogs/QskDialogButtonBox.cpp
index d189ab74..47cfc75a 100644
--- a/src/dialogs/QskDialogButtonBox.cpp
+++ b/src/dialogs/QskDialogButtonBox.cpp
@@ -118,7 +118,7 @@ QskDialogButtonBox::~QskDialogButtonBox()
 {
     for ( int i = 0; i < QskDialog::NActionRoles; i++ )
     {
-        for ( auto button : qAsConst( m_data->buttons[ i ] ) )
+        for ( auto button : std::as_const( m_data->buttons[ i ] ) )
         {
             /*
                 The destructor of QQuickItem sets the parentItem of
diff --git a/src/graphic/QskGraphic.cpp b/src/graphic/QskGraphic.cpp
index 3541da83..c6326790 100644
--- a/src/graphic/QskGraphic.cpp
+++ b/src/graphic/QskGraphic.cpp
@@ -568,7 +568,7 @@ QRectF QskGraphic::scaledBoundingRect( qreal sx, qreal sy ) const
 
     QRectF rect = transform.mapRect( m_data->pointRect );
 
-    for ( const auto& info : qAsConst( m_data->pathInfos ) )
+    for ( const auto& info : std::as_const( m_data->pathInfos ) )
         rect |= info.scaledBoundingRect( sx, sy, scalePens );
 
     return rect;
@@ -681,7 +681,7 @@ void QskGraphic::render( QPainter* painter, const QRectF& rect,
 
     const bool scalePens = !( m_data->renderHints & RenderPensUnscaled );
 
-    for ( const auto& info : qAsConst( m_data->pathInfos ) )
+    for ( const auto& info : std::as_const( m_data->pathInfos ) )
     {
         const qreal ssx = info.scaleFactorX( m_data->pointRect,
             rect, m_data->boundingRect, scalePens );
diff --git a/src/layouts/QskStackBox.cpp b/src/layouts/QskStackBox.cpp
index 156a71e0..2b3eaf54 100644
--- a/src/layouts/QskStackBox.cpp
+++ b/src/layouts/QskStackBox.cpp
@@ -318,7 +318,7 @@ void QskStackBox::autoRemoveItem( QQuickItem* item )
 
 void QskStackBox::clear( bool autoDelete )
 {
-    for ( const auto item : qAsConst( m_data->items ) )
+    for ( const auto item : std::as_const( m_data->items ) )
     {
         if( autoDelete && ( item->parent() == this ) )
             delete item;
@@ -380,7 +380,7 @@ QSizeF QskStackBox::layoutSizeHint(
     qreal w = -1.0;
     qreal h = -1.0;
 
-    for ( const auto item : qAsConst( m_data->items ) )
+    for ( const auto item : std::as_const( m_data->items ) )
     {
         /*
             We ignore the retainSizeWhenVisible flag and include all