diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-13 07:19:44 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-13 07:19:44 +0000 |
| commit | 9a969182cfa452fdb305bc9fe0becc6b358f91c1 (patch) | |
| tree | 9850ac418b869e42e17d82cc14d2fe0aa93a3192 /src/corelib/Qt5CoreMacros.cmake | |
| parent | f7020a31c02f4d1e5a46ce2ea20e38751f9afeed (diff) | |
| parent | 6b8c0a50585bb637c5cd33ca8ffde0cb9c4e3664 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/Qt5CoreMacros.cmake')
| -rw-r--r-- | src/corelib/Qt5CoreMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index 0c33335ae9..9235641544 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -336,7 +336,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.9) set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG) if (Qt5_POSITION_INDEPENDENT_CODE AND (CMAKE_VERSION VERSION_LESS 2.8.12 - AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL \"GNU\" + AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))) set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE}) endif() |