diff --git a/src/gui/.prev_configure.cmake b/src/gui/.prev_configure.cmake index 046f0e70aca..298906fa53c 100644 --- a/src/gui/.prev_configure.cmake +++ b/src/gui/.prev_configure.cmake @@ -1223,11 +1223,6 @@ qt_configure_add_report_entry( 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 ) -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( 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." diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 59146519115..f0b5d9b1fef 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -1286,11 +1286,6 @@ qt_configure_add_report_entry( 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 ) -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( 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." diff --git a/src/gui/configure.json b/src/gui/configure.json index 32f1cd1b22f..a88ce543609 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -35,7 +35,6 @@ "opengles3": "boolean", "openvg": "boolean", "qpa": { "type": "string", "name": "qpa_default_platform" }, - "qpa-platform-guard": "boolean", "sm": { "type": "boolean", "name": "sessionmanager" }, "tslib": "boolean", "vulkan": "boolean", @@ -1708,11 +1707,6 @@ "condition": "features.accessibility && features.xcb && !features.accessibility-atspi-bridge", "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", "condition": "features.gui && config.linux && !config.android && !features.xcb && !features.eglfs && !features.directfb && !features.linuxfb", diff --git a/src/gui/qt_cmdline.cmake b/src/gui/qt_cmdline.cmake index cf8561eef86..3663a24a46c 100644 --- a/src/gui/qt_cmdline.cmake +++ b/src/gui/qt_cmdline.cmake @@ -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(openvg TYPE boolean) 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(tslib TYPE boolean) qt_commandline_option(vulkan TYPE boolean)