51 lines
2.0 KiB
Diff
51 lines
2.0 KiB
Diff
|
From 9718cb330cb479ec6e91f1f10c5ee9097fa2f4fb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Albert Astals Cid <albert.astals@canonical.com>
|
||
|
|
Date: Thu, 29 Jan 2015 12:13:53 +0100
|
||
|
|
Subject: [PATCH 072/163] CMake: Fix QObject::connect failing on ARM
|
||
|
|
|
||
|
|
We need PIE, doesn't matter if reduce_relocations is used or not
|
||
|
|
|
||
|
|
Change-Id: I9a359b9d4443a6059980cd4c48058132ec4267fe
|
||
|
|
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
||
|
|
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
|
||
|
|
---
|
||
|
|
mkspecs/features/create_cmake.prf | 2 --
|
||
|
|
src/corelib/Qt5CoreConfigExtras.cmake.in | 2 --
|
||
|
|
2 files changed, 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
|
||
|
|
index 3b0e037..9f7ba46 100644
|
||
|
|
--- a/mkspecs/features/create_cmake.prf
|
||
|
|
+++ b/mkspecs/features/create_cmake.prf
|
||
|
|
@@ -171,8 +171,6 @@ contains(CONFIG, plugin) {
|
||
|
|
return()
|
||
|
|
}
|
||
|
|
|
||
|
|
-unix:contains(QT_CONFIG, reduce_relocations):CMAKE_ADD_FPIE_FLAGS = "true"
|
||
|
|
-
|
||
|
|
CMAKE_MKSPEC = $$[QMAKE_XSPEC]
|
||
|
|
|
||
|
|
CMAKE_MODULE_DEPS = $$cmakeModuleList($$sort_depends(QT.$${MODULE}.depends, QT.))
|
||
|
|
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||
|
|
index 9bda70e..4387bed 100644
|
||
|
|
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||
|
|
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
|
||
|
|
@@ -66,14 +66,12 @@ list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes})
|
||
|
|
set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5_corelib_extra_includes})
|
||
|
|
set(_qt5_corelib_extra_includes)
|
||
|
|
|
||
|
|
-!!IF !isEmpty(CMAKE_ADD_FPIE_FLAGS)
|
||
|
|
# Targets using Qt need to use the POSITION_INDEPENDENT_CODE property. The
|
||
|
|
# Qt5_POSITION_INDEPENDENT_CODE variable is used in the # qt5_use_module
|
||
|
|
# macro to add it.
|
||
|
|
set(Qt5_POSITION_INDEPENDENT_CODE True)
|
||
|
|
set_property(TARGET Qt5::Core PROPERTY INTERFACE_POSITION_INDEPENDENT_CODE \"ON\")
|
||
|
|
set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"-fPIE\")
|
||
|
|
-!!ENDIF
|
||
|
|
|
||
|
|
!!IF !isEmpty(QT_NAMESPACE)
|
||
|
|
list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE)
|
||
|
|
--
|
||
|
|
1.9.3
|
||
|
|
|