2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml
index 4f1d59f0f..3f309bb0d 100644
--- a/src/controls/Private/ScrollViewHelper.qml
+++ b/src/controls/Private/ScrollViewHelper.qml
@@ -143,7 +143,7 @@ Item {
             }
         }
         onValueChanged: {
-            if (!blockUpdates) {
+            if (flickableItem && !blockUpdates) {
                 flickableItem.contentX = value + flickableItem.originX
             }
         }
diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp
index f9596d359..08f80713d 100644
--- a/src/controls/Private/qquickstyleitem.cpp
+++ b/src/controls/Private/qquickstyleitem.cpp
@@ -1466,7 +1466,7 @@ void QQuickStyleItem1::paint(QPainter *painter)
     case ItemRow :{
         QPixmap pixmap;
         // Only draw through style once
-        const QString pmKey = QLatin1Literal("itemrow") % QString::number(m_styleoption->state,16) % activeControl();
+        const QString pmKey = QLatin1String("itemrow") % QString::number(m_styleoption->state,16) % activeControl();
         if (!QPixmapCache::find(pmKey, &pixmap) || pixmap.width() < width() || height() != pixmap.height()) {
             int newSize = width();
             pixmap = QPixmap(newSize, height());