diff options
| author | Matti Paaso <matti.paaso@digia.com> | 2014-02-24 13:14:05 +0200 |
|---|---|---|
| committer | Matti Paaso <matti.paaso@digia.com> | 2014-02-24 12:21:12 +0100 |
| commit | 11187e565169672ff16bae684026491c9bc33dc9 (patch) | |
| tree | bcfeff51fecdeb3c2b09de1d2f5f89948f6fd5cd | |
| parent | c62c4f4976a543999d5d94ccdc44784851226bbf (diff) | |
Android configuration changed.
Now the only way to enable Neon is to change the mkspec. There is no
configure switch for -neon or -no-neon.
Change-Id: Ia376fcb0402e1ac21a617f5fc39496c1d00be69b
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
8 files changed, 8 insertions, 8 deletions
diff --git a/packaging-tools/bld_config/configure_android_armv5_enterprise b/packaging-tools/bld_config/configure_android_armv5_enterprise index 284528182..8bffa0d71 100644 --- a/packaging-tools/bld_config/configure_android_armv5_enterprise +++ b/packaging-tools/bld_config/configure_android_armv5_enterprise @@ -1 +1 @@ --commercial -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch armeabi -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-neon -no-icu -openssl +-commercial -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch armeabi -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-icu -openssl diff --git a/packaging-tools/bld_config/configure_android_armv5_opensource b/packaging-tools/bld_config/configure_android_armv5_opensource index c81990f6f..4aaa0e4c7 100644 --- a/packaging-tools/bld_config/configure_android_armv5_opensource +++ b/packaging-tools/bld_config/configure_android_armv5_opensource @@ -1 +1 @@ --opensource -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch armeabi -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-neon -no-icu -openssl +-opensource -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch armeabi -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-icu -openssl diff --git a/packaging-tools/bld_config/configure_android_armv7_enterprise b/packaging-tools/bld_config/configure_android_armv7_enterprise index f143babdb..98dae11f5 100644 --- a/packaging-tools/bld_config/configure_android_armv7_enterprise +++ b/packaging-tools/bld_config/configure_android_armv7_enterprise @@ -1 +1 @@ --commercial -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch armeabi-v7a -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-neon -no-icu -openssl +-commercial -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch armeabi-v7a -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-icu -openssl diff --git a/packaging-tools/bld_config/configure_android_armv7_opensource b/packaging-tools/bld_config/configure_android_armv7_opensource index cd4457694..4f36b8988 100644 --- a/packaging-tools/bld_config/configure_android_armv7_opensource +++ b/packaging-tools/bld_config/configure_android_armv7_opensource @@ -1 +1 @@ --opensource -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch armeabi-v7a -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-neon -no-icu -openssl +-opensource -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch armeabi-v7a -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-icu -openssl diff --git a/packaging-tools/bld_config/configure_android_mips_enterprise b/packaging-tools/bld_config/configure_android_mips_enterprise index 48688541b..1a724d7e9 100644 --- a/packaging-tools/bld_config/configure_android_mips_enterprise +++ b/packaging-tools/bld_config/configure_android_mips_enterprise @@ -1 +1 @@ --commercial -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch mips -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-neon -no-icu -openssl +-commercial -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch mips -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-icu -openssl diff --git a/packaging-tools/bld_config/configure_android_mips_opensource b/packaging-tools/bld_config/configure_android_mips_opensource index 3f128ddf0..254435fce 100644 --- a/packaging-tools/bld_config/configure_android_mips_opensource +++ b/packaging-tools/bld_config/configure_android_mips_opensource @@ -1 +1 @@ --opensource -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch mips -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-neon -no-icu -openssl +-opensource -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch mips -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-icu -openssl diff --git a/packaging-tools/bld_config/configure_android_x86_enterprise b/packaging-tools/bld_config/configure_android_x86_enterprise index cf9208a47..e3969d0d3 100644 --- a/packaging-tools/bld_config/configure_android_x86_enterprise +++ b/packaging-tools/bld_config/configure_android_x86_enterprise @@ -1 +1 @@ --commercial -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch x86 -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-neon -no-icu -openssl +-commercial -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch x86 -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-icu -openssl diff --git a/packaging-tools/bld_config/configure_android_x86_opensource b/packaging-tools/bld_config/configure_android_x86_opensource index 4fd907185..7c211971e 100644 --- a/packaging-tools/bld_config/configure_android_x86_opensource +++ b/packaging-tools/bld_config/configure_android_x86_opensource @@ -1 +1 @@ --opensource -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch x86 -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-neon -no-icu -openssl +-opensource -confirm-license -release -xplatform android-g++ -opengl es2 -android-arch x86 -nomake tests -nomake examples -skip qtserialport -skip qtwebkit -skip qtwebkit-examples -skip qtx11extras -sysconfdir /etc/xdg -no-icu -openssl |