src/androiddeployqt/main.cpp

@@ -1795,17 +1795,9 @@ bool readDependencies(Options *options)
     if (!readDependenciesFromElf(options, options->applicationBinary, &usedDependencies, &remainingDependencies))
         return false;
 
-    // Until we have support non-gui applications on Android, always add Qt Gui
-    // as a dependency (otherwise the platform plugin cannot be deployed, and
-    // the application will not run).
-    QLatin1String guiLib("lib/libQt5Gui.so");
-    if (!usedDependencies.contains(guiLib)) {
-        QtDependency dep(guiLib, options->qtInstallDirectory + QLatin1Char('/') + guiLib);
-        options->qtDependencies.append(dep);
-        usedDependencies.insert(guiLib);
-        if (!readAndroidDependencyXml(options, QLatin1String("Qt5Gui"), &usedDependencies, &remainingDependencies))
-            return false;
-    }
+    // Jam in the dependencies of the platform plugin, since the application will crash without it
+    if (!readDependenciesFromElf(options, options->qtInstallDirectory + QLatin1String("/plugins/platforms/android/libqtforandroid.so"), &usedDependencies, &remainingDependencies))
+        return false;
 
     QString qtDir = options->qtInstallDirectory + QLatin1Char('/');
 

src/linguist/shared/numerus.cpp

@@ -100,9 +100,6 @@ static const uchar arabicRules[] =
 static const uchar tagalogRules[] =
     { Q_LEQ, 1, Q_NEWRULE,
       Q_MOD_10 | Q_EQ, 4, Q_OR, Q_MOD_10 | Q_EQ, 6, Q_OR, Q_MOD_10 | Q_EQ, 9 };
-static const uchar catalanRules[] =
-    { Q_EQ, 1, Q_NEWRULE,
-      Q_LEAD_1000 | Q_EQ, 11 };
 
 static const char * const japaneseStyleForms[] = { "Universal Form", 0 };
 static const char * const englishStyleForms[] = { "Singular", "Plural", 0 };
@@ -128,7 +125,6 @@ static const char * const arabicForms[] =
     { "Nullar", "Singular", "Dual", "Minority Plural", "Plural", "Plural (100-102, ...)", 0 };
 static const char * const tagalogForms[] =
     { "Singular", "Plural (consonant-ended)", "Plural (vowel-ended)", 0 };
-static const char * const catalanForms[] = { "Singular", "Undecal (11)", "Plural", 0 };
 
 #define EOL QLocale::C
 
@@ -173,6 +169,7 @@ static const QLocale::Language englishStyleLanguages[] = {
     QLocale::Bengali,
     QLocale::Bihari,
     QLocale::Bulgarian,
+    QLocale::Catalan,
     QLocale::Cornish,
     QLocale::Corsican,
     QLocale::Danish,
@@ -301,7 +298,6 @@ static const QLocale::Language malteseLanguage[] = { QLocale::Maltese, EOL };
 static const QLocale::Language welshLanguage[] = { QLocale::Welsh, EOL };
 static const QLocale::Language arabicLanguage[] = { QLocale::Arabic, EOL };
 static const QLocale::Language tagalogLanguage[] = { QLocale::Tagalog, EOL };
-static const QLocale::Language catalanLanguage[] = { QLocale::Catalan, EOL };
 
 static const QLocale::Country frenchStyleCountries[] = {
     // keep synchronized with frenchStyleLanguages
@@ -357,8 +353,6 @@ static const NumerusTableEntry numerusTable[] = {
       "nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : (n%100>=3 && n%100<=10) ? 3 : n%100>=11 ? 4 : 5);" },
     { tagalogRules, sizeof(tagalogRules), tagalogForms, tagalogLanguage, 0,
       "nplurals=3; plural=(n==1 ? 0 : (n%10==4 || n%10==6 || n%10== 9) ? 1 : 2);" },
-    { catalanRules, sizeof(catalanRules), catalanForms, catalanLanguage, 0,
-      "nplurals=3; plural=(n==1 ? 0 : (n==11 || n/1000==11 || n/1000000==11 || n/1000000000==11) ? 1 : 2);" },
 };
 
 static const int NumerusTableSize = sizeof(numerusTable) / sizeof(numerusTable[0]);