summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/sdk/installerbase.cpp106
1 files changed, 53 insertions, 53 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index 870182e13..15073cf07 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -296,59 +296,6 @@ int main(int argc, char *argv[])
// instantiate the installer we are actually going to use
QInstaller::PackageManagerCore core(content.magicMarker(), content.performedOperations());
- if (QInstaller::isVerbose()) {
- qDebug() << "Resource tree after loading the in-binary resource:";
-
- QDir dir = QDir(QLatin1String(":/"));
- foreach (const QString &i, dir.entryList())
- qDebug() << QString::fromLatin1(" :/%1").arg(i);
-
- dir = QDir(QLatin1String(":/metadata/"));
- foreach (const QString &i, dir.entryList())
- qDebug() << QString::fromLatin1(" :/metadata/%1").arg(i);
-
- dir = QDir(QLatin1String(":/translations/"));
- foreach (const QString &i, dir.entryList())
- qDebug() << QString::fromLatin1(" :/translations/%1").arg(i);
- }
-
- const QString directory = QLatin1String(":/translations");
- const QStringList translations = core.settings().translations();
-
- // install the default Qt translator
- QScopedPointer<QTranslator> translator(new QTranslator(&app));
- foreach (const QLocale locale, QLocale().uiLanguages()) {
- // As there is no qt_en.qm, we simply end the search when the next
- // preferred language is English.
- if (locale.language() == QLocale::English)
- break;
- if (translator->load(locale, QLatin1String("qt"), QString::fromLatin1("_"), directory)) {
- app.installTranslator(translator.take());
- break;
- }
- }
-
- translator.reset(new QTranslator(&app));
- // install English translation as fallback so that correct license button text is used
- if (translator->load(QLatin1String("en_us"), directory))
- app.installTranslator(translator.take());
-
- if (translations.isEmpty()) {
- translator.reset(new QTranslator(&app));
- foreach (const QLocale locale, QLocale().uiLanguages()) {
- if (translator->load(locale, QLatin1String(""), QLatin1String(""), directory)) {
- app.installTranslator(translator.take());
- break;
- }
- }
- } else {
- foreach (const QString &translation, translations) {
- translator.reset(new QTranslator(&app));
- if (translator->load(translation, QLatin1String(":/translations")))
- app.installTranslator(translator.take());
- }
- }
-
QString controlScript;
QHash<QString, QString> params;
for (int i = 1; i < args.size(); ++i) {
@@ -413,6 +360,59 @@ int main(int argc, char *argv[])
}
}
+ if (QInstaller::isVerbose()) {
+ qDebug() << "Resource tree after loading the in-binary resource:";
+
+ QDir dir = QDir(QLatin1String(":/"));
+ foreach (const QString &i, dir.entryList())
+ qDebug() << QString::fromLatin1(" :/%1").arg(i);
+
+ dir = QDir(QLatin1String(":/metadata/"));
+ foreach (const QString &i, dir.entryList())
+ qDebug() << QString::fromLatin1(" :/metadata/%1").arg(i);
+
+ dir = QDir(QLatin1String(":/translations/"));
+ foreach (const QString &i, dir.entryList())
+ qDebug() << QString::fromLatin1(" :/translations/%1").arg(i);
+ }
+
+ const QString directory = QLatin1String(":/translations");
+ const QStringList translations = core.settings().translations();
+
+ // install the default Qt translator
+ QScopedPointer<QTranslator> translator(new QTranslator(&app));
+ foreach (const QLocale locale, QLocale().uiLanguages()) {
+ // As there is no qt_en.qm, we simply end the search when the next
+ // preferred language is English.
+ if (locale.language() == QLocale::English)
+ break;
+ if (translator->load(locale, QLatin1String("qt"), QString::fromLatin1("_"), directory)) {
+ app.installTranslator(translator.take());
+ break;
+ }
+ }
+
+ translator.reset(new QTranslator(&app));
+ // install English translation as fallback so that correct license button text is used
+ if (translator->load(QLatin1String("en_us"), directory))
+ app.installTranslator(translator.take());
+
+ if (translations.isEmpty()) {
+ translator.reset(new QTranslator(&app));
+ foreach (const QLocale locale, QLocale().uiLanguages()) {
+ if (translator->load(locale, QLatin1String(""), QLatin1String(""), directory)) {
+ app.installTranslator(translator.take());
+ break;
+ }
+ }
+ } else {
+ foreach (const QString &translation, translations) {
+ translator.reset(new QTranslator(&app));
+ if (translator->load(translation, QLatin1String(":/translations")))
+ app.installTranslator(translator.take());
+ }
+ }
+
// Create the wizard gui
TabController controller(0);
controller.setManager(&core);