aboutsummaryrefslogtreecommitdiffstats
path: root/examples/qml
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-03-04 17:22:11 +0200
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2020-03-05 11:18:50 +0200
commit069afedec9e42c1d3ce6673a405337dfbc309992 (patch)
tree2429846399126e0fcafb37e22ddd7f8fd76d3b9e /examples/qml
parent1fef24732bb5114392626a7fef956625a6cc66ac (diff)
Examples: add .pro project for qml-i18n example
Currently only the .qmlproject is available for this project, which won't deploy on Android, thus adding .pro project files. Also, since the translation won't work without the *.qm files being present as resources, those files are included by default with example. Task-number: QTBUG-80717 Change-Id: I86ac6c4097e4207b7f62d628f9a72439e78639db Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'examples/qml')
-rw-r--r--examples/qml/qml-i18n/doc/src/i18n.qdoc2
-rw-r--r--examples/qml/qml-i18n/i18n/base.ts2
-rw-r--r--examples/qml/qml-i18n/i18n/qml_en_AU.ts2
-rw-r--r--examples/qml/qml-i18n/i18n/qml_fr.ts2
-rw-r--r--examples/qml/qml-i18n/main.cpp68
-rw-r--r--examples/qml/qml-i18n/qml-i18n.pro17
-rw-r--r--examples/qml/qml-i18n/qml-i18n.qml10
-rw-r--r--examples/qml/qml-i18n/qml-i18n.qrc5
8 files changed, 101 insertions, 7 deletions
diff --git a/examples/qml/qml-i18n/doc/src/i18n.qdoc b/examples/qml/qml-i18n/doc/src/i18n.qdoc
index dbc4efa58c..48946aac9c 100644
--- a/examples/qml/qml-i18n/doc/src/i18n.qdoc
+++ b/examples/qml/qml-i18n/doc/src/i18n.qdoc
@@ -52,4 +52,6 @@
lrelease i18n/*.ts
\endcode
+\note On Android, please make sure to include the generated *.qm files as resources.
+
*/
diff --git a/examples/qml/qml-i18n/i18n/base.ts b/examples/qml/qml-i18n/i18n/base.ts
index 77c640f370..99ceeeb016 100644
--- a/examples/qml/qml-i18n/i18n/base.ts
+++ b/examples/qml/qml-i18n/i18n/base.ts
@@ -4,7 +4,7 @@
<context>
<name>qml-i18n</name>
<message>
- <location filename="../qml-i18n.qml" line="66"/>
+ <location filename="../qml-i18n.qml" line="68"/>
<source>Hello</source>
<translation type="unfinished"></translation>
</message>
diff --git a/examples/qml/qml-i18n/i18n/qml_en_AU.ts b/examples/qml/qml-i18n/i18n/qml_en_AU.ts
index 86ccfb7bf8..feb4f9e9c0 100644
--- a/examples/qml/qml-i18n/i18n/qml_en_AU.ts
+++ b/examples/qml/qml-i18n/i18n/qml_en_AU.ts
@@ -4,7 +4,7 @@
<context>
<name>qml-i18n</name>
<message>
- <location filename="../qml-i18n.qml" line="66"/>
+ <location filename="../qml-i18n.qml" line="68"/>
<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 363bebb395..c4872e63d0 100644
--- a/examples/qml/qml-i18n/i18n/qml_fr.ts
+++ b/examples/qml/qml-i18n/i18n/qml_fr.ts
@@ -4,7 +4,7 @@
<context>
<name>qml-i18n</name>
<message>
- <location filename="../qml-i18n.qml" line="66"/>
+ <location filename="../qml-i18n.qml" line="68"/>
<source>Hello</source>
<translation>Bonjour</translation>
</message>
diff --git a/examples/qml/qml-i18n/main.cpp b/examples/qml/qml-i18n/main.cpp
new file mode 100644
index 0000000000..0680dc8b41
--- /dev/null
+++ b/examples/qml/qml-i18n/main.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+
+int main(int argc, char *argv[])
+{
+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QGuiApplication app(argc, argv);
+ QQmlApplicationEngine engine;
+ const QUrl url(QStringLiteral("qrc:/qml-i18n.qml"));
+
+ QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
+ &app, [url](QObject *obj, const QUrl &objUrl) {
+ if (!obj && url == objUrl)
+ QCoreApplication::exit(-1);
+ }, Qt::QueuedConnection);
+ engine.load(url);
+
+ return app.exec();
+}
diff --git a/examples/qml/qml-i18n/qml-i18n.pro b/examples/qml/qml-i18n/qml-i18n.pro
new file mode 100644
index 0000000000..847c741b00
--- /dev/null
+++ b/examples/qml/qml-i18n/qml-i18n.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+RESOURCES += qml-i18n.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/qml-i18n
+INSTALLS += target
+
+CONFIG += lrelease embed_translations
+
+TRANSLATIONS += \
+ i18n/base.ts \
+ i18n/qml_en.ts \
+ i18n/qml_en_AU.ts \
+ i18n/qml_fr.ts
diff --git a/examples/qml/qml-i18n/qml-i18n.qml b/examples/qml/qml-i18n/qml-i18n.qml
index 217ffb56ae..85c4c44160 100644
--- a/examples/qml/qml-i18n/qml-i18n.qml
+++ b/examples/qml/qml-i18n/qml-i18n.qml
@@ -48,17 +48,19 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.12
+import QtQuick.Window 2.12
-Rectangle {
+Window {
+ visible: true
width: 640; height: 480
Column {
anchors.fill: parent; spacing: 20
Text {
- text: "If a translation is available for the system language (eg. French) then the "+
- "string below will translated (eg. 'Bonjour'). Otherwise it will show 'Hello'."
+ text: "If a translation is available for the system language (eg. French) then the " +
+ "string below will be translated (eg. 'Bonjour'). Otherwise it will show 'Hello'."
width: parent.width; wrapMode: Text.WordWrap
}
diff --git a/examples/qml/qml-i18n/qml-i18n.qrc b/examples/qml/qml-i18n/qml-i18n.qrc
new file mode 100644
index 0000000000..3a505b1665
--- /dev/null
+++ b/examples/qml/qml-i18n/qml-i18n.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/">
+ <file>qml-i18n.qml</file>
+ </qresource>
+</RCC>