Changeset 4cc94b19ad in tspsg

Timestamp:

Oct 13, 2012, 10:23:57 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

2d4659ddfe

Parents:

b96b44b6b7

git-author:

Oleksii Serdiuk <contacts@…> (10/13/12 22:23:57)

git-committer:

Oleksii Serdiuk <contacts@…> (10/13/12 22:58:57)

Message:

Also add Qt translations when installing on Windows.

Files:

• install.pri (modified) (3 diffs)
• src/mainwindow.cpp (modified) (1 diff)

install.pri

@@ -50 +50 @@
     # This is automatically set by qmake when creating VS Solution file.
     share.sources = $$share.files
-#       l10n.sources = $$l10n.files \
-#               $$[QT_INSTALL_TRANSLATIONS]/*.qm
+    l10n.sources = $$l10n.files \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_ru.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm
     docs.sources = $$docs.files
 
-    DEPLOYMENT += target share docs # l10n
+    DEPLOYMENT += target share l10n docs
     DEPLOYMENT_PLUGIN += qjpeg qtiff
 } else:win32 {
@@ -67 +68 @@
         share.files += $$[QT_INSTALL_BINS]/QtSvg$${D}4.dll
     }
-#       l10n.files += $$[QT_INSTALL_TRANSLATIONS]/*.qm
+    l10n.files += $$[QT_INSTALL_TRANSLATIONS]/qt_ru.qm \
+        $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm
     win32-g++ {
         share.files += $$[QT_INSTALL_BINS]/mingwm10.dll \
@@ -74 +76 @@
     imageformats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${D}4.dll \
         $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${D}4.dll
-    imageformats.path = $$PREFIX/TSPSG/imageformats
-    INSTALLS += share imageformats
+    INSTALLS += share l10n imageformats
 
     target.path = $$PREFIX/TSPSG
     share.path = $$PREFIX/TSPSG
-#       l10n.path = $$PREFIX/TSPSG/l10n
+    l10n.path = $$PREFIX/TSPSG/l10n
+    imageformats.path = $$PREFIX/TSPSG/imageformats
     docs.path = $$PREFIX/TSPSG
 }

src/mainwindow.cpp

@@ -1567 +1567 @@
     qtTranslator = new QTranslator(this);
     if (qtTranslator->load("qt_" + lng, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
+        // Trying from QT_INSTALL_TRANSLATIONS directory
+        qApp->installTranslator(qtTranslator);
+    } else if (qtTranslator->load("qt_" + lng, PATH_L10N)) {
+        // Than from l10n directory bundled with TSPSG
         qApp->installTranslator(qtTranslator);
     } else {