[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac distro-configs/LibreOfficeiOS.conf

[Libreoffice Gerrit user]

 configure.ac                       |    1 -
 distro-configs/LibreOfficeiOS.conf |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3fb045ce775c5c16c8d2604bc47d3cb01cc69cdb
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 5 23:02:46 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Nov 6 11:53:38 2018 +0100

    Don't default to only tango for iOS
    
    It doesn't have all the images that dialogs need, for instance the
    vcl/res/radio1.png.
    
    Change-Id: If7839fecb2358846b92d46a47cce3b97f7556711
    Reviewed-on: https://gerrit.libreoffice.org/62944
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index a964a00e44d7..c5901c169872 100644
--- a/configure.ac
+++ b/configure.ac
@@ -644,7 +644,6 @@ darwin*) # Mac OS X or iOS
         enable_postgresql_sdbc=no
         enable_extension_integration=no
         enable_report_builder=no
-        with_theme="tango"
         with_ppds=no
         if test "$enable_ios_simulator" = "yes"; then
             host=x86_64-apple-darwin
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 75f732c0abbc..c9aeca61e1b3 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -8,6 +8,8 @@
 --without-java
 --without-junit
 
+--with-theme=colibre tango
+
 --with-build-platform-configure-options=--with-system-jpeg=no
 --with-macosx-version-min-required=10.11