From 0d81667f87e80f7d0a866df3b0ee4a164f47e26d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 16 Aug 2019 14:26:32 +0200 Subject: Describe the -egl option in configure's help output Change-Id: Ibb47cfc2dd0b85c33a062d03aa4d43374f71ebb1 Fixes: QTBUG-54811 Reviewed-by: Laszlo Agocs --- config_help.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'config_help.txt') diff --git a/config_help.txt b/config_help.txt index fb37cbaed9..63ba289941 100644 --- a/config_help.txt +++ b/config_help.txt @@ -277,6 +277,7 @@ Gui, printing, widget options: es2 (default on Windows), desktop (default on Unix), dynamic (Windows only) -opengles3 ........... Enable OpenGL ES 3.x support instead of ES 2.x [auto] + -egl ................. Enable EGL support [auto] -angle ............... Use bundled ANGLE to support OpenGL ES 2.0 [auto] (Windows only) -combined-angle-lib .. Merge LibEGL and LibGLESv2 into LibANGLE (Windows only) -- cgit v1.2.3 From 3db14b5bd38001eea3e61009c2b7c108eced54dc Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 19 Aug 2019 11:42:51 +0300 Subject: Say hello to -android-abis configure param This configure parameter is useful to compile Qt only for a selected ABIs. The old parameter, -android-arch, does the same thing, it's kept for compatibility. [ChangeLog][Android] -android-abis configure script parameter useful to compile Qt only for a selected Android ABIs. Change-Id: I1f418c7e0914dd83b98d763e8cd8c09841e20fdf Reviewed-by: Eskil Abrahamsen Blomfeldt --- config_help.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config_help.txt') diff --git a/config_help.txt b/config_help.txt index 3f31fd351f..5880c1e00d 100644 --- a/config_help.txt +++ b/config_help.txt @@ -203,8 +203,8 @@ Build environment: -android-ndk-platform Set Android platform -android-ndk-host .... Set Android NDK host (linux-x86, linux-x86_64, etc.) [$ANDROID_NDK_HOST] - -android-arch ........ Set Android architecture (armeabi, armeabi-v7a, - arm64-v8a, x86, x86_64) + -android-abis ....... Comma separated Android abis, default is: + armeabi-v7a,arm64-v8a,x86,x86_64 -android-toolchain-version ... Set Android toolchain version -android-style-assets Automatically extract style assets from the device at run time. This option makes the Android style behave -- cgit v1.2.3 From 65dfc485adc1c5de4840f217c47c6ad79d26ae82 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 28 Aug 2019 08:31:00 +0300 Subject: Android: clean configure params for android MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -android-toolchain-version is not needed anymore as we are using exclusively the llvm toolchain. Change-Id: Ia033297a6a2c968352c364758eb1436380a5f96e Reviewed-by: Jörg Bornemann --- config_help.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'config_help.txt') diff --git a/config_help.txt b/config_help.txt index 5880c1e00d..e47fc9adb7 100644 --- a/config_help.txt +++ b/config_help.txt @@ -205,7 +205,6 @@ Build environment: [$ANDROID_NDK_HOST] -android-abis ....... Comma separated Android abis, default is: armeabi-v7a,arm64-v8a,x86,x86_64 - -android-toolchain-version ... Set Android toolchain version -android-style-assets Automatically extract style assets from the device at run time. This option makes the Android style behave correctly, but also makes the Android platform plugin -- cgit v1.2.3