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

QtWidgets: finally Q_FOREACH-free

Browse Source 
These source files have been ported away from Q_FOREACH but weren't
blacklisted, so un-blacklist them by removing "#undef QT_NO_FOREACH",
and removing them from NO_PCH_SOURCES.

These are the last remnants of the Q_FOREACH blacklisting in QtWidgets.

Task-number: QTBUG-115803
Change-Id: Ib73d668687f64d39fa48397d75a0f342e525c1ad
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Ahmad Samir 2023-10-08 15:49:55 +03:00
parent 8ce54407f2
commit 94a3914d3d
4 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/CMakeLists.txt
View File

@ -54,7 +54,7 @@ qt_internal_add_module(Widgets
DEFINES
QT_NO_CONTEXTLESS_CONNECT
QT_NO_USING_NAMESPACE
QT_NO_FOREACH # mostly...
QT_NO_FOREACH
INCLUDE_DIRECTORIES
dialogs
LIBRARIES
@ -472,8 +472,6 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_mdiarea
SOURCES
widgets/qmdiarea.cpp widgets/qmdiarea.h widgets/qmdiarea_p.h
widgets/qmdisubwindow.cpp widgets/qmdisubwindow.h widgets/qmdisubwindow_p.h
NO_PCH_SOURCES
widgets/qmdiarea.cpp # undef QT_NO_FOREACH
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_menu
@ -730,8 +728,6 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_itemviews
itemviews/qitemeditorfactory.cpp itemviews/qitemeditorfactory.h itemviews/qitemeditorfactory_p.h
itemviews/qstyleditemdelegate.cpp itemviews/qstyleditemdelegate.h
itemviews/qwidgetitemdata_p.h
NO_PCH_SOURCES
itemviews/qabstractitemview.cpp # undef QT_NO_FOREACH
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_columnview
@ -758,8 +754,6 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_listwidget
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tableview
SOURCES
itemviews/qtableview.cpp itemviews/qtableview.h itemviews/qtableview_p.h
NO_PCH_SOURCES
itemviews/qtableview.cpp # undef QT_NO_FOREACH
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tablewidget

2
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -1,8 +1,6 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
#include "qabstractitemview.h"
#include <qpointer.h>

2
src/widgets/itemviews/qtableview.cpp
View File

@ -1,8 +1,6 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
#include "qtableview.h"
#include <qheaderview.h>

2
src/widgets/widgets/qmdiarea.cpp
View File

@ -1,8 +1,6 @@
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
/*!
\class QMdiArea
\brief The QMdiArea widget provides an area in which MDI windows are displayed.