[Libreoffice-commits] online.git: configure.ac ios/Mobile.xcodeproj

[Tor Lillqvist (via logerrit)]

 configure.ac                         |    1 +
 ios/Mobile.xcodeproj/project.pbxproj |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3de577d2c20d83be0079be4066196b476c46fa8d
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Feb 25 17:29:09 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Feb 25 21:40:03 2020 +0100

    Use the loolkitconfig-mobile.xcu on iOS, too
    
    We can't rename a file in the Xcode project, so copy it to
    ios/Mobile/loolkitconfig.xcu in the configure script, and use from
    there.
    
    Change-Id: I1e50235c06f528dd24d0d968aaccc994418b57d8
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89466
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index 398d303e3..1a038efaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -983,6 +983,7 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
               # iOS app.
               touch ios/Mobile/Branding/branding.css
           fi
+          cp loolkitconfig-mobile.xcu ios/Mobile/loolkitconfig.xcu
        fi
       ])
 AC_SUBST(IOSAPP_FONTS)
diff --git a/ios/Mobile.xcodeproj/project.pbxproj b/ios/Mobile.xcodeproj/project.pbxproj
index 9fab320d2..e20f49084 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -598,7 +598,7 @@
 		BE7D6A6523FA9C2700C2E605 /* defaultprovider.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = defaultprovider.hxx; path = "../../ios-device/configmgr/source/defaultprovider.hxx"; sourceTree = "<group>"; };
 		BE7D6A6623FA9C2700C2E605 /* parser.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = parser.hxx; path = "../../ios-device/configmgr/source/parser.hxx"; sourceTree = "<group>"; };
 		BE7D6A6723FA9C2700C2E605 /* rootnode.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rootnode.cxx; path = "../../ios-device/configmgr/source/rootnode.cxx"; sourceTree = "<group>"; };
-		BE7D6A6A23FAA8B500C2E605 /* loolkitconfig.xcu */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = loolkitconfig.xcu; path = ../../../loolkitconfig.xcu; sourceTree = "<group>"; };
+		BE7D6A6A23FAA8B500C2E605 /* loolkitconfig.xcu */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = loolkitconfig.xcu; path = ../loolkitconfig.xcu; sourceTree = "<group>"; };
 		BE7E5B7623AD07BE00F9462A /* SvxPresetListBox.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SvxPresetListBox.cxx; path = "../../ios-device/svx/source/tbxctrls/SvxPresetListBox.cxx"; sourceTree = "<group>"; };
 		BE7E5B7723AD07BE00F9462A /* tbxcolor.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxcolor.cxx; path = "../../ios-device/svx/source/tbxctrls/tbxcolor.cxx"; sourceTree = "<group>"; };
 		BE7E5B7823AD07BE00F9462A /* tbxdrctl.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxdrctl.cxx; path = "../../ios-device/svx/source/tbxctrls/tbxdrctl.cxx"; sourceTree = "<group>"; };