Allow setting horizontal and vertical tile modes in sci files

It was still using the old 'tileRule' name.
Also make sci file parser less strict with h/v tile mode values.

Task-number: QTBUG-26022
Change-Id: I41b7571b42a0fb9bd2cfab8ce2e76e57addabefd
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>

1 files changed, 9 insertions, 5 deletions

diff --git a/src/quick/items/qquickscalegrid.cpp b/src/quick/items/qquickscalegrid.cpp
index de10d8de47..f64a19b48a 100644
--- a/src/quick/items/qquickscalegrid.cpp
+++ b/src/quick/items/qquickscalegrid.cpp
@@ -152,9 +152,9 @@ QQuickGridScaledImage::QQuickGridScaledImage(QIODevice *data)
             b = list[1].toInt();
         else if (list[0] == QLatin1String("source"))
             imgFile = list[1];
-        else if (list[0] == QLatin1String("horizontalTileRule"))
+        else if (list[0] == QLatin1String("horizontalTileRule") || list[0] == QLatin1String("horizontalTileMode"))
             _h = stringToRule(list[1]);
-        else if (list[0] == QLatin1String("verticalTileRule"))
+        else if (list[0] == QLatin1String("verticalTileRule") || list[0] == QLatin1String("verticalTileMode"))
             _v = stringToRule(list[1]);
     }
 
@@ -170,11 +170,15 @@ QQuickGridScaledImage::QQuickGridScaledImage(QIODevice *data)
 
 QQuickBorderImage::TileMode QQuickGridScaledImage::stringToRule(const QString &s)
 {
-    if (s == QLatin1String("Stretch"))
+    QString string = s;
+    if (string.startsWith(QLatin1Char('"')) && string.endsWith(QLatin1Char('"')))
+        string = string.mid(1, string.size() - 2); // remove leading/trailing quotes.
+
+    if (string == QLatin1String("Stretch") || string == QLatin1String("BorderImage.Stretch"))
         return QQuickBorderImage::Stretch;
-    if (s == QLatin1String("Repeat"))
+    if (string == QLatin1String("Repeat") || string == QLatin1String("BorderImage.Repeat"))
         return QQuickBorderImage::Repeat;
-    if (s == QLatin1String("Round"))
+    if (string == QLatin1String("Round") || string == QLatin1String("BorderImage.Round"))
         return QQuickBorderImage::Round;
 
     qWarning("QQuickGridScaledImage: Invalid tile rule specified. Using Stretch.");