diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-29 14:17:21 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-05-29 14:17:21 +0000 |
commit | 0c5fbd397ceda4d9f0046f1204b5e49229d04312 (patch) | |
tree | 42a6113cad49eaff6b23664a4ac631a217d983c5 /src/corelib/global/qglobal.h | |
parent | 386aca1ba4da3383cd6b6253a7240417ff2d91a0 (diff) | |
parent | 2670bdeee4b610be719caed841882babe7541ec9 (diff) |
Merge "Merge remote-tracking branch 'origin/5.4.2' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r-- | src/corelib/global/qglobal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index a1c5132492..51fba90ba3 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1047,7 +1047,8 @@ Q_CORE_EXPORT int qrand(); # define QT_NO_SHAREDMEMORY #endif -#if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && (!defined(__PIC__) || defined(__PIE__)) +#if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && \ + (!defined(__PIC__) || (defined(__PIE__) && defined(Q_CC_GNU) && Q_CC_GNU >= 500)) # error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\ "Compile your code with -fPIC (-fPIE is not enough)." #endif |