From f8f96d0fa1845365a1a7f1cd8be235fb1a625be8 Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Fri, 25 Jan 2019 08:56:08 +0200 Subject: Fix OpenGL library paths on INTEGRITY QC Snapdragon 820 After 521a85395da1a2728902816c072ec46bcb0ad380 configure doesn't find OpenGL libraries from QMAKE_LIBDIR, hence we use QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBDIR_EGL instead. Task-number: QTBUG-73136 Change-Id: Iaeac46000c5d684f601741cbef91ce745ceb4ea2 Reviewed-by: Janne Koskinen --- mkspecs/devices/integrity-armv8-msm8996au/qmake.conf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mkspecs/devices/integrity-armv8-msm8996au/qmake.conf b/mkspecs/devices/integrity-armv8-msm8996au/qmake.conf index e78bde54b9..7fc6c6aafc 100644 --- a/mkspecs/devices/integrity-armv8-msm8996au/qmake.conf +++ b/mkspecs/devices/integrity-armv8-msm8996au/qmake.conf @@ -33,9 +33,6 @@ gl_lib_directory = $$(GL_LIB_DIR) isEmpty(gl_lib_directory): \ error("This qmakespec requires $GL_LIB_DIR to be set") -QMAKE_LIBDIR += $$(QCLIBS_DIR)/base -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 -lplanedef -lmmosallibrary @@ -51,7 +48,12 @@ QMAKE_LFLAGS += -bigswitch # OpenGL libraries have a dependency on libEGL QMAKE_INCDIR_EGL = $$(GL_INC_DIR) QMAKE_LIBDIR_EGL = $$(GL_LIB_DIR) +QMAKE_LIBDIR_EGL += $$(QCLIBS_DIR)/base +QMAKE_LIBDIR_EGL += $$(QCLIBS_DIR)/multimedia/display + QMAKE_INCDIR_OPENGL_ES2 = $$(GL_INC_DIR) QMAKE_LIBDIR_OPENGL_ES2 = $$(GL_LIB_DIR) +QMAKE_LIBDIR_OPENGL_ES2 += $$(QCLIBS_DIR)/base +QMAKE_LIBDIR_OPENGL_ES2 += $$(QCLIBS_DIR)/multimedia/display load(qt_config) -- cgit v1.2.3 From 63891267c1fe2e483fa305de9102891448c52981 Mon Sep 17 00:00:00 2001 From: Janne Koskinen Date: Fri, 21 Dec 2018 10:25:21 +0100 Subject: Disable NEON flags from Integrity compiler Integrity assembler doesn't understand NEON assembly statements. Compiler enables _ARM_NEON_ and _ARM_NEON to indicate that NEON intrinsics are available. _ARM_NEON_ and _ARM_NEON needs to be disabled to skip handwritten assembly code paths in Qt.Auto- vectorization is enabled without the flags enabled. Task-number: QTBUG-72716 Change-Id: I84cfbf98bd2af47740a79f4b300c1801017ee22c Reviewed-by: Tuukka Turunen Reviewed-by: Kimmo Ollila Reviewed-by: Timo Aarnipuro Reviewed-by: Allan Sandfeld Jensen --- mkspecs/common/ghs-integrity-armv8.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/ghs-integrity-armv8.conf b/mkspecs/common/ghs-integrity-armv8.conf index e454cfd245..ee4ce458de 100644 --- a/mkspecs/common/ghs-integrity-armv8.conf +++ b/mkspecs/common/ghs-integrity-armv8.conf @@ -17,8 +17,8 @@ os_directory = $$(INTEGRITY_DIR) isEmpty(os_directory): \ error("This qmakespec requires $INTEGRITY_DIR to be set") -QMAKE_CC = cxintarm64 -bsp $$bsp_name -os_dir $$os_directory -non_shared -QMAKE_CXX = cxintarm64 -bsp $$bsp_name -os_dir $$os_directory -non_shared +QMAKE_CC = cxintarm64 -U__ARM_NEON__ -U__ARM_NEON -bsp $$bsp_name -os_dir $$os_directory -non_shared +QMAKE_CXX = cxintarm64 -U__ARM_NEON__ -U__ARM_NEON -bsp $$bsp_name -os_dir $$os_directory -non_shared QMAKE_LINK = $$QMAKE_CXX QMAKE_AR = $$QMAKE_CXX -archive -o -- cgit v1.2.3 From b6afde4dd066651aaaa409adb0409420c62a47ff Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 28 Jan 2019 08:09:11 +0100 Subject: Fix corewlan configure test Configure is unable to find header files that are located in frameworks. Work around that by specifying "include" on "test" level instead of "headers" on "corewlan" level. This amends commit 10adbc4f0f. Change-Id: I0650585eb9a4e881dc2e3733d8db40c6e50cf1f3 Fixes: QTBUG-72964 Reviewed-by: Lars Knoll Reviewed-by: Alexandru Croitor --- src/network/configure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/configure.json b/src/network/configure.json index 10c4f87a2e..f3e18662aa 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -28,9 +28,9 @@ "export": "", "test": { "lang": "objc++", + "include": [ "CoreWLAN/CoreWLAN.h", "CoreWLAN/CWInterface.h" ], "main": "[CWInterface interfaceWithName:@\"en2\"];" }, - "headers": [ "CoreWLAN/CoreWLAN.h", "CoreWLAN/CWInterface.h" ], "sources": [ "-framework CoreWLAN -framework Foundation" ] -- cgit v1.2.3 From 0c498153331d79715ecfe431eb27065748628ba8 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 28 Jan 2019 17:11:35 +0200 Subject: Fix llvm-strip error In NDKr19 they removed "-strip-all-gnu" argument, now llvm-strip prints tons of: .../llvm-strip: error: unknown argument '-strip-all-gnu'. Change-Id: I11bb2d6abcc5f236730c57b5b93cc932c7ba58c6 Reviewed-by: Andy Shaw --- src/tools/androiddeployqt/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 587ae21e4f..76c521ca8f 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1880,7 +1880,7 @@ bool stripFile(const Options &options, const QString &fileName) } if (options.useLLVM) - strip = QString::fromLatin1("%1 -strip-all -strip-all-gnu %2").arg(shellQuote(strip), shellQuote(fileName)); + strip = QString::fromLatin1("%1 -strip-all %2").arg(shellQuote(strip), shellQuote(fileName)); else strip = QString::fromLatin1("%1 %2").arg(shellQuote(strip), shellQuote(fileName)); -- cgit v1.2.3