diff options
76 files changed, 144 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 5a4dcb467c..88f855a89e 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -36,6 +36,7 @@ #endif #endif #include <qlibraryinfo.h> +#include <qpointer.h> #include <qvarlengtharray.h> #include <private/qfactoryloader_p.h> #include <private/qfunctions_p.h> diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp index 4c5b3812a0..4e4cf3666b 100644 --- a/src/corelib/kernel/qsocketnotifier.cpp +++ b/src/corelib/kernel/qsocketnotifier.cpp @@ -16,6 +16,7 @@ #include <private/qthread_p.h> #include <QtCore/QLoggingCategory> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index c96452a670..ae584656fe 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -6,6 +6,8 @@ #include "qdeadlinetimer.h" #include "qcoreapplication.h" +#include <QtCore/qpointer.h> + #include <algorithm> #include <memory> diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h index 8aa75fdf89..e79cc26b4d 100644 --- a/src/gui/kernel/qaction_p.h +++ b/src/gui/kernel/qaction_p.h @@ -21,6 +21,8 @@ #if QT_CONFIG(shortcut) # include <QtGui/private/qshortcutmap_p.h> #endif + +#include <QtCore/qpointer.h> #include "private/qobject_p.h" QT_REQUIRE_CONFIG(action); diff --git a/src/gui/kernel/qactiongroup_p.h b/src/gui/kernel/qactiongroup_p.h index c7a058a6f2..ba939a2b10 100644 --- a/src/gui/kernel/qactiongroup_p.h +++ b/src/gui/kernel/qactiongroup_p.h @@ -21,6 +21,8 @@ #if QT_CONFIG(shortcut) # include <QtGui/private/qshortcutmap_p.h> #endif + +#include <QtCore/qpointer.h> #include "private/qobject_p.h" QT_REQUIRE_CONFIG(action); diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h index c863a63620..b5a2e015f4 100644 --- a/src/gui/kernel/qdnd_p.h +++ b/src/gui/kernel/qdnd_p.h @@ -27,6 +27,8 @@ #include "private/qobject_p.h" #include "QtGui/qbackingstore.h" +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(draganddrop); QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp index 0f707e2dd6..4e707e4915 100644 --- a/src/gui/kernel/qdrag.cpp +++ b/src/gui/kernel/qdrag.cpp @@ -9,6 +9,8 @@ #include <qpoint.h> #include "qdnd_p.h" +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE /*! diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index f39467cc0f..b5727956ae 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qevent.h" + #include "qcursor.h" #include "private/qguiapplication_p.h" #include "private/qinputdevice_p.h" @@ -9,6 +10,7 @@ #include "qpa/qplatformintegration.h" #include "private/qevent_p.h" #include "private/qeventpoint_p.h" + #include "qfile.h" #include "qhashfunctions.h" #include "qmetaobject.h" @@ -16,6 +18,7 @@ #include "qevent_p.h" #include "qmath.h" #include "qloggingcategory.h" +#include "qpointer.h" #if QT_CONFIG(draganddrop) #include <qpa/qplatformdrag.h> diff --git a/src/gui/kernel/qeventpoint_p.h b/src/gui/kernel/qeventpoint_p.h index f70c285e3e..c339c7e3e1 100644 --- a/src/gui/kernel/qeventpoint_p.h +++ b/src/gui/kernel/qeventpoint_p.h @@ -17,7 +17,9 @@ #include <QtGui/private/qtguiglobal_p.h> #include <QtGui/qevent.h> + #include <QtCore/qloggingcategory.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index c96cbdd01f..5d257b1fc7 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -34,6 +34,8 @@ # include "private/qshortcutmap_p.h" #endif +#include <QtCore/qpointer.h> + #include <memory> QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qpointingdevice_p.h b/src/gui/kernel/qpointingdevice_p.h index 403a54dc4f..b2f0574e9b 100644 --- a/src/gui/kernel/qpointingdevice_p.h +++ b/src/gui/kernel/qpointingdevice_p.h @@ -20,6 +20,8 @@ #include <QtGui/qpointingdevice.h> #include <QtGui/private/qtguiglobal_p.h> #include <QtGui/private/qinputdevice_p.h> + +#include <QtCore/qpointer.h> #include <QtCore/private/qflatmap_p.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index 7b1aad4838..5de3546392 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -26,6 +26,8 @@ #include <QtGui/qicon.h> #include <QtGui/qpalette.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class Q_GUI_EXPORT QWindowPrivate : public QObjectPrivate diff --git a/src/gui/text/qabstracttextdocumentlayout_p.h b/src/gui/text/qabstracttextdocumentlayout_p.h index f10c1d9bd2..6bd42d78d8 100644 --- a/src/gui/text/qabstracttextdocumentlayout_p.h +++ b/src/gui/text/qabstracttextdocumentlayout_p.h @@ -19,7 +19,9 @@ #include "private/qobject_p.h" #include "qtextdocument_p.h" #include "qabstracttextdocumentlayout.h" + #include "QtCore/qhash.h" +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 254960522d..83abe93dbf 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -25,6 +25,7 @@ #include <qbasictimer.h> #include "private/qfunctions_p.h" #include <qloggingcategory.h> +#include <QtCore/qpointer.h> #include <algorithm> diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index 0772a4452b..c42290feca 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -40,6 +40,7 @@ # include <QtNetwork/qtcpsocket.h> #endif +#include <QtCore/qpointer.h> #include <QtCore/qscopedpointer.h> #include <memory> diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index 7836daa18a..59c97a801a 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -42,6 +42,8 @@ Q_MOC_INCLUDE(<QtNetwork/QAuthenticator>) #include <private/qdecompresshelper_p.h> +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(http); QT_BEGIN_NAMESPACE diff --git a/src/network/access/qnetworkreplyfileimpl_p.h b/src/network/access/qnetworkreplyfileimpl_p.h index 2673b37197..6413903d8f 100644 --- a/src/network/access/qnetworkreplyfileimpl_p.h +++ b/src/network/access/qnetworkreplyfileimpl_p.h @@ -19,7 +19,9 @@ #include "qnetworkreply.h" #include "qnetworkreply_p.h" #include "qnetworkaccessmanager.h" + #include <QFile> +#include <QtCore/qpointer.h> #include <private/qabstractfileengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index 00f586562c..0564ad7a33 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -21,6 +21,8 @@ #include <qendian.h> #include <qnetworkinterface.h> +#include <QtCore/qpointer.h> + #include <memory> QT_BEGIN_NAMESPACE diff --git a/src/opengl/qopenglcustomshaderstage.cpp b/src/opengl/qopenglcustomshaderstage.cpp index d26bebfd61..1be8d783d6 100644 --- a/src/opengl/qopenglcustomshaderstage.cpp +++ b/src/opengl/qopenglcustomshaderstage.cpp @@ -6,6 +6,8 @@ #include "qopenglpaintengine_p.h" #include <private/qpainter_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QOpenGLCustomShaderStagePrivate diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp index 57192f8f09..e6a67df274 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp @@ -15,6 +15,8 @@ #include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qpointingdevice_p.h> +#include <QtCore/qpointer.h> + #include <mutex> #ifdef Q_OS_FREEBSD diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp index e66f9e19f2..c0e4bfacb6 100644 --- a/src/plugins/platforms/android/androidjniaccessibility.cpp +++ b/src/plugins/platforms/android/androidjniaccessibility.cpp @@ -15,7 +15,9 @@ #include <QtCore/private/qjnihelpers_p.h> #include <QtCore/QJniObject> #include <QtGui/private/qhighdpiscaling_p.h> + #include <QtCore/QObject> +#include <QtCore/qpointer.h> #include <QtCore/qvarlengtharray.h> static const char m_qtTag[] = "Qt A11Y"; diff --git a/src/plugins/platforms/android/qandroidinputcontext.h b/src/plugins/platforms/android/qandroidinputcontext.h index 3fa07589f0..0f0c4de4ae 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.h +++ b/src/plugins/platforms/android/qandroidinputcontext.h @@ -9,6 +9,8 @@ #include <functional> #include <jni.h> #include <qevent.h> + +#include <QtCore/qpointer.h> #include <QTimer> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h index 787b23ec4d..558071e5e1 100644 --- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h +++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h @@ -56,6 +56,7 @@ #include <QtCore/private/qcfsocketnotifier_p.h> #include <QtCore/private/qtimerinfo_unix_p.h> #include <QtCore/qloggingcategory.h> +#include <QtCore/qpointer.h> #include <CoreFoundation/CoreFoundation.h> diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index b1d20406c6..7a6999c2cc 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -19,6 +19,7 @@ #include "qcocoaapplicationdelegate.h" #include <QtCore/private/qcore_mac_p.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.h b/src/plugins/platforms/cocoa/qcocoamenubar.h index f450c507b5..785de9c0f6 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.h +++ b/src/plugins/platforms/cocoa/qcocoamenubar.h @@ -9,6 +9,8 @@ #include <qpa/qplatformmenu.h> #include "qcocoamenu.h" +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QCocoaWindow; diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.h b/src/plugins/platforms/cocoa/qcocoamenuitem.h index e438fd2a07..f677ffb7a7 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.h +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.h @@ -8,6 +8,8 @@ #include <qpa/qplatformmenu.h> #include <QtGui/QImage> +#include <QtCore/qpointer.h> + Q_FORWARD_DECLARE_OBJC_CLASS(NSMenuItem); Q_FORWARD_DECLARE_OBJC_CLASS(NSMenu); Q_FORWARD_DECLARE_OBJC_CLASS(NSObject); diff --git a/src/plugins/platforms/cocoa/qcocoansmenu.mm b/src/plugins/platforms/cocoa/qcocoansmenu.mm index 4bc9b0b5f9..ba222a3ef4 100644 --- a/src/plugins/platforms/cocoa/qcocoansmenu.mm +++ b/src/plugins/platforms/cocoa/qcocoansmenu.mm @@ -16,6 +16,8 @@ #include <QtCore/qvarlengtharray.h> #include <QtGui/private/qapplekeymapper_p.h> +#include <QtCore/qpointer.h> + static NSString *qt_mac_removePrivateUnicode(NSString *string) { if (const int len = string.length) { diff --git a/src/plugins/platforms/cocoa/qmacclipboard.h b/src/plugins/platforms/cocoa/qmacclipboard.h index 75c112a10b..95267565f2 100644 --- a/src/plugins/platforms/cocoa/qmacclipboard.h +++ b/src/plugins/platforms/cocoa/qmacclipboard.h @@ -7,6 +7,8 @@ #include <QtGui> #include <QtGui/qutimimeconverter.h> +#include <QtCore/qpointer.h> + #include <ApplicationServices/ApplicationServices.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm index 312899f3d9..b7ed5a1e97 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm @@ -12,6 +12,7 @@ #include <QtCore/qset.h> #include <QtCore/qthreadstorage.h> #include <QtCore/qfileselector.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/ios/qiosfiledialog.mm b/src/plugins/platforms/ios/qiosfiledialog.mm index 5dea3c6446..63d180220b 100644 --- a/src/plugins/platforms/ios/qiosfiledialog.mm +++ b/src/plugins/platforms/ios/qiosfiledialog.mm @@ -16,6 +16,8 @@ #include "qiosoptionalplugininterface.h" #include "qiosdocumentpickercontroller.h" +#include <QtCore/qpointer.h> + using namespace Qt::StringLiterals; QIOSFileDialog::QIOSFileDialog() diff --git a/src/plugins/platforms/ios/qiosinputcontext.mm b/src/plugins/platforms/ios/qiosinputcontext.mm index ac482226e9..c9959e8206 100644 --- a/src/plugins/platforms/ios/qiosinputcontext.mm +++ b/src/plugins/platforms/ios/qiosinputcontext.mm @@ -18,6 +18,8 @@ #include <QGuiApplication> #include <QtGui/private/qwindow_p.h> +#include <QtCore/qpointer.h> + // ------------------------------------------------------------------------- static QUIView *focusView() diff --git a/src/plugins/platforms/ios/qiosmenu.h b/src/plugins/platforms/ios/qiosmenu.h index 1822c08b1a..b0c8e7e10c 100644 --- a/src/plugins/platforms/ios/qiosmenu.h +++ b/src/plugins/platforms/ios/qiosmenu.h @@ -11,6 +11,8 @@ #import "quiview.h" +#include <QtCore/qpointer.h> + class QIOSMenu; @class QUIMenuController; @class QUIPickerView; diff --git a/src/plugins/platforms/ios/qiosviewcontroller.mm b/src/plugins/platforms/ios/qiosviewcontroller.mm index 6f157353df..01a8a0d9b2 100644 --- a/src/plugins/platforms/ios/qiosviewcontroller.mm +++ b/src/plugins/platforms/ios/qiosviewcontroller.mm @@ -21,6 +21,8 @@ #include "qioswindow.h" #include "quiview.h" +#include <QtCore/qpointer.h> + // ------------------------------------------------------------------------- @interface QIOSViewController () diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp index 798d9a1198..02aec10bb3 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.cpp +++ b/src/plugins/platforms/windows/qwindowsdrag.cpp @@ -28,6 +28,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qbuffer.h> #include <QtCore/qpoint.h> +#include <QtCore/qpointer.h> #include <shlobj.h> diff --git a/src/printsupport/dialogs/qabstractprintdialog_p.h b/src/printsupport/dialogs/qabstractprintdialog_p.h index baf6027c10..40f25d454a 100644 --- a/src/printsupport/dialogs/qabstractprintdialog_p.h +++ b/src/printsupport/dialogs/qabstractprintdialog_p.h @@ -20,6 +20,8 @@ #include "private/qdialog_p.h" #include "QtPrintSupport/qabstractprintdialog.h" +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(printdialog); QT_BEGIN_NAMESPACE diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp index abcc39ac19..2028287b55 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.cpp +++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp @@ -28,6 +28,8 @@ #include <QtWidgets/qformlayout.h> #include <QtWidgets/qlabel.h> +#include <QtCore/qpointer.h> + static void _q_ppd_initResources() { static bool resourcesInitialized = false; diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index 5ec2424b5c..d31e54bc94 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -43,6 +43,8 @@ #include <qpa/qplatformservices.h> #include <private/qguiapplication_p.h> +#include <QtCore/qpointer.h> + #include <algorithm> QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h index d46d1986e8..797f4c1833 100644 --- a/src/widgets/dialogs/qfontdialog_p.h +++ b/src/widgets/dialogs/qfontdialog_p.h @@ -21,6 +21,8 @@ #include "qfontdatabase.h" #include "qfontdialog.h" #include <qpa/qplatformdialoghelper.h> + +#include <QtCore/qpointer.h> #include "qsharedpointer.h" QT_REQUIRE_CONFIG(fontdialog); diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index 89ea6e6746..d61f65bab7 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -18,6 +18,8 @@ #include "qevent.h" #include "qdialog_p.h" +#include <QtCore/qpointer.h> + QT_USE_NAMESPACE enum CandidateSignal { diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index efe846900d..2830d3f8ee 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -32,6 +32,7 @@ #include <QtCore/qanystringview.h> #include <QtCore/qdebug.h> +#include <QtCore/qpointer.h> #include <QtCore/qversionnumber.h> #ifdef Q_OS_WIN diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp index 5c2f00913a..5ef2192df4 100644 --- a/src/widgets/dialogs/qprogressdialog.cpp +++ b/src/widgets/dialogs/qprogressdialog.cpp @@ -17,6 +17,9 @@ #include "qelapsedtimer.h" #include "qscopedvaluerollback.h" #include <private/qdialog_p.h> + +#include <QtCore/qpointer.h> + #include <limits.h> using namespace std::chrono_literals; diff --git a/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp index ab20b9da2e..cb90436462 100644 --- a/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp +++ b/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp @@ -1,6 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +#include <QtCore/qpointer.h> + //! [0] QFormLayout *formLayout = new QFormLayout(this); formLayout->addRow(tr("&Name:"), nameLineEdit); diff --git a/src/widgets/graphicsview/qgraphicsproxywidget_p.h b/src/widgets/graphicsview/qgraphicsproxywidget_p.h index 902a66ee68..328faad0be 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget_p.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget_p.h @@ -19,6 +19,8 @@ #include "qgraphicsproxywidget.h" #include "private/qgraphicswidget_p.h" +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(graphicsview); QT_BEGIN_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 4badeba313..ad63ff18a0 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -216,6 +216,8 @@ #include <private/qgesturemanager_p.h> #include <private/qpathclipper_p.h> +#include <QtCore/qpointer.h> + // #define GESTURE_DEBUG #ifndef GESTURE_DEBUG # define DEBUG if (0) qDebug diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h index a15defe621..7f1682beca 100644 --- a/src/widgets/graphicsview/qgraphicsview_p.h +++ b/src/widgets/graphicsview/qgraphicsview_p.h @@ -25,6 +25,8 @@ #include <private/qabstractscrollarea_p.h> #include <private/qapplication_p.h> +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(graphicsview); QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h index f496e5ca6b..433429f48b 100644 --- a/src/widgets/itemviews/qabstractitemview_p.h +++ b/src/widgets/itemviews/qabstractitemview_p.h @@ -24,9 +24,12 @@ #include "QtCore/qmimedata.h" #include "QtGui/qpainter.h" #include "QtGui/qregion.h" + #include "QtCore/qdebug.h" #include "QtCore/qbasictimer.h" #include "QtCore/qelapsedtimer.h" +#include <QtCore/qpointer.h> + #include <array> diff --git a/src/widgets/itemviews/qdatawidgetmapper.cpp b/src/widgets/itemviews/qdatawidgetmapper.cpp index 0b43707b02..3b7e97eed9 100644 --- a/src/widgets/itemviews/qdatawidgetmapper.cpp +++ b/src/widgets/itemviews/qdatawidgetmapper.cpp @@ -7,8 +7,10 @@ #include "qmetaobject.h" #include "qwidget.h" #include "qstyleditemdelegate.h" + #include "private/qobject_p.h" #include "private/qabstractitemmodel_p.h" +#include <QtCore/qpointer.h> #include <array> #include <iterator> diff --git a/src/widgets/kernel/qaction_widgets_p.h b/src/widgets/kernel/qaction_widgets_p.h index bc24ce3df1..77c3d8a680 100644 --- a/src/widgets/kernel/qaction_widgets_p.h +++ b/src/widgets/kernel/qaction_widgets_p.h @@ -20,6 +20,8 @@ #include <QtWidgets/qmenu.h> #endif +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(action); QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qgesturemanager_p.h b/src/widgets/kernel/qgesturemanager_p.h index f15e4ba233..02beb024f9 100644 --- a/src/widgets/kernel/qgesturemanager_p.h +++ b/src/widgets/kernel/qgesturemanager_p.h @@ -21,6 +21,8 @@ #include "private/qwidget_p.h" #include "qgesturerecognizer.h" +#include <QtCore/qpointer.h> + #ifndef QT_NO_GESTURES #include <functional> diff --git a/src/widgets/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp index aca470fe1c..04eacf1d41 100644 --- a/src/widgets/kernel/qstackedlayout.cpp +++ b/src/widgets/kernel/qstackedlayout.cpp @@ -8,6 +8,8 @@ #include "private/qwidget_p.h" #include "private/qlayoutengine_p.h" +#include <QtCore/qpointer.h> + #include <memory> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index d2fe4054b8..926ec37b2d 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -42,6 +42,8 @@ #include <qpa/qplatformbackingstore.h> #include <QtGui/private/qbackingstorerhisupport_p.h> +#include <QtCore/qpointer.h> + #include <vector> #include <memory> diff --git a/src/widgets/kernel/qwidgetaction_p.h b/src/widgets/kernel/qwidgetaction_p.h index bd156241c6..415ac7c9f8 100644 --- a/src/widgets/kernel/qwidgetaction_p.h +++ b/src/widgets/kernel/qwidgetaction_p.h @@ -18,6 +18,8 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qaction_widgets_p.h" +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(action); QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h index 0eee3cd900..0ee6b71a79 100644 --- a/src/widgets/kernel/qwidgetwindow_p.h +++ b/src/widgets/kernel/qwidgetwindow_p.h @@ -22,6 +22,8 @@ #include <QtGui/private/qevent_p.h> #include <QtWidgets/qwidget.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp index 072a0bc5fa..14286406dc 100644 --- a/src/widgets/kernel/qwindowcontainer.cpp +++ b/src/widgets/kernel/qwindowcontainer.cpp @@ -14,6 +14,8 @@ #include <QAbstractScrollArea> #include <QPainter> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; diff --git a/src/widgets/styles/qproxystyle_p.h b/src/widgets/styles/qproxystyle_p.h index 1b9466bb17..6b686023a5 100644 --- a/src/widgets/styles/qproxystyle_p.h +++ b/src/widgets/styles/qproxystyle_p.h @@ -20,6 +20,8 @@ #include "qcommonstyle_p.h" #include "qproxystyle.h" +#include <QtCore/qpointer.h> + #ifndef QT_NO_STYLE_PROXY QT_BEGIN_NAMESPACE diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h index b74de04031..a88996f180 100644 --- a/src/widgets/util/qcompleter_p.h +++ b/src/widgets/util/qcompleter_p.h @@ -25,7 +25,9 @@ #include "qcompleter.h" #include "qstyleditemdelegate.h" #include "QtGui/qpainter.h" + #include "private/qabstractproxymodel_p.h" +#include <QtCore/qpointer.h> QT_REQUIRE_CONFIG(completer); diff --git a/src/widgets/util/qflickgesture_p.h b/src/widgets/util/qflickgesture_p.h index b1ae770753..e8306b77e8 100644 --- a/src/widgets/util/qflickgesture_p.h +++ b/src/widgets/util/qflickgesture_p.h @@ -20,6 +20,8 @@ #include "qgesturerecognizer.h" #include "private/qgesture_p.h" #include "qscroller.h" + +#include <QtCore/qpointer.h> #include "qscopedpointer.h" #ifndef QT_NO_GESTURES diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index 3b40ad5285..3a5fbe1b90 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -21,6 +21,8 @@ #endif #include <qpa/qplatformtheme.h> +#include <QtCore/qpointer.h> + #include <algorithm> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index 10aea1da3c..f988bc7a19 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -26,6 +26,7 @@ # include <qaccessible.h> #endif +#include <QtCore/qpointer.h> //#define QABSTRACTSPINBOX_QSBDEBUG #ifdef QABSTRACTSPINBOX_QSBDEBUG diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index a9086ec4dc..b7a084364b 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -50,6 +50,8 @@ #endif #include <array> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index cfabf65dda..21be760fd0 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -28,6 +28,7 @@ #include "private/qdatetimeparser_p.h" #include "qdebug.h" +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp index c35f8c8edc..612b283825 100644 --- a/src/widgets/widgets/qdialogbuttonbox.cpp +++ b/src/widgets/widgets/qdialogbuttonbox.cpp @@ -16,6 +16,8 @@ #include "qdialogbuttonbox.h" #include "qdialogbuttonbox_p.h" +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE /*! diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 8fd90f8b77..0b7cb9f588 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -22,6 +22,7 @@ #include <qpa/qplatformtheme.h> #include "qdebug.h" +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qlabel_p.h b/src/widgets/widgets/qlabel_p.h index 4718a07614..2a3dcdaa2f 100644 --- a/src/widgets/widgets/qlabel_p.h +++ b/src/widgets/widgets/qlabel_p.h @@ -33,6 +33,8 @@ #include "qmenu.h" #endif +#include <QtCore/qpointer.h> + #include <optional> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index f09c9e82f4..e565910319 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -37,7 +37,9 @@ #if QT_CONFIG(toolbar) #include "qtoolbararealayout_p.h" #endif + #include <QtCore/qloggingcategory.h> +#include <QtCore/qpointer.h> QT_REQUIRE_CONFIG(mainwindow); diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h index 2e66a31fbc..e57b9772ca 100644 --- a/src/widgets/widgets/qmdiarea_p.h +++ b/src/widgets/widgets/qmdiarea_p.h @@ -29,6 +29,8 @@ QT_REQUIRE_CONFIG(mdiarea); #include <private/qmdisubwindow_p.h> #include <private/qabstractscrollarea_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE namespace QMdi { diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index 0d849e5eed..a009262128 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -29,6 +29,8 @@ #include <qpa/qplatformmenu.h> +#include <QtCore/qpointer.h> + #include <functional> QT_REQUIRE_CONFIG(menu); diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h index ee524c3acb..549a4c7a1f 100644 --- a/src/widgets/widgets/qmenubar_p.h +++ b/src/widgets/widgets/qmenubar_p.h @@ -20,6 +20,8 @@ #include <private/qmenu_p.h> // Mac needs what in this file! #include <qpa/qplatformmenu.h> +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(menubar); QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h index 6e4aa8133c..f788f1a647 100644 --- a/src/widgets/widgets/qplaintextedit_p.h +++ b/src/widgets/widgets/qplaintextedit_p.h @@ -32,6 +32,8 @@ #include "private/qwidgettextcontrol_p.h" +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(textedit); QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qpushbutton_p.h b/src/widgets/widgets/qpushbutton_p.h index 8b39de5cea..0817589baf 100644 --- a/src/widgets/widgets/qpushbutton_p.h +++ b/src/widgets/widgets/qpushbutton_p.h @@ -7,6 +7,8 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractbutton_p.h" +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(pushbutton); // diff --git a/src/widgets/widgets/qscrollarea_p.h b/src/widgets/widgets/qscrollarea_p.h index 8d066e9e17..a599fa8c36 100644 --- a/src/widgets/widgets/qscrollarea_p.h +++ b/src/widgets/widgets/qscrollarea_p.h @@ -20,6 +20,8 @@ #include "private/qabstractscrollarea_p.h" #include <QtWidgets/qscrollbar.h> +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(scrollarea); QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index 28794bfdcc..789cffba99 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -12,7 +12,10 @@ #if QT_CONFIG(menu) #include "qmenu.h" #endif + #include <QtCore/qelapsedtimer.h> +#include <QtCore/qpointer.h> + #if QT_CONFIG(accessibility) #include "qaccessible.h" diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp index 8ffcb0081b..8d23784f39 100644 --- a/src/widgets/widgets/qsizegrip.cpp +++ b/src/widgets/widgets/qsizegrip.cpp @@ -18,6 +18,8 @@ #include <qpa/qplatformtheme.h> #include <QtWidgets/qabstractscrollarea.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE static QWidget *qt_sizegrip_topLevelWidget(QWidget* w) diff --git a/src/widgets/widgets/qsplitter_p.h b/src/widgets/widgets/qsplitter_p.h index 9fbd3ea520..5d5723a957 100644 --- a/src/widgets/widgets/qsplitter_p.h +++ b/src/widgets/widgets/qsplitter_p.h @@ -18,6 +18,8 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qframe_p.h" +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(splitter); QT_BEGIN_NAMESPACE diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp index dda91225e5..d0203a6d3b 100644 --- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp +++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp @@ -7,6 +7,8 @@ #include <qwindow.h> #include <QtGui/private/qpointingdevice_p.h> +#include <QtCore/qpointer.h> + Q_LOGGING_CATEGORY(lcTests, "qt.gui.tests") class MouseEventWidget : public QWindow diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp index be976adc5f..36254b17a9 100644 --- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp @@ -20,6 +20,8 @@ #include <private/qguiapplication_p.h> #include <qpa/qplatformintegration.h> +#include <QtCore/qpointer.h> + Q_LOGGING_CATEGORY(lcTests, "qt.gui.tests") class tst_QTouchEventWidget : public QWidget |