Changeset b26801b000 in tspsg

Timestamp:

Jul 10, 2012, 5:44:43 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

0af510a462

Parents:

1299ea5b49

git-author:

Oleksii Serdiuk <contacts@…> (07/10/12 17:44:43)

git-committer:

Oleksii Serdiuk <contacts@…> (07/10/12 17:51:53)

Message:

Added a rule to run lrelease before running build.

qt_*.qm translations are no longer included into the resources.

Files:

• l10n/l10n.qrc (modified) (1 diff)
• src/mainwindow.cpp (modified) (1 diff)
• tspsg.pro (modified) (1 diff)

l10n/l10n.qrc

@@ -1 +1 @@
 <RCC>
     <qresource prefix="/l10n">
-        <file>qt_ru.qm</file>
-        <file>qt_uk.qm</file>
         <file>tspsg_en.qm</file>
         <file>tspsg_ru.qm</file>

src/mainwindow.cpp

@@ -1402 +1402 @@
     // Trying to load system Qt library translation...
     qtTranslator = new QTranslator(this);
-    if (qtTranslator->load("qt_" + lng, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+    if (qtTranslator->load("qt_" + lng, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
         qApp->installTranslator(qtTranslator);
-    else {
-        // No luck. Let's try to load a bundled one.
-        if (qtTranslator->load("qt_" + lng, PATH_L10N)) {
-            // We have a translation in the localization direcotry.
-            qApp->installTranslator(qtTranslator);
-        } else if (qtTranslator->load("qt_" + lng, ":/l10n")) {
-            // We have a translation "built-in" into application resources.
-            qApp->installTranslator(qtTranslator);
-        } else {
-            // Qt library translation unavailable for this language.
-            delete qtTranslator;
-            qtTranslator = NULL;
-        }
+    } else {
+        // Qt library translation unavailable for this language.
+        delete qtTranslator;
+        qtTranslator = NULL;
     }
 

tspsg.pro

@@ -56 +56 @@
 UI_DIR = tmp
 
+# We need to generate translations before building.
+# Either way, resource files won't compile.
+translations.name = Translations
+translations.input = TRANSLATIONS
+translations.output = $$_PRO_FILE_PWD_/l10n/${QMAKE_FILE_BASE}.qm
+translations.commands = $$[QT_INSTALL_BINS]/lrelease ${QMAKE_FILE_IN}
+translations.CONFIG = no_link
+QMAKE_EXTRA_COMPILERS += translations
+PRE_TARGETDEPS += compiler_translations_make_all
+
 # Include 3rd party libraries
 !handheld {