From 0e85b554ad147dc542790fb85629c7dae2ecb8ca Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Tue, 6 Feb 2018 11:15:42 +0200 Subject: Add WFD_DEVICE_CLIENT_TYPE attribute for INTEGRITY S820Am ADP This is needed to be compatible with latest Qualcomm BSP releases. This patch also makes it possible to select HW layer via QT_OPENWFD_CLIENT_ID and QT_OPENWFD_PIPELINE_ID environment variables. Change-Id: Ie795b21afc61a1de7c1d0b52cdb30a754e3f8266 Reviewed-by: Janne Koskinen Reviewed-by: Timo Aarnipuro Reviewed-by: Laszlo Agocs (cherry picked from commit 00f693d3e5046999270c92731e34a3e7fcd01c6b) Reviewed-by: Simon Hausmann --- mkspecs/devices/integrity-armv8-msm8996au/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') 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 -- cgit v1.2.3 From a4e67a303b411497857f3b909f2b9540f7bc20f3 Mon Sep 17 00:00:00 2001 From: Vyacheslav Koscheev Date: Thu, 1 Mar 2018 17:46:10 +0700 Subject: Android: add option `-mstackrealign` to clang-x86 mkspec Task-number: QTBUG-66770 Change-Id: I5e8ced0fa60c67d7908f21e5c486fea0d7a50004 Reviewed-by: Oswald Buddenhagen Reviewed-by: BogDan Vatra --- mkspecs/android-clang/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') 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): \ -- cgit v1.2.3