From 77dd4bb142248eb37994150957241e570e7acecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= Date: Mon, 10 Jun 2024 13:39:34 +0200 Subject: [PATCH] Move AA_QtQuickUseDefaultSizePolicy out of Tech Preview Change-Id: Ibdd23455c266af6748aca9de859ea21caac50634 Reviewed-by: Santhosh Kumar (cherry picked from commit 8b0f56e99838f974a675ce557b8a5646519fd780) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qnamespace.h | 2 +- src/corelib/global/qnamespace.qdoc | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 9a0aa72bb5d..b81ad1375d4 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -423,7 +423,7 @@ namespace Qt { enum ApplicationAttribute { // AA_ImmediateWidgetCreation = 0, - AA_QtQuickUseDefaultSizePolicy = 1 QT_TECH_PREVIEW_API, + AA_QtQuickUseDefaultSizePolicy = 1, AA_DontShowIconsInMenus = 2, AA_NativeWindows = 3, AA_DontCreateNativeWidgetSiblings = 4, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 6644ae8e136..a393b30f892 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -93,9 +93,6 @@ with the layout can be overridden by explicitly setting \l{Layout::fillWidth}{Layout.fillWidth} or \l{Layout::fillHeight}{Layout.fillHeight}. - \b Note: This API is considered tech preview and may change or be removed in future - versions of Qt. - \value AA_DontShowIconsInMenus Actions with the Icon property won't be shown in any menus unless specifically set by the