diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-05-08 15:29:43 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-05-08 17:34:00 +0000 |
| commit | 9b2ee419b4218126e00096ef5034e846ff3b9db1 (patch) | |
| tree | cd11989ad66ead8e506e83dea6359e3be972034e /src/corelib/global | |
| parent | 4fe68ffbe5c93244562f2b56292d4ecf5ce39f56 (diff) | |
| parent | 1fce111809f216383e60f56b57a9f68ccd2b766f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into merge5.5" into refs/staging/5.5
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 27a3bf7c3d..99f21c1ae5 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1062,9 +1062,9 @@ Q_CORE_EXPORT int qrand(); #define QT_MODULE(x) -#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__) # error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\ - "Compile your code with -fPIC or -fPIE." + "Compile your code with -fPIC." #endif namespace QtPrivate { |