diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 16:12:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 16:12:03 (GMT) |
| commit | 9af7a61ff462ed1668838be949dac376adfb2c6c (patch) | |
| tree | 437e1a5125a6cfdf9b161fdff3b1d20cb3e4e59a /examples/xmlpatterns/filetree/mainwindow.cpp | |
| parent | f710dfded9da517e6451809f81a8cc12ac4f3883 (diff) | |
| parent | 8bc0dce2c74c28acd36daa73e84f7c9d79760e4a (diff) | |
| download | Qt-9af7a61ff462ed1668838be949dac376adfb2c6c.zip Qt-9af7a61ff462ed1668838be949dac376adfb2c6c.tar.gz Qt-9af7a61ff462ed1668838be949dac376adfb2c6c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QString usage cleanups
Add some more changes for 4.7.0
Doc: removing bug breaking the article into pages. These pages was not linked anywhere.
QDeclarative: Fix spelling mistake.
Wrap translatable messages with tr() in assistant, designer and linguist
Enable loading/generating translations by assistant and linguist tools
Diffstat (limited to 'examples/xmlpatterns/filetree/mainwindow.cpp')
| -rw-r--r-- | examples/xmlpatterns/filetree/mainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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] |