diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-01 11:05:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-01 11:05:26 +0200 |
| commit | 0aa2d318b1524cdab42ab9988270779ddcc1922a (patch) | |
| tree | 695c70702763ba2c66eb398ae9d545fc712a9e2d /src/corelib/doc/snippets/hellotrmain.cpp | |
| parent | 6251d4dafc86bcbec09d1962050af9924249d419 (diff) | |
| parent | 49049d90470eb3e94bda77d19ab7f7c57a0bd57f (diff) | |
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
Diffstat (limited to 'src/corelib/doc/snippets/hellotrmain.cpp')
| -rw-r--r-- | src/corelib/doc/snippets/hellotrmain.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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(); |