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

Add forwarding headers for classes moved from QtWidgets to QtGui

Browse Source 
The

QT_BEGIN_NAMESPACE
QT_END_NAMESPACE

block is added to avoid warnings from the build system's sanity
check.

As a drive-by, fix the include guards in the QtGui/QActionGroup header.

Change-Id: Ie10e7830c3b00a3548123f58498def49b194c7aa
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-10-15 14:23:10 +02:00
parent 301ed73487
commit f1af51fd81
12 changed files with 315 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/kernel/qactiongroup.h
View File

@ -37,8 +37,8 @@
**
****************************************************************************/
#ifndef QGUIACTIONGROUP_H
#define QGUIACTIONGROUP_H
#ifndef QACTIONGROUP_H
#define QACTIONGROUP_H
#include <QtGui/qtguiglobal.h>
#include <QtGui/qaction.h>
@ -107,4 +107,4 @@ private:
QT_END_NAMESPACE
#endif // QGUIACTIONGROUP_H
#endif // QACTIONGROUP_H

18
src/widgets/.prev_CMakeLists.txt
View File

@ -319,6 +319,7 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_action
SOURCES
kernel/qaction.h kernel/qactiongroup.h
kernel/qaction_widgets.cpp kernel/qaction_widgets_p.h
kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
)
@ -330,7 +331,7 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_formlayout
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_shortcut
SOURCES
kernel/qshortcut_widgets.cpp
kernel/qshortcut.h kernel/qshortcut_widgets.cpp
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tooltip
@ -619,6 +620,11 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_filedialog
uic
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel
SOURCES
dialogs/qfilesystemmodel.h
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontdialog
SOURCES
dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h
@ -781,6 +787,16 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scroller
util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h
)
qt_internal_extend_target(Gui CONDITION QT_FEATURE_undocommand
SOURCES
util/qundostack.h
)
qt_internal_extend_target(Gui CONDITION QT_FEATURE_undogroup
SOURCES
util/qundogroup.h
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undoview
SOURCES
util/qundoview.cpp util/qundoview.h

18
src/widgets/CMakeLists.txt
View File

@ -321,6 +321,7 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_action
SOURCES
kernel/qaction.h kernel/qactiongroup.h
kernel/qaction_widgets.cpp kernel/qaction_widgets_p.h
kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
)
@ -332,7 +333,7 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_formlayout
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_shortcut
SOURCES
kernel/qshortcut_widgets.cpp
kernel/qshortcut.h kernel/qshortcut_widgets.cpp
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_tooltip
@ -621,6 +622,11 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_filedialog
uic
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel
SOURCES
dialogs/qfilesystemmodel.h
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_fontdialog
SOURCES
dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h
@ -783,6 +789,16 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_scroller
util/qscrollerproperties.cpp util/qscrollerproperties.h util/qscrollerproperties_p.h
)
qt_internal_extend_target(Gui CONDITION QT_FEATURE_undocommand
SOURCES
util/qundostack.h
)
qt_internal_extend_target(Gui CONDITION QT_FEATURE_undogroup
SOURCES
util/qundogroup.h
)
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_undoview
SOURCES
util/qundoview.cpp util/qundoview.h

5
src/widgets/dialogs/dialogs.pri
View File

@ -34,6 +34,11 @@ qtConfig(filedialog) {
FORMS += dialogs/qfiledialog.ui
}
qtConfig(filesystemmodel) {
HEADERS += \
dialogs/qfilesystemmodel.h
}
qtConfig(fontdialog) {
HEADERS += \
dialogs/qfontdialog.h \

43
src/widgets/dialogs/qfilesystemmodel.h Normal file
View File

@ -0,0 +1,43 @@
/****************************************************************************
**
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtWidgets module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtGui/QFileSystemModel>
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE

6
src/widgets/kernel/kernel.pri
View File

@ -58,7 +58,10 @@ macx: {
qtConfig(action) {
HEADERS += kernel/qaction_widgets_p.h \
kernel/qwidgetaction.h \
kernel/qwidgetaction_p.h
kernel/qwidgetaction_p.h \
kernel/qaction.h \
kernel/qactiongroup.h
SOURCES += kernel/qaction_widgets.cpp \
kernel/qwidgetaction.cpp
}
@ -69,6 +72,7 @@ qtConfig(formlayout) {
}
qtConfig(shortcut) {
HEADERS += kernel/qshortcut.h
SOURCES += kernel/qshortcut_widgets.cpp
}

43
src/widgets/kernel/qaction.h Normal file
View File

@ -0,0 +1,43 @@
/****************************************************************************
**
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtWidgets module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtGui/QAction>
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE

43
src/widgets/kernel/qactiongroup.h Normal file
View File

@ -0,0 +1,43 @@
/****************************************************************************
**
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtWidgets module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtGui/QActionGroup>
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE

43
src/widgets/kernel/qshortcut.h Normal file
View File

@ -0,0 +1,43 @@
/****************************************************************************
**
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtWidgets module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtGui/QShortcut>
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE

43
src/widgets/util/qundogroup.h Normal file
View File

@ -0,0 +1,43 @@
/****************************************************************************
**
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtWidgets module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtGui/QUndoGroup>
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE

43
src/widgets/util/qundostack.h Normal file
View File

@ -0,0 +1,43 @@
/****************************************************************************
**
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtWidgets module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or (at your option) the GNU General
** Public license version 3 or any later version approved by the KDE Free
** Qt Foundation. The licenses are as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtGui/QUndoStack>
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE

10
src/widgets/util/util.pri
View File

@ -31,6 +31,16 @@ qtConfig(scroller) {
util/qflickgesture.cpp \
}
qtConfig(undocommand) {
HEADERS += \
util/qundostack.h
}
qtConfig(undogroup) {
HEADERS += \
util/qundogroup.h
}
qtConfig(undoview) {
HEADERS += util/qundoview.h
SOURCES += util/qundoview.cpp