summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2020-07-01 17:15:12 -0400
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-07-07 20:38:30 +0000
commite2265965083343aa85ce0eb33f8d7b0f4d4620bb (patch)
tree5f424c4659ee4ff71d04591e531f7283e031932f /src/corelib/global/qglobal.h
parent9edc113874c582d84611c7733b32a4c5b47c69b4 (diff)
Clarify warning message about PIC/PIE
As noted in discussion at https://dev.gnupg.org/T4982#135524, when there is a mismatch between position-independence of the Qt library and other compilations, the warning produced by Qt is confusing. It should say explicitly that -fPIE should not be passed. Change-Id: I66394f86230a6598ac383bfd7bb14ab8cbbf6245 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 7f400522c39f6a1abf083dc1af49ea3109635cc8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r--src/corelib/global/qglobal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 447f60dfb2..501c542157 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1284,7 +1284,7 @@ Q_CORE_EXPORT QT_DEPRECATED_VERSION_X_5_15("use QRandomGenerator instead") int q
#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)."
+ "Compile your code with -fPIC (and not with -fPIE)."
#endif
namespace QtPrivate {