Build all languages (layouts) by default

Previously we were only building all languages when the module was
built with a developer build of Qt and for auto tests. However, since
users have to build the example themselves (since we don't provide
example binaries), they will only see en_GB by default.

This change makes it so that the user will have access to all available
languages by default. Users that don't want or need all languages for
their application can specify individual languages with e.g.
CONFIG+=lang-es_ES.

Change-Id: I643ab6c7a1f01426a3ef86a886a4a4dd10ad00f6
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

3 files changed, 25 insertions, 9 deletions

diff --git a/src/config.pri b/src/config.pri
index 21ba6842..94ce1fa4 100644
--- a/src/config.pri
+++ b/src/config.pri
@@ -20,14 +20,8 @@ disable-layouts {
     pinyin: CONFIG += lang-zh_CN
     tcime|zhuyin|cangjie: CONFIG += lang-zh_TW
 
-    # Default language
-    !contains(CONFIG, lang-.*) {
-        contains(QT_CONFIG, private_tests) { # CI or developer build, use all languages
-            CONFIG += lang-all
-        } else {
-            CONFIG += lang-en_GB
-        }
-    }
+    # Use all languages by default
+    !contains(CONFIG, lang-.*): CONFIG += lang-all
 
     # Flag for activating all languages
     lang-all: CONFIG += \
diff --git a/src/virtualkeyboard/doc/src/build.qdoc b/src/virtualkeyboard/doc/src/build.qdoc
index a858cdea..a3b9c7a6 100644
--- a/src/virtualkeyboard/doc/src/build.qdoc
+++ b/src/virtualkeyboard/doc/src/build.qdoc
@@ -116,7 +116,7 @@ keyboard features.
 
         For example, \c CONFIG+=lang-fi activates the Finnish language.
 
-        The virtual keyboard automatically includes the English language if no other languages
+        The virtual keyboard automatically includes all languages if no other languages
         are specified.
 \row
     \li \e lang-all
@@ -125,6 +125,9 @@ keyboard features.
         an alias for \c {CONFIG+="lang-ar_AR lang-da_DK lang-de_DE lang-en_GB lang-es_ES
         lang-fa_FA lang-fi_FI lang-fr_FR lang-hi_IN lang-it_IT lang-ja_JP lang-ko_KR lang-nb_NO
         lang-pl_PL lang-pt_PT lang-ru_RU lang-sv_SE lang-zh_CN lang-zh_TW"}
+
+        This option is enabled by default. To build only a specific language, use the
+        \c lang-<code> option above.
 \row
     \li \e handwriting
     \li Enables handwriting input
@@ -205,34 +208,46 @@ the preferred input method to the configuration, e.g., \c CONFIG+="lang-zh_TW zh
     \li Enables the Pinyin input method for Simplified Chinese.
     \li This option activates the Pinyin input method for the Simplified Chinese
         language.
+
+        \include build.qdocinc input-method-language-option-note
 \row
     \li \e tcime
     \li \e lang-zh_TW
     \li Enables the both Cangjie and Zhuyin input methods for Traditional Chinese.
     \li This option activates the both Cangjie and Zhuyin input methods for the
         Traditional Chinese language.
+
+        \include build.qdocinc input-method-language-option-note
 \row
     \li \e cangjie
     \li \e lang-zh_TW
     \li Enables the Cangjie input method for Traditional Chinese.
     \li This option activates the Cangjie input method for the Traditional Chinese
         language.
+
+        \include build.qdocinc input-method-language-option-note
 \row
     \li \e zhuyin
     \li \e lang-zh_TW
     \li Enables the Zhuyin input method for Traditional Chinese.
     \li This option activates the Zhuyin input method for the Traditional Chinese
         language.
+
+        \include build.qdocinc input-method-language-option-note
 \row
     \li \e hangul
     \li \e lang-ko_KR
     \li Enables the Hangul input method for Korean.
     \li This option activates the Hangul input method for the Korean language.
+
+    \include build.qdocinc input-method-language-option-note
 \row
     \li \e openwnn
     \li \e lang-ja_JP
     \li Enables the OpenWnn input method for Japanese.
     \li This option activates the OpenWnn input method for the Japanese language.
+
+    \include build.qdocinc input-method-language-option-note
 \row
     \li \e lipi-toolkit
     \li \e handwriting
diff --git a/src/virtualkeyboard/doc/src/includes/build.qdocinc b/src/virtualkeyboard/doc/src/includes/build.qdocinc
new file mode 100644
index 00000000..44988ce7
--- /dev/null
+++ b/src/virtualkeyboard/doc/src/includes/build.qdocinc
@@ -0,0 +1,7 @@
+//! [input-method-language-option-note]
+
+As this option activates a particular language, the \c lang-all option
+will not be enabled if this option is specified. To build all languages,
+use \c CONFIG+=lang-all.
+
+//! [input-method-language-option-note]