diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qactiongroup.h | 6 | ||||
| -rw-r--r-- | src/widgets/.prev_CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/widgets/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/widgets/dialogs/dialogs.pri | 5 | ||||
| -rw-r--r-- | src/widgets/dialogs/qfilesystemmodel.h | 43 | ||||
| -rw-r--r-- | src/widgets/kernel/kernel.pri | 6 | ||||
| -rw-r--r-- | src/widgets/kernel/qaction.h | 43 | ||||
| -rw-r--r-- | src/widgets/kernel/qactiongroup.h | 43 | ||||
| -rw-r--r-- | src/widgets/kernel/qshortcut.h | 43 | ||||
| -rw-r--r-- | src/widgets/util/qundogroup.h | 43 | ||||
| -rw-r--r-- | src/widgets/util/qundostack.h | 43 | ||||
| -rw-r--r-- | src/widgets/util/util.pri | 10 |
12 files changed, 315 insertions, 6 deletions
diff --git a/src/gui/kernel/qactiongroup.h b/src/gui/kernel/qactiongroup.h index c485654d08..9ac8743629 100644 --- a/src/gui/kernel/qactiongroup.h +++ b/src/gui/kernel/qactiongroup.h @@ -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 diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index 99792726ee..b2914b7007 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -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 diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index e1e7dd968a..afc1aa6753 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -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 diff --git a/src/widgets/dialogs/dialogs.pri b/src/widgets/dialogs/dialogs.pri index 75e0f5fcf8..89ed63e16b 100644 --- a/src/widgets/dialogs/dialogs.pri +++ b/src/widgets/dialogs/dialogs.pri @@ -34,6 +34,11 @@ qtConfig(filedialog) { FORMS += dialogs/qfiledialog.ui } +qtConfig(filesystemmodel) { + HEADERS += \ + dialogs/qfilesystemmodel.h +} + qtConfig(fontdialog) { HEADERS += \ dialogs/qfontdialog.h \ diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h new file mode 100644 index 0000000000..a90b9479ca --- /dev/null +++ b/src/widgets/dialogs/qfilesystemmodel.h @@ -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 diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index 85a388009e..0e4243fc17 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -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 } diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h new file mode 100644 index 0000000000..7c9496f638 --- /dev/null +++ b/src/widgets/kernel/qaction.h @@ -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 diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h new file mode 100644 index 0000000000..74c6c44a00 --- /dev/null +++ b/src/widgets/kernel/qactiongroup.h @@ -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 diff --git a/src/widgets/kernel/qshortcut.h b/src/widgets/kernel/qshortcut.h new file mode 100644 index 0000000000..c09cf23ca4 --- /dev/null +++ b/src/widgets/kernel/qshortcut.h @@ -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 diff --git a/src/widgets/util/qundogroup.h b/src/widgets/util/qundogroup.h new file mode 100644 index 0000000000..a3254bcdbc --- /dev/null +++ b/src/widgets/util/qundogroup.h @@ -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 diff --git a/src/widgets/util/qundostack.h b/src/widgets/util/qundostack.h new file mode 100644 index 0000000000..f520ab6f95 --- /dev/null +++ b/src/widgets/util/qundostack.h @@ -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 diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri index 2819ac565a..81f8c1fea4 100644 --- a/src/widgets/util/util.pri +++ b/src/widgets/util/util.pri @@ -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 |