Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c

3 files changed, 18 insertions, 4 deletions

diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp
index c76a0f1f3b..ab91a00f5f 100644
--- a/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp
@@ -51,7 +51,7 @@ if (data.open(QFile::WriteOnly | QFile::Truncate)) {
 //! [1]
 QTextStream stream(stdin);
 QString line;
-while (stream.readLine(&line)) {
+while (stream.readLineInto(&line)) {
     ...
 }
 //! [1]
diff --git a/src/corelib/doc/snippets/hellotrmain.cpp b/src/corelib/doc/snippets/hellotrmain.cpp
index 201202b7b3..dcf5805a8a 100644
--- a/src/corelib/doc/snippets/hellotrmain.cpp
+++ b/src/corelib/doc/snippets/hellotrmain.cpp
@@ -44,10 +44,11 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     QTranslator translator;
-    translator.load("hellotr_la");
-    app.installTranslator(&translator);
+    // look up e.g. :/translations/myapp_de.qm
+    if (translator.load(QLocale(), QLatin1String("myapp"), QLatin1String("_"), QLatin1String(":/translations")))
+        app.installTranslator(&translator);
 
-    QPushButton hello(QPushButton::tr("Hello world!"));
+    QPushButton hello(QCoreApplication::translate("main", "Hello world!"));
     hello.resize(100, 30);
 
     hello.show();
diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp
index 4687d52e54..e03e705a0b 100644
--- a/src/corelib/doc/snippets/qstring/main.cpp
+++ b/src/corelib/doc/snippets/qstring/main.cpp
@@ -261,6 +261,19 @@ void Widget::argFunction()
     str.arg("%1f").arg("Hello");    // returns "Hellof %2"
     //! [13]
 
+    //! [97]
+    str = "%1%3%2";
+    str.arg("Hello").arg(20).arg(50); // returns "Hello500"
+
+    str = "%1%2%3";
+    str.arg("Hello").arg(50).arg(20); // returns "Hello5020"
+    //! [97]
+
+    //! [98]
+    str = "%1%2%3";
+    str.arg("Hello", QString::number(20), QString::number(50)); // returns "Hello5020"
+    //! [98]
+
     //! [14]
     str = QString("Decimal 63 is %1 in hexadecimal")
             .arg(63, 0, 16);