diff options
Diffstat (limited to 'src/widgets/kernel')
37 files changed, 154 insertions, 5 deletions
diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index 0060ad2d31..b40a33b2af 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -5,8 +5,10 @@ PRECOMPILED_HEADER = kernel/qt_widgets_pch.h KERNEL_P= kernel HEADERS += \ - kernel/qaction.h \ - kernel/qaction_p.h \ + kernel/qtwidgetsglobal.h \ + kernel/qtwidgetsglobal_p.h \ + kernel/qaction.h \ + kernel/qaction_p.h \ kernel/qactiongroup.h \ kernel/qapplication.h \ kernel/qapplication_p.h \ diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index bd491c89ca..97948a2457 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -40,6 +40,7 @@ #ifndef QACTION_H #define QACTION_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtGui/qkeysequence.h> #include <QtCore/qstring.h> #include <QtWidgets/qwidget.h> diff --git a/src/widgets/kernel/qaction_p.h b/src/widgets/kernel/qaction_p.h index 84c6774141..8ee71a5ff0 100644 --- a/src/widgets/kernel/qaction_p.h +++ b/src/widgets/kernel/qaction_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qaction.h" #include "QtWidgets/qmenu.h" #include "private/qgraphicswidget_p.h" diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h index b9d82aeb8c..61c90b911d 100644 --- a/src/widgets/kernel/qactiongroup.h +++ b/src/widgets/kernel/qactiongroup.h @@ -40,6 +40,7 @@ #ifndef QACTIONGROUP_H #define QACTIONGROUP_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qaction.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 52f44759f4..be5ec2ad05 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -40,6 +40,7 @@ #ifndef QAPPLICATION_H #define QAPPLICATION_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qcoreapplication.h> #include <QtGui/qwindowdefs.h> #include <QtCore/qpoint.h> diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 8aab3bfae4..dd0edc7c80 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qapplication.h" #include "QtGui/qevent.h" #include "QtGui/qfont.h" diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index 6c548fbbca..9c7d0e593f 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -40,6 +40,7 @@ #ifndef QBOXLAYOUT_H #define QBOXLAYOUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qlayout.h> #ifdef QT_INCLUDE_COMPAT #include <QtWidgets/qwidget.h> diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index 9fb6b293f7..64e1c568eb 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -40,6 +40,7 @@ #ifndef QDESKTOPWIDGET_H #define QDESKTOPWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qdesktopwidget_p.h b/src/widgets/kernel/qdesktopwidget_p.h index a590024b7c..4846a868aa 100644 --- a/src/widgets/kernel/qdesktopwidget_p.h +++ b/src/widgets/kernel/qdesktopwidget_p.h @@ -51,6 +51,7 @@ #ifndef QDESKTOPWIDGET_P_H #define QDESKTOPWIDGET_P_H +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QDesktopWidget" #include "private/qwidget_p.h" diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index ca15ec6f9a..b4185374fd 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -40,6 +40,7 @@ #ifndef QFORMLAYOUT_H #define QFORMLAYOUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/QLayout> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 57b59abf60..034d1d88c1 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -40,6 +40,7 @@ #ifndef QGESTURE_H #define QGESTURE_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtCore/qlist.h> #include <QtCore/qdatetime.h> diff --git a/src/widgets/kernel/qgesture_p.h b/src/widgets/kernel/qgesture_p.h index b438b81e31..636103c1e1 100644 --- a/src/widgets/kernel/qgesture_p.h +++ b/src/widgets/kernel/qgesture_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qrect.h" #include "qpoint.h" #include "qgesture.h" diff --git a/src/widgets/kernel/qgesturemanager_p.h b/src/widgets/kernel/qgesturemanager_p.h index 9cd1f79418..ec51466a63 100644 --- a/src/widgets/kernel/qgesturemanager_p.h +++ b/src/widgets/kernel/qgesturemanager_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qobject.h" #include "qbasictimer.h" #include "private/qwidget_p.h" diff --git a/src/widgets/kernel/qgesturerecognizer.h b/src/widgets/kernel/qgesturerecognizer.h index f44f763217..04e85c46cc 100644 --- a/src/widgets/kernel/qgesturerecognizer.h +++ b/src/widgets/kernel/qgesturerecognizer.h @@ -40,7 +40,7 @@ #ifndef QGESTURERECOGNIZER_H #define QGESTURERECOGNIZER_H -#include <QtCore/qglobal.h> +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qnamespace.h> #ifndef QT_NO_GESTURES diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index fc6e70748f..51dd65d181 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -40,6 +40,7 @@ #ifndef QGRIDLAYOUT_H #define QGRIDLAYOUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qlayout.h> #ifdef QT_INCLUDE_COMPAT #include <QtWidgets/qwidget.h> diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index d76e12ca8c..2de12b4f99 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -40,6 +40,7 @@ #ifndef QLAYOUT_H #define QLAYOUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtWidgets/qlayoutitem.h> #include <QtWidgets/qsizepolicy.h> diff --git a/src/widgets/kernel/qlayout_p.h b/src/widgets/kernel/qlayout_p.h index 0d70c74fe5..8a1b12a6be 100644 --- a/src/widgets/kernel/qlayout_p.h +++ b/src/widgets/kernel/qlayout_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qobject_p.h" #include "qstyle.h" #include "qsizepolicy.h" diff --git a/src/widgets/kernel/qlayoutengine_p.h b/src/widgets/kernel/qlayoutengine_p.h index 0f7d3fdb90..812fa7cf3b 100644 --- a/src/widgets/kernel/qlayoutengine_p.h +++ b/src/widgets/kernel/qlayoutengine_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qlayoutitem.h" #include "QtWidgets/qstyle.h" diff --git a/src/widgets/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h index b54a59084b..6f701b9f82 100644 --- a/src/widgets/kernel/qlayoutitem.h +++ b/src/widgets/kernel/qlayoutitem.h @@ -40,6 +40,7 @@ #ifndef QLAYOUTITEM_H #define QLAYOUTITEM_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qsizepolicy.h> #include <QtCore/qrect.h> diff --git a/src/widgets/kernel/qmacgesturerecognizer_p.h b/src/widgets/kernel/qmacgesturerecognizer_p.h index 844d4a6460..be3f3266ac 100644 --- a/src/widgets/kernel/qmacgesturerecognizer_p.h +++ b/src/widgets/kernel/qmacgesturerecognizer_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qtimer.h" #include "qpoint.h" #include "qgesturerecognizer.h" diff --git a/src/widgets/kernel/qopenglwidget.h b/src/widgets/kernel/qopenglwidget.h index acbbb24c40..b60d79bedb 100644 --- a/src/widgets/kernel/qopenglwidget.h +++ b/src/widgets/kernel/qopenglwidget.h @@ -40,7 +40,7 @@ #ifndef QOPENGLWIDGET_H #define QOPENGLWIDGET_H -#include <QtCore/qglobal.h> +#include <QtWidgets/qtwidgetsglobal.h> #ifndef QT_NO_OPENGL diff --git a/src/widgets/kernel/qshortcut.h b/src/widgets/kernel/qshortcut.h index c3ccbe3c08..22c667c9c1 100644 --- a/src/widgets/kernel/qshortcut.h +++ b/src/widgets/kernel/qshortcut.h @@ -40,6 +40,7 @@ #ifndef QSHORTCUT_H #define QSHORTCUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> #include <QtGui/qkeysequence.h> diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index 7a1e22fdc2..63b578fbf3 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -40,6 +40,7 @@ #ifndef QSIZEPOLICY_H #define QSIZEPOLICY_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index fb83fddc43..6f5eded1f0 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -40,6 +40,7 @@ #ifndef QSTACKEDLAYOUT_H #define QSTACKEDLAYOUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qlayout.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qstandardgestures_p.h b/src/widgets/kernel/qstandardgestures_p.h index abda1a3f6e..9b2cffaa9a 100644 --- a/src/widgets/kernel/qstandardgestures_p.h +++ b/src/widgets/kernel/qstandardgestures_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qgesturerecognizer.h" #include "private/qgesture_p.h" diff --git a/src/widgets/kernel/qt_widgets_pch.h b/src/widgets/kernel/qt_widgets_pch.h index f58a8895eb..f30202d89e 100644 --- a/src/widgets/kernel/qt_widgets_pch.h +++ b/src/widgets/kernel/qt_widgets_pch.h @@ -47,7 +47,7 @@ // from corelib/global/qt_pch.h #if defined __cplusplus -#include <qglobal.h> +#include <qtwidgetsglobal.h> #ifdef Q_DEAD_CODE_FROM_QT4_WIN diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index aad6e941c8..5e68eef0a7 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -40,6 +40,7 @@ #ifndef QTOOLTIP_H #define QTOOLTIP_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qtwidgetsglobal.h b/src/widgets/kernel/qtwidgetsglobal.h new file mode 100644 index 0000000000..f6d003e629 --- /dev/null +++ b/src/widgets/kernel/qtwidgetsglobal.h @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2016 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$ +** +****************************************************************************/ + +#ifndef QTWIDGETSGLOBAL_H +#define QTWIDGETSGLOBAL_H + +#include <QtGui/qtguiglobal.h> + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_WIDGETS_LIB) +# define Q_WIDGETS_EXPORT Q_DECL_EXPORT +# else +# define Q_WIDGETS_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_WIDGETS_EXPORT +#endif + +QT_END_NAMESPACE + +#endif // QTGUIGLOBAL_H diff --git a/src/widgets/kernel/qtwidgetsglobal_p.h b/src/widgets/kernel/qtwidgetsglobal_p.h new file mode 100644 index 0000000000..7dd545415c --- /dev/null +++ b/src/widgets/kernel/qtwidgetsglobal_p.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2016 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$ +** +****************************************************************************/ + +#ifndef QTWIDGETSGLOBAL_P_H +#define QTWIDGETSGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtWidgets/qtwidgetsglobal.h> +#include <QtGui/private/qtguiglobal_p.h> + +#endif // QTWIDGETSGLOBAL_P_H diff --git a/src/widgets/kernel/qwhatsthis.h b/src/widgets/kernel/qwhatsthis.h index 0889653e2c..746fd3ff22 100644 --- a/src/widgets/kernel/qwhatsthis.h +++ b/src/widgets/kernel/qwhatsthis.h @@ -40,6 +40,7 @@ #ifndef QWHATSTHIS_H #define QWHATSTHIS_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtGui/qcursor.h> diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 43ca76ac7c..2a71710143 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -40,6 +40,7 @@ #ifndef QWIDGET_H #define QWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtGui/qwindowdefs.h> #include <QtCore/qobject.h> #include <QtCore/qmargins.h> diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 71691a4afa..f2884e7b17 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qwidget.h" #include "private/qobject_p.h" #include "QtCore/qrect.h" diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index 4adb9b61ea..3da691a430 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -40,6 +40,7 @@ #ifndef QWIDGETACTION_H #define QWIDGETACTION_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qaction.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwidgetaction_p.h b/src/widgets/kernel/qwidgetaction_p.h index 20da855185..1fbcf236a1 100644 --- a/src/widgets/kernel/qwidgetaction_p.h +++ b/src/widgets/kernel/qwidgetaction_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qaction_p.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwidgetbackingstore_p.h b/src/widgets/kernel/qwidgetbackingstore_p.h index dc20446047..16b36423a6 100644 --- a/src/widgets/kernel/qwidgetbackingstore_p.h +++ b/src/widgets/kernel/qwidgetbackingstore_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QDebug> #include <QtWidgets/qwidget.h> #include <private/qwidget_p.h> diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h index a0d79b2b72..edf2383596 100644 --- a/src/widgets/kernel/qwidgetwindow_p.h +++ b/src/widgets/kernel/qwidgetwindow_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtGui/qwindow.h> #include <QtCore/private/qobject_p.h> diff --git a/src/widgets/kernel/qwindowcontainer_p.h b/src/widgets/kernel/qwindowcontainer_p.h index 557a56169e..1d838c8dd6 100644 --- a/src/widgets/kernel/qwindowcontainer_p.h +++ b/src/widgets/kernel/qwindowcontainer_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE |