diff options
author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-02 04:20:54 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-02 04:20:54 +0000 |
commit | 7bc9310a2265e14b6880aa29d96adba6d3d7aed0 (patch) | |
tree | 0bf906e3585c93cbe5ef67a05b4a129e18e3edbd /src/corelib/global/qglobal.h | |
parent | 6e008cd57955c8029671c4c92250b86767f8ec1f (diff) | |
parent | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (diff) |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5.0
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r-- | src/corelib/global/qglobal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 99f21c1ae5..cbba6409e3 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1062,9 +1062,10 @@ Q_CORE_EXPORT int qrand(); #define QT_MODULE(x) -#if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && !defined(__PIC__) +#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." + "Compile your code with -fPIC (-fPIE is not enough)." #endif namespace QtPrivate { |