1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xcb: Work around GCC ABI issue causing warning on ARM

Browse Source 
In member function ‘virtual QDpi QXcbScreen::logicalBaseDpi() const’:
 qxcbscreen.h:139:42: note: parameter passing for argument of type
 ‘std::pair<double, double>’ when C++17 is enabled changed to match C++14 in GCC 10.1
     QDpi logicalBaseDpi() const override { return QDpi(96, 96); }

It's not possible to silence this warning/note using pragmas.

Pick-to: 6.5 6.2
Change-Id: I913a1753ce0c82ac17951faa58b0a88bf1daa4db
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit a0792da1266fc6070fa3fb54171884c2fb6d4122)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2023-09-21 16:01:43 +02:00 committed by Qt Cherry-pick Bot
parent 3e797f074e
commit 1c1cbc3b22
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/xcb/CMakeLists.txt
View File

@ -5,6 +5,11 @@
## XcbQpaPrivate Module: ## XcbQpaPrivate Module:
##################################################################### #####################################################################
if(GCC)
# Work around GCC ABI issues
add_compile_options(-Wno-psabi)
endif()
qt_internal_add_module(XcbQpaPrivate qt_internal_add_module(XcbQpaPrivate
CONFIG_MODULE_NAME xcb_qpa_lib CONFIG_MODULE_NAME xcb_qpa_lib
INTERNAL_MODULE INTERNAL_MODULE