diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-07 00:00:30 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-03-07 00:14:51 +0000 |
commit | d7c1c9dd92fd6f79e61d816dc62edb8fe9daf6d7 (patch) | |
tree | c95d2758dd7d8ea6a66fc5be0262bd1607b4dce2 /mkspecs | |
parent | 2869bf9f1ea05d07d7e30b669cf67f71d17ad29f (diff) | |
parent | cf00c01f68198f55e0be5de4d9b720a31dea1a21 (diff) |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/android-clang/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/devices/integrity-armv8-msm8996au/qmake.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index 2f38e100b2..fae2c8ebd9 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -21,7 +21,7 @@ else: equals(ANDROID_TARGET_ARCH, armeabi): \ else: equals(ANDROID_TARGET_ARCH, arm64-v8a): \ QMAKE_CFLAGS += -target aarch64-none-linux-android else: equals(ANDROID_TARGET_ARCH, x86): \ - QMAKE_CFLAGS += -target i686-none-linux-android + QMAKE_CFLAGS += -target i686-none-linux-android -mstackrealign else: equals(ANDROID_TARGET_ARCH, x86_64): \ QMAKE_CFLAGS += -target x86_64-none-linux-android else: equals(ANDROID_TARGET_ARCH, mips): \ diff --git a/mkspecs/devices/integrity-armv8-msm8996au/qmake.conf b/mkspecs/devices/integrity-armv8-msm8996au/qmake.conf index 90299bf3e9..e78bde54b9 100644 --- a/mkspecs/devices/integrity-armv8-msm8996au/qmake.conf +++ b/mkspecs/devices/integrity-armv8-msm8996au/qmake.conf @@ -38,7 +38,7 @@ QMAKE_LIBDIR += $$(QCLIBS_DIR)/multimedia/display QMAKE_INCDIR += $$(QC_MULTIMEDIA_INC_DIR) -QMAKE_LIBS_EGL += -lESXEGL_Adreno -lESXGLESv2_Adreno -ladreno_utils -lGSLUser -lOSUser -lpanel -livfs -lposix -lpmem -ltzbsp -lpaged_alloc -lglnext-llvm -lopenwfd +QMAKE_LIBS_EGL += -lESXEGL_Adreno -lESXGLESv2_Adreno -ladreno_utils -lGSLUser -lOSUser -lpanel -livfs -lposix -lpmem -ltzbsp -lpaged_alloc -lglnext-llvm -lopenwfd -lplanedef -lmmosallibrary QMAKE_LIBS_OPENGL_ES2 += $${QMAKE_LIBS_EGL} QMAKE_CFLAGS += -DINTEGRITY |