diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-29 01:01:08 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-30 16:35:04 +0200 |
| commit | 83a73c8e5a05a1d3795fdbbad8b5b553e5bd723f (patch) | |
| tree | 7c336f32ed6b76233f4988cfb0910973a231e51a /examples/quick/demos/photoviewer | |
| parent | b8fd580cb3453b3850c36765c4b2537538d2f4f8 (diff) | |
| parent | 1d815780e020a7315dfc4762b6b0280834203e7e (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
examples/quick/tableview/pixelator/main.cpp
examples/quick/demos/
Change-Id: Id7eaae6584017a4ab4ec9dd97b56d5c1a417f0e3
Diffstat (limited to 'examples/quick/demos/photoviewer')
| -rw-r--r-- | examples/quick/demos/photoviewer/i18n/qml_en.qm | bin | 23 -> 0 bytes | |||
| -rw-r--r-- | examples/quick/demos/photoviewer/i18n/qml_en.ts | 4 |
2 files changed, 0 insertions, 4 deletions
diff --git a/examples/quick/demos/photoviewer/i18n/qml_en.qm b/examples/quick/demos/photoviewer/i18n/qml_en.qm Binary files differdeleted file mode 100644 index 9dad8dffce..0000000000 --- a/examples/quick/demos/photoviewer/i18n/qml_en.qm +++ /dev/null diff --git a/examples/quick/demos/photoviewer/i18n/qml_en.ts b/examples/quick/demos/photoviewer/i18n/qml_en.ts deleted file mode 100644 index 5315a75526..0000000000 --- a/examples/quick/demos/photoviewer/i18n/qml_en.ts +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="en"> -</TS> |