From 06aaeef105e29344420390421bfa0d910d99a7bf Mon Sep 17 00:00:00 2001
From: Daiwei Li <daiweili@suitabletech.com>
Date: Sat, 20 Feb 2016 14:24:54 -0800
Subject: [PATCH] nacl-configure: Don't skip xmlpatterns
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
qtxmlpatterns compiles/works on nacl
Change-Id: I4448ab9a03d0a52c591d0491ac8ca0a49e8a068f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
---
nacl-configure | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/nacl-configure b/nacl-configure
index 4e9762b30e9..3dbd9fda9c9 100755
--- a/nacl-configure
+++ b/nacl-configure
@@ -5,7 +5,7 @@
if [[ -z "$NACL_SDK_ROOT" ]]
then
echo ""
- echo Set NACL_SDK_ROOT before running nacl-configure.
+ echo Set NACL_SDK_ROOT before running nacl-configure.
echo Example: export NACL_SDK_ROOT=/Users/USER/code/nacl_sdk/pepper_35
echo ""
exit
@@ -32,7 +32,7 @@ if [ $# -eq 0 ]
echo ""
echo "No arguments supplied. Usage:"
echo "\"nacl-configure <tooolchain> [release|debug] [32|64]"
- echo "Toolchain is one of:"
+ echo "Toolchain is one of:"
echo " ${platform}_arm_newlib"
echo " ${platform}_pnacl"
echo " ${platform}_x86_glibc"
@@ -40,7 +40,7 @@ if [ $# -eq 0 ]
echo " emscripten"
echo " host"
echo ""
- exit
+ exit
fi
# QtBase and configure script location. Look for ../configure first,
@@ -209,7 +209,7 @@ if [[ $TOOLCHAIN != "host" ]]; then
NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -no-sse2"
fi
# misc
-NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -no-qpa-platform-guard -skip xmlpatterns -no-warnings-are-errors -no-qml-debug -no-dbus"
+NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -no-qpa-platform-guard -no-warnings-are-errors -no-qml-debug -no-dbus"
# Newlib is static builds only.
if [[ $QT_MKSPEC == *newlib* ]]
@@ -217,7 +217,7 @@ if [[ $QT_MKSPEC == *newlib* ]]
NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -static"
fi
-# C++11 is broken on pnacl, see Chromium bug 314944
+# C++11 is broken on pnacl, see Chromium bug 314944
if [[ $QT_MKSPEC == *pnacl* ]]
then
NACL_CONFIGURE_LINE="$NACL_CONFIGURE_LINE -no-c++11"
--
GitLab