Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

3 files changed, 5 insertions, 5 deletions

diff --git a/examples/sql/masterdetail/mainwindow.cpp b/examples/sql/masterdetail/mainwindow.cpp
index b8c9df6..2ef8ad0 100644
--- a/examples/sql/masterdetail/mainwindow.cpp
+++ b/examples/sql/masterdetail/mainwindow.cpp
@@ -189,9 +189,9 @@ void MainWindow::deleteAlbum()
 
         QMessageBox::StandardButton button;
         button = QMessageBox::question(this, tr("Delete Album"),
-                                       QString(tr("Are you sure you want to " \
-                                                  "delete '%1' by '%2'?"))
-                                              .arg(title).arg(artist),
+                                       tr("Are you sure you want to "
+                                          "delete '%1' by '%2'?")
+                                       .arg(title, artist),
                                        QMessageBox::Yes | QMessageBox::No);
 
         if (button == QMessageBox::Yes) {
diff --git a/examples/tools/treemodelcompleter/mainwindow.cpp b/examples/tools/treemodelcompleter/mainwindow.cpp
index 0448e9d..cfe003a 100644
--- a/examples/tools/treemodelcompleter/mainwindow.cpp
+++ b/examples/tools/treemodelcompleter/mainwindow.cpp
@@ -241,6 +241,6 @@ void MainWindow::changeCase(int cs)
 
 void MainWindow::updateContentsLabel(const QString& sep)
 {
-    contentsLabel->setText(QString(tr("Type path from model above with items at each level separated by a '%1'")).arg(sep));
+    contentsLabel->setText(tr("Type path from model above with items at each level separated by a '%1'").arg(sep));
 }
 
diff --git a/examples/xmlpatterns/filetree/mainwindow.cpp b/examples/xmlpatterns/filetree/mainwindow.cpp
index 5b9b0c3..85348f3 100644
--- a/examples/xmlpatterns/filetree/mainwindow.cpp
+++ b/examples/xmlpatterns/filetree/mainwindow.cpp
@@ -140,7 +140,7 @@ void MainWindow::loadDirectory(const QString &directory)
     QXmlFormatter formatter(query, &buffer);
     query.evaluateTo(&formatter);
 
-    treeInfo->setText((QString(tr("Model of %1 output as XML.")).arg(directory)));
+    treeInfo->setText(tr("Model of %1 output as XML.").arg(directory));
     fileTree->setText(QString::fromLatin1(output.constData()));
     evaluateResult();
 //! [6]