diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2023-10-08 15:49:55 +0300 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2023-10-13 00:54:57 +0300 |
| commit | 94a3914d3da3bbeb4da9c4d231e3666ae910f287 (patch) | |
| tree | 2bb174acd5d64c4b8da4dcd3b16cc429b7091e39 | |
| parent | 8ce54407f27c209ad48d6ae3b15ad3230ffd0b93 (diff) | |
QtWidgets: finally Q_FOREACH-free
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>
| -rw-r--r-- | src/widgets/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/widgets/itemviews/qabstractitemview.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/itemviews/qtableview.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qmdiarea.cpp | 2 |
4 files changed, 1 insertions, 13 deletions
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 9e21cfafd5..4d954fa069 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -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 diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index d36e82643f..b011f1bd77 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -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> diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index 0c7750750c..7752dec283 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -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> diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 0a3cf93ccf..2978893205 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -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. |