summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2018-07-17 12:39:11 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2018-07-17 12:39:11 +0200
commite137877eaaa3975a6769fd2dd574bd75876fcfa5 (patch)
treea397bdb1389ea02e6fb7b083e3e149b8a0de50cf /examples
parent6b53e7e16df0a2451d2b7948ad35485301c564b6 (diff)
parent369998639b37b5de46ab1b19b3dd6ca6c2b77d34 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: examples/quick/demos/photoviewer/i18n/qml_de.ts examples/quick/demos/photoviewer/i18n/qml_fr.ts examples/quick/demos/photoviewer/photoviewer.pro examples/quick/demos/photoviewer/qml.qrc src/qml/compiler/qv4instr_moth_p.h tests/auto/quick/qquickanimations/tst_qquickanimations.cpp Change-Id: Ibea76b468577c2a68bd305cee82ae6444d0f8073
Diffstat (limited to 'examples')
-rw-r--r--examples/qml/qml-i18n/i18n/base.ts4
-rw-r--r--examples/qml/qml-i18n/i18n/qml_en.ts4
-rw-r--r--examples/qml/qml-i18n/i18n/qml_en_AU.ts4
-rw-r--r--examples/qml/qml-i18n/i18n/qml_fr.ts4
-rw-r--r--examples/quick/demos/photoviewer/i18n/qml_en.qmbin0 -> 23 bytes
-rw-r--r--examples/quick/demos/photoviewer/i18n/qml_en.ts4
6 files changed, 14 insertions, 6 deletions
diff --git a/examples/qml/qml-i18n/i18n/base.ts b/examples/qml/qml-i18n/i18n/base.ts
index 07e00f3ad2..77c640f370 100644
--- a/examples/qml/qml-i18n/i18n/base.ts
+++ b/examples/qml/qml-i18n/i18n/base.ts
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" sourcelanguage="en">
+<TS version="2.1" sourcelanguage="en">
<context>
<name>qml-i18n</name>
<message>
- <location filename="../qml-i18n.qml" line="56"/>
+ <location filename="../qml-i18n.qml" line="66"/>
<source>Hello</source>
<translation type="unfinished"></translation>
</message>
diff --git a/examples/qml/qml-i18n/i18n/qml_en.ts b/examples/qml/qml-i18n/i18n/qml_en.ts
new file mode 100644
index 0000000000..eb9b75f7bf
--- /dev/null
+++ b/examples/qml/qml-i18n/i18n/qml_en.ts
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en" sourcelanguage="en">
+</TS>
diff --git a/examples/qml/qml-i18n/i18n/qml_en_AU.ts b/examples/qml/qml-i18n/i18n/qml_en_AU.ts
index 047817d006..86ccfb7bf8 100644
--- a/examples/qml/qml-i18n/i18n/qml_en_AU.ts
+++ b/examples/qml/qml-i18n/i18n/qml_en_AU.ts
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="en_AU" sourcelanguage="en">
+<TS version="2.1" language="en_AU" sourcelanguage="en">
<context>
<name>qml-i18n</name>
<message>
- <location filename="../qml-i18n.qml" line="56"/>
+ <location filename="../qml-i18n.qml" line="66"/>
<source>Hello</source>
<translation>G&apos;day</translation>
</message>
diff --git a/examples/qml/qml-i18n/i18n/qml_fr.ts b/examples/qml/qml-i18n/i18n/qml_fr.ts
index 41ca3a9194..363bebb395 100644
--- a/examples/qml/qml-i18n/i18n/qml_fr.ts
+++ b/examples/qml/qml-i18n/i18n/qml_fr.ts
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="fr" sourcelanguage="en">
+<TS version="2.1" language="fr" sourcelanguage="en">
<context>
<name>qml-i18n</name>
<message>
- <location filename="../qml-i18n.qml" line="56"/>
+ <location filename="../qml-i18n.qml" line="66"/>
<source>Hello</source>
<translation>Bonjour</translation>
</message>
diff --git a/examples/quick/demos/photoviewer/i18n/qml_en.qm b/examples/quick/demos/photoviewer/i18n/qml_en.qm
new file mode 100644
index 0000000000..9dad8dffce
--- /dev/null
+++ b/examples/quick/demos/photoviewer/i18n/qml_en.qm
Binary files differ
diff --git a/examples/quick/demos/photoviewer/i18n/qml_en.ts b/examples/quick/demos/photoviewer/i18n/qml_en.ts
new file mode 100644
index 0000000000..5315a75526
--- /dev/null
+++ b/examples/quick/demos/photoviewer/i18n/qml_en.ts
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
+</TS>