diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-04 01:01:28 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-04 01:01:31 +0200 |
| commit | e9f10dfe8c19b74dfb52179fd04414c563812d83 (patch) | |
| tree | 94db5ea0ecade00111a2991e0cd5df8ce1cddf98 /src/corelib/global | |
| parent | a978d21dac57697ae9557b99062bc804b005b9d4 (diff) | |
| parent | 932805807123833bb8f5ae9abda7e946f48d9f0c (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I31c1c469c00016f1bd21ecfab39794df372e56f2
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index c7357f9d13..52ad471e71 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -851,10 +851,14 @@ QT_END_NAMESPACE #include "private/qcoreapplication_p.h" +QT_WARNING_DISABLE_GCC("-Wattributes") +QT_WARNING_DISABLE_CLANG("-Wattributes") +QT_WARNING_DISABLE_INTEL(2621) + extern const char qt_core_interpreter[] __attribute__((section(".interp"))) = ELF_INTERPRETER; -extern "C" void qt_core_boilerplate(); +extern "C" void qt_core_boilerplate() __attribute__((force_align_arg_pointer)); void qt_core_boilerplate() { printf("This is the QtCore library version " QT_BUILD_STR "\n" |