aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelocale/data
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-02-16 14:43:03 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-24 04:51:31 +0100
commitb855240b782395f94315f43ea3e7e182299fac48 (patch)
treebc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /tests/auto/declarative/qdeclarativelocale/data
parent6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff)
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativelocale/data')
-rw-r--r--tests/auto/declarative/qdeclarativelocale/data/date.qml45
-rw-r--r--tests/auto/declarative/qdeclarativelocale/data/functions.qml65
-rw-r--r--tests/auto/declarative/qdeclarativelocale/data/localeCompare.qml7
-rw-r--r--tests/auto/declarative/qdeclarativelocale/data/number.qml30
-rw-r--r--tests/auto/declarative/qdeclarativelocale/data/properties.qml27
5 files changed, 0 insertions, 174 deletions
diff --git a/tests/auto/declarative/qdeclarativelocale/data/date.qml b/tests/auto/declarative/qdeclarativelocale/data/date.qml
deleted file mode 100644
index 3f58497d22..0000000000
--- a/tests/auto/declarative/qdeclarativelocale/data/date.qml
+++ /dev/null
@@ -1,45 +0,0 @@
-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/declarative/qdeclarativelocale/data/functions.qml b/tests/auto/declarative/qdeclarativelocale/data/functions.qml
deleted file mode 100644
index 5fef6a26fb..0000000000
--- a/tests/auto/declarative/qdeclarativelocale/data/functions.qml
+++ /dev/null
@@ -1,65 +0,0 @@
-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/declarative/qdeclarativelocale/data/localeCompare.qml b/tests/auto/declarative/qdeclarativelocale/data/localeCompare.qml
deleted file mode 100644
index 6851af6ef9..0000000000
--- a/tests/auto/declarative/qdeclarativelocale/data/localeCompare.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-QtObject {
- property var string1: "a"
- property var string2: "a"
- property var comparison: string1.localeCompare(string2)
-}
diff --git a/tests/auto/declarative/qdeclarativelocale/data/number.qml b/tests/auto/declarative/qdeclarativelocale/data/number.qml
deleted file mode 100644
index 51a6c15dce..0000000000
--- a/tests/auto/declarative/qdeclarativelocale/data/number.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-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/declarative/qdeclarativelocale/data/properties.qml b/tests/auto/declarative/qdeclarativelocale/data/properties.qml
deleted file mode 100644
index 16d1f4092a..0000000000
--- a/tests/auto/declarative/qdeclarativelocale/data/properties.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-}