diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-05 08:58:24 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-05 08:58:25 +0200 |
| commit | f3a1048b61881f3e464112a33a5afa08e58ed0c3 (patch) | |
| tree | 24063324465516ed4490db9dd2ee0fa166b3e66d /config_help.txt | |
| parent | e82a1d6b2998b30fc100c4ebf9b98ee18dd3c374 (diff) | |
| parent | 46ec24d2b9a0fb1d59955f11dab0ead05dd017f9 (diff) | |
| download | qtbase-f3a1048b61881f3e464112a33a5afa08e58ed0c3.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I065e212f0dc115efa1ffcb14cf9f679259da6b79
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config_help.txt b/config_help.txt index 19991becb6..2c46592c31 100644 --- a/config_help.txt +++ b/config_help.txt @@ -203,9 +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-toolchain-version ... Set Android toolchain version + -android-abis ....... Comma separated Android abis, default is: + armeabi-v7a,arm64-v8a,x86,x86_64 -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 @@ -282,6 +281,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) |