5 files changed, 174 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllocale/data/date.qml b/tests/auto/qml/qqmllocale/data/date.qml
new file mode 100644
index 0000000000..3f58497d22
--- /dev/null
+++ b/tests/auto/qml/qqmllocale/data/date.qml
@@ -0,0 +1,45 @@
+import QtQuick 2.0
+
+QtObject {
+    property var locale: Qt.locale()
+
+    function setLocale(l) {
+        locale = Qt.locale(l)
+    }
+
+    function toLocaleString(fmt) {
+        var d = new Date(2011, 9, 7, 18, 53, 48, 345);
+        if (fmt < 0)
+            return d.toLocaleString(locale);
+        else
+            return d.toLocaleString(locale, fmt);
+    }
+
+    function toLocaleDateString(fmt) {
+        var d = new Date(2011, 9, 7, 18, 53, 48, 345);
+        if (fmt < 0)
+            return d.toLocaleDateString(locale);
+        else
+            return d.toLocaleDateString(locale, fmt);
+    }
+
+    function toLocaleTimeString(fmt) {
+        var d = new Date(2011, 9, 7, 18, 53, 48, 345);
+        if (fmt < 0)
+            return d.toLocaleTimeString(locale);
+        else
+            return d.toLocaleTimeString(locale, fmt);
+    }
+
+    function fromLocaleString(d,fmt) {
+        return Date.fromLocaleString(locale, d, fmt)
+    }
+
+    function fromLocaleDateString(d,fmt) {
+        return Date.fromLocaleDateString(locale, d, fmt)
+    }
+
+    function fromLocaleTimeString(d,fmt) {
+        return Date.fromLocaleTimeString(locale, d, fmt)
+    }
+}
diff --git a/tests/auto/qml/qqmllocale/data/functions.qml b/tests/auto/qml/qqmllocale/data/functions.qml
new file mode 100644
index 0000000000..5fef6a26fb
--- /dev/null
+++ b/tests/auto/qml/qqmllocale/data/functions.qml
@@ -0,0 +1,65 @@
+import QtQuick 2.0
+
+QtObject {
+    property var locale: Qt.locale()
+
+    function setLocale(l) {
+        locale = Qt.locale(l)
+    }
+
+    function currencySymbol(type) {
+        if (type < 0)
+            return locale.currencySymbol()
+        else
+            return locale.currencySymbol(type)
+    }
+
+    function monthName(month,type) {
+        if (type < 0)
+            return locale.monthName(month)
+        else
+            return locale.monthName(month, type)
+    }
+
+    function standaloneMonthName(month,type) {
+        if (type < 0)
+            return locale.standaloneMonthName(month)
+        else
+            return locale.standaloneMonthName(month, type)
+    }
+
+    function dayName(month,type) {
+        if (type < 0)
+            return locale.dayName(month)
+        else
+            return locale.dayName(month, type)
+    }
+
+    function standaloneDayName(month,type) {
+        if (type < 0)
+            return locale.standaloneDayName(month)
+        else
+            return locale.standaloneDayName(month, type)
+    }
+
+    function dateTimeFormat(fmt) {
+        if (fmt < 0)
+            return locale.dateTimeFormat()
+        else
+            return locale.dateTimeFormat(fmt)
+    }
+
+    function dateFormat(fmt) {
+        if (fmt < 0)
+            return locale.dateFormat()
+        else
+            return locale.dateFormat(fmt)
+    }
+
+    function timeFormat(fmt) {
+        if (fmt < 0)
+            return locale.timeFormat()
+        else
+            return locale.timeFormat(fmt)
+    }
+}
diff --git a/tests/auto/qml/qqmllocale/data/localeCompare.qml b/tests/auto/qml/qqmllocale/data/localeCompare.qml
new file mode 100644
index 0000000000..6851af6ef9
--- /dev/null
+++ b/tests/auto/qml/qqmllocale/data/localeCompare.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+
+QtObject {
+    property var string1: "a"
+    property var string2: "a"
+    property var comparison: string1.localeCompare(string2)
+}
diff --git a/tests/auto/qml/qqmllocale/data/number.qml b/tests/auto/qml/qqmllocale/data/number.qml
new file mode 100644
index 0000000000..51a6c15dce
--- /dev/null
+++ b/tests/auto/qml/qqmllocale/data/number.qml
@@ -0,0 +1,30 @@
+import QtQuick 2.0
+
+QtObject {
+    property var locale: Qt.locale()
+
+    function setLocale(l) {
+        locale = Qt.locale(l)
+    }
+
+    function toLocaleString(n,fmt,prec) {
+        if (prec < 0)
+            return n.toLocaleString(locale, fmt);
+        else
+            return n.toLocaleString(locale, fmt, prec);
+    }
+
+    function toLocaleCurrencyString(n,symbol) {
+        if (symbol.length == 0)
+            return n.toLocaleCurrencyString(locale);
+        else
+            return n.toLocaleCurrencyString(locale, symbol);
+    }
+
+    function fromLocaleString(n) {
+        return Number.fromLocaleString(locale, n)
+    }
+
+    property var const1: 1234.56.toLocaleString(locale);
+    property var const2: 1234..toLocaleString(locale);
+}
diff --git a/tests/auto/qml/qqmllocale/data/properties.qml b/tests/auto/qml/qqmllocale/data/properties.qml
new file mode 100644
index 0000000000..16d1f4092a
--- /dev/null
+++ b/tests/auto/qml/qqmllocale/data/properties.qml
@@ -0,0 +1,27 @@
+import QtQuick 2.0
+
+QtObject {
+    property var locale: Qt.locale()
+
+    function setLocale(l) {
+        locale = Qt.locale(l);
+    }
+
+    property var name: locale.name
+    property var amText: locale.amText
+    property var pmText: locale.pmText
+    property var nativeLanguageName: locale.nativeLanguageName
+    property var nativeCountryName: locale.nativeCountryName
+    property var decimalPoint: locale.decimalPoint
+    property var groupSeparator: locale.groupSeparator
+    property var percent: locale.percent
+    property var zeroDigit: locale.zeroDigit
+    property var negativeSign: locale.negativeSign
+    property var positiveSign: locale.positiveSign
+    property var exponential: locale.exponential
+    property var firstDayOfWeek: locale.firstDayOfWeek
+    property var measurementSystem: locale.measurementSystem
+    property var textDirection: locale.textDirection
+    property var weekDays: locale.weekDays
+    property var uiLanguages: locale.uiLanguages
+}