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

Remove the deprecated -qpa-platform-guard argument

Browse Source 
Change-Id: I0bde5552c8801660e2be57531d64b6d2b499bb32
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-08-20 10:40:21 +02:00
parent 721812c5d2
commit f9efe046a7
4 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/.prev_configure.cmake
View File

@ -1223,11 +1223,6 @@ qt_configure_add_report_entry(
MESSAGE "Disabling X11 Accessibility Bridge: D-Bus or AT-SPI is missing." MESSAGE "Disabling X11 Accessibility Bridge: D-Bus or AT-SPI is missing."
CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND NOT QT_FEATURE_accessibility_atspi_bridge CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND NOT QT_FEATURE_accessibility_atspi_bridge
) )
qt_configure_add_report_entry(
TYPE WARNING
MESSAGE "The [-no]-qpa-platform-guard argument is deprecated and has no effect."
CONDITION ( NOT INPUT_qpa_platform_guard STREQUAL '' )
)
qt_configure_add_report_entry( qt_configure_add_report_entry(
TYPE WARNING TYPE WARNING
MESSAGE "No QPA platform plugin enabled! This will produce a Qt that cannot run GUI applications. See \"Platform backends\" in the output of --help." MESSAGE "No QPA platform plugin enabled! This will produce a Qt that cannot run GUI applications. See \"Platform backends\" in the output of --help."

5
src/gui/configure.cmake
View File

@ -1286,11 +1286,6 @@ qt_configure_add_report_entry(
MESSAGE "Disabling X11 Accessibility Bridge: D-Bus or AT-SPI is missing." MESSAGE "Disabling X11 Accessibility Bridge: D-Bus or AT-SPI is missing."
CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND NOT QT_FEATURE_accessibility_atspi_bridge CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND NOT QT_FEATURE_accessibility_atspi_bridge
) )
qt_configure_add_report_entry(
TYPE WARNING
MESSAGE "The [-no]-qpa-platform-guard argument is deprecated and has no effect."
CONDITION ( NOT INPUT_qpa_platform_guard STREQUAL '' )
)
qt_configure_add_report_entry( qt_configure_add_report_entry(
TYPE WARNING TYPE WARNING
MESSAGE "No QPA platform plugin enabled! This will produce a Qt that cannot run GUI applications. See \"Platform backends\" in the output of --help." MESSAGE "No QPA platform plugin enabled! This will produce a Qt that cannot run GUI applications. See \"Platform backends\" in the output of --help."

6
src/gui/configure.json
View File

@ -35,7 +35,6 @@
"opengles3": "boolean", "opengles3": "boolean",
"openvg": "boolean", "openvg": "boolean",
"qpa": { "type": "string", "name": "qpa_default_platform" }, "qpa": { "type": "string", "name": "qpa_default_platform" },
"qpa-platform-guard": "boolean",
"sm": { "type": "boolean", "name": "sessionmanager" }, "sm": { "type": "boolean", "name": "sessionmanager" },
"tslib": "boolean", "tslib": "boolean",
"vulkan": "boolean", "vulkan": "boolean",
@ -1708,11 +1707,6 @@
"condition": "features.accessibility && features.xcb && !features.accessibility-atspi-bridge", "condition": "features.accessibility && features.xcb && !features.accessibility-atspi-bridge",
"message": "Disabling X11 Accessibility Bridge: D-Bus or AT-SPI is missing." "message": "Disabling X11 Accessibility Bridge: D-Bus or AT-SPI is missing."
}, },
{
"type": "warning",
"condition": "input.qpa-platform-guard != ''",
"message": "The [-no]-qpa-platform-guard argument is deprecated and has no effect."
},
{ {
"type": "warning", "type": "warning",
"condition": "features.gui && config.linux && !config.android && !features.xcb && !features.eglfs && !features.directfb && !features.linuxfb", "condition": "features.gui && config.linux && !config.android && !features.xcb && !features.eglfs && !features.directfb && !features.linuxfb",

1
src/gui/qt_cmdline.cmake
View File

@ -25,7 +25,6 @@ qt_commandline_option(opengl-es-2 TYPE void NAME opengl VALUE es2)
qt_commandline_option(opengles3 TYPE boolean) qt_commandline_option(opengles3 TYPE boolean)
qt_commandline_option(openvg TYPE boolean) qt_commandline_option(openvg TYPE boolean)
qt_commandline_option(qpa TYPE string NAME qpa_default_platform) qt_commandline_option(qpa TYPE string NAME qpa_default_platform)
qt_commandline_option(qpa-platform-guard TYPE boolean)
qt_commandline_option(sm TYPE boolean NAME sessionmanager) qt_commandline_option(sm TYPE boolean NAME sessionmanager)
qt_commandline_option(tslib TYPE boolean) qt_commandline_option(tslib TYPE boolean)
qt_commandline_option(vulkan TYPE boolean) qt_commandline_option(vulkan TYPE boolean)