From 785b12a4d126b8aaac6c378d06a5c885aa5441a7 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 Jun 2018 17:25:59 +0200 Subject: photoviewer: Use QLocale::uiLanguages() for finding translations Now that we ship en translations, we can use the QTranslator::load(QLocale, ...) overload to correctly find translated files. Task-number: QTBUG-69196 Change-Id: Ic7f7a2c70763f0c7200782d6e46644f2b3f7f3ef Reviewed-by: Simon Hausmann --- examples/quick/demos/photoviewer/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/quick/demos') diff --git a/examples/quick/demos/photoviewer/main.cpp b/examples/quick/demos/photoviewer/main.cpp index a269a61dcb..6276bd61a5 100644 --- a/examples/quick/demos/photoviewer/main.cpp +++ b/examples/quick/demos/photoviewer/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) QGuiApplication app(argc, argv); QTranslator qtTranslator; - qtTranslator.load("qml_" + QLocale::system().name(), ":/i18n/"); + qtTranslator.load(QLocale(), "qml", "_", ":/i18n/"); app.installTranslator(&qtTranslator); QQmlApplicationEngine engine; -- cgit v1.2.3 From 90ab10ed2d8c96a7288c23b2482037fac36b1286 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 24 Jul 2018 22:37:48 +0200 Subject: Examples: Remove the metadata from some docs screen shots The Welcome/Examples screen in Qt Creator would otherwise emit: "libpng warning: iCCP: known incorrect sRGB profile" The metadata was removed with the command optipng -o7 -strip all Change-Id: Ic51155fd4e20193e77e20559f2acdc0319c19b8f Reviewed-by: Mitch Curtis Reviewed-by: Tobias Hunger --- .../doc/images/qtquick-demo-clocks-small.png | Bin 26067 -> 23332 bytes .../doc/images/qtquick-demo-maroon-med-2.png | Bin 61303 -> 58609 bytes .../doc/images/qtquick-demo-photoviewer-small.png | Bin 73662 -> 70963 bytes .../doc/images/qtquick-demo-samegame-med-1.png | Bin 100713 -> 97978 bytes .../doc/images/qtquick-demo-tweetsearch-med-1.png | Bin 18531 -> 15837 bytes 5 files changed, 0 insertions(+), 0 deletions(-) (limited to 'examples/quick/demos') diff --git a/examples/quick/demos/clocks/doc/images/qtquick-demo-clocks-small.png b/examples/quick/demos/clocks/doc/images/qtquick-demo-clocks-small.png index 94b641d891..7269e8780d 100644 Binary files a/examples/quick/demos/clocks/doc/images/qtquick-demo-clocks-small.png and b/examples/quick/demos/clocks/doc/images/qtquick-demo-clocks-small.png differ diff --git a/examples/quick/demos/maroon/doc/images/qtquick-demo-maroon-med-2.png b/examples/quick/demos/maroon/doc/images/qtquick-demo-maroon-med-2.png index c8f37486f6..2b5c238c82 100644 Binary files a/examples/quick/demos/maroon/doc/images/qtquick-demo-maroon-med-2.png and b/examples/quick/demos/maroon/doc/images/qtquick-demo-maroon-med-2.png differ diff --git a/examples/quick/demos/photoviewer/doc/images/qtquick-demo-photoviewer-small.png b/examples/quick/demos/photoviewer/doc/images/qtquick-demo-photoviewer-small.png index d872310a3e..3809d2b45d 100644 Binary files a/examples/quick/demos/photoviewer/doc/images/qtquick-demo-photoviewer-small.png and b/examples/quick/demos/photoviewer/doc/images/qtquick-demo-photoviewer-small.png differ diff --git a/examples/quick/demos/samegame/doc/images/qtquick-demo-samegame-med-1.png b/examples/quick/demos/samegame/doc/images/qtquick-demo-samegame-med-1.png index cce9f11017..b13a62d540 100644 Binary files a/examples/quick/demos/samegame/doc/images/qtquick-demo-samegame-med-1.png and b/examples/quick/demos/samegame/doc/images/qtquick-demo-samegame-med-1.png differ diff --git a/examples/quick/demos/tweetsearch/doc/images/qtquick-demo-tweetsearch-med-1.png b/examples/quick/demos/tweetsearch/doc/images/qtquick-demo-tweetsearch-med-1.png index 930ee39929..14ac8a1751 100644 Binary files a/examples/quick/demos/tweetsearch/doc/images/qtquick-demo-tweetsearch-med-1.png and b/examples/quick/demos/tweetsearch/doc/images/qtquick-demo-tweetsearch-med-1.png differ -- cgit v1.2.3