diff options
70 files changed, 128 insertions, 1 deletions
diff --git a/src/labs/sharedimage/qsharedimageloader.cpp b/src/labs/sharedimage/qsharedimageloader.cpp index f1313b5c0e..f3c17f9ebb 100644 --- a/src/labs/sharedimage/qsharedimageloader.cpp +++ b/src/labs/sharedimage/qsharedimageloader.cpp @@ -4,6 +4,8 @@ #include "qsharedimageloader_p.h" #include <private/qobject_p.h> #include <private/qimage_p.h> + +#include <QtCore/qpointer.h> #include <QSharedMemory> #include <memory> diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp index 1b47d6e241..79ca13b37b 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp @@ -13,6 +13,8 @@ #include <QtQml/qqmlengine.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE QV4DebugJob::~QV4DebugJob() diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.h index 3d256e80e2..c23d3a583e 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.h @@ -17,6 +17,7 @@ #include "qqmlpreviewfileloader.h" +#include <QtCore/qpointer.h> #include <private/qabstractfileengine_p.h> #include <private/qfsfileengine_p.h> #include <QtCore/qbuffer.h> diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h index 44aad96384..37142df245 100644 --- a/src/qml/qml/qqmlengine_p.h +++ b/src/qml/qml/qqmlengine_p.h @@ -39,6 +39,7 @@ #include <QtCore/qmetaobject.h> #include <QtCore/qmutex.h> #include <QtCore/qpair.h> +#include <QtCore/qpointer.h> #include <QtCore/qproperty.h> #include <QtCore/qstack.h> #include <QtCore/qstring.h> diff --git a/src/qml/qml/qqmlfileselector_p.h b/src/qml/qml/qqmlfileselector_p.h index 31f18cc27e..ea1c1902bb 100644 --- a/src/qml/qml/qqmlfileselector_p.h +++ b/src/qml/qml/qqmlfileselector_p.h @@ -21,6 +21,8 @@ #include <private/qobject_p.h> #include <private/qtqmlglobal_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QFileSelector; diff --git a/src/qml/qml/qqmlincubator_p.h b/src/qml/qml/qqmlincubator_p.h index d786cd9f52..eec0f7f421 100644 --- a/src/qml/qml/qqmlincubator_p.h +++ b/src/qml/qml/qqmlincubator_p.h @@ -12,6 +12,8 @@ #include <private/qqmlengine_p.h> #include <private/qqmlguardedcontextdata_p.h> +#include <QtCore/qpointer.h> + // // W A R N I N G // ------------- diff --git a/src/qml/qml/qqmllist_p.h b/src/qml/qml/qqmllist_p.h index 2a323fcd59..642b3c3db1 100644 --- a/src/qml/qml/qqmllist_p.h +++ b/src/qml/qml/qqmllist_p.h @@ -20,6 +20,8 @@ #include "qqmlmetatype_p.h" #include <QtQml/private/qbipointer_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQmlListReferencePrivate diff --git a/src/qml/qml/qqmlopenmetaobject.cpp b/src/qml/qml/qqmlopenmetaobject.cpp index cf51286677..2d0a78c6cb 100644 --- a/src/qml/qml/qqmlopenmetaobject.cpp +++ b/src/qml/qml/qqmlopenmetaobject.cpp @@ -5,8 +5,10 @@ #include <private/qqmlpropertycache_p.h> #include <private/qqmldata_p.h> #include <private/qqmlmetatype_p.h> + #include <private/qmetaobjectbuilder_p.h> #include <qdebug.h> +#include <QtCore/qpointer.h> #include <QtCore/qset.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/qqmlproperty_p.h b/src/qml/qml/qqmlproperty_p.h index da1b7693e3..c9ed4606ea 100644 --- a/src/qml/qml/qqmlproperty_p.h +++ b/src/qml/qml/qqmlproperty_p.h @@ -26,6 +26,8 @@ #include <QtQml/qqmlengine.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQmlContext; diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index eb4b9e4419..c5d18860db 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -19,6 +19,8 @@ #include <QtQml/qjsengine.h> #include <QtQml/qqmlfile.h> #include <QtNetwork/qnetworkreply.h> + +#include <QtCore/qpointer.h> #include <QtCore/qstringconverter.h> #include <QtCore/qxmlstream.h> #include <QtCore/qstack.h> diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index 53f1a90c82..97c809611a 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -25,6 +25,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qfile.h> #include <QtCore/qloggingcategory.h> +#include <QtCore/qpointer.h> #include <QtCore/qtimer.h> QT_BEGIN_NAMESPACE diff --git a/src/qmldebug/qqmldebugclient_p_p.h b/src/qmldebug/qqmldebugclient_p_p.h index 23ddae1ab1..003b513db2 100644 --- a/src/qmldebug/qqmldebugclient_p_p.h +++ b/src/qmldebug/qqmldebugclient_p_p.h @@ -5,7 +5,9 @@ #define QQMLDEBUGCLIENT_P_P_H #include "qqmldebugclient_p.h" + #include <private/qobject_p.h> +#include <QtCore/qpointer.h> // // W A R N I N G diff --git a/src/qmlmodels/qqmldelegatemodel_p_p.h b/src/qmlmodels/qqmldelegatemodel_p_p.h index 2194224cb6..95812907be 100644 --- a/src/qmlmodels/qqmldelegatemodel_p_p.h +++ b/src/qmlmodels/qqmldelegatemodel_p_p.h @@ -14,6 +14,7 @@ #include <private/qqmlopenmetaobject_p.h> #include <QtCore/qloggingcategory.h> +#include <QtCore/qpointer.h> // // W A R N I N G diff --git a/src/qmlmodels/qqmldmobjectdata_p.h b/src/qmlmodels/qqmldmobjectdata_p.h index f5ffcdc3b9..3d640536b0 100644 --- a/src/qmlmodels/qqmldmobjectdata_p.h +++ b/src/qmlmodels/qqmldmobjectdata_p.h @@ -17,7 +17,9 @@ #include <private/qqmladaptormodelenginedata_p.h> #include <private/qqmldelegatemodel_p_p.h> + #include <private/qobject_p.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/qmlmodels/qqmlinstantiator_p_p.h b/src/qmlmodels/qqmlinstantiator_p_p.h index 3304ac0f8f..bc38357bc3 100644 --- a/src/qmlmodels/qqmlinstantiator_p_p.h +++ b/src/qmlmodels/qqmlinstantiator_p_p.h @@ -21,6 +21,8 @@ #include <private/qqmlchangeset_p.h> #include <private/qqmlobjectmodel_p.h> +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(qml_object_model); QT_BEGIN_NAMESPACE diff --git a/src/qmlmodels/qqmltableinstancemodel_p.h b/src/qmlmodels/qqmltableinstancemodel_p.h index c7e7caf593..4c802b003d 100644 --- a/src/qmlmodels/qqmltableinstancemodel_p.h +++ b/src/qmlmodels/qqmltableinstancemodel_p.h @@ -18,6 +18,8 @@ #include <QtQmlModels/private/qqmldelegatemodel_p.h> #include <QtQmlModels/private/qqmldelegatemodel_p_p.h> +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(qml_table_model); QT_BEGIN_NAMESPACE diff --git a/src/qmltest/quicktest_p.h b/src/qmltest/quicktest_p.h index 0cb1aae831..7362bb4558 100644 --- a/src/qmltest/quicktest_p.h +++ b/src/qmltest/quicktest_p.h @@ -21,6 +21,8 @@ #include <QtQml/qqmlpropertymap.h> #include <QtQml/qqml.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class Q_QUICK_TEST_PRIVATE_EXPORT QTestRootObject : public QObject diff --git a/src/quick/designer/qqmldesignermetaobject_p.h b/src/quick/designer/qqmldesignermetaobject_p.h index 71623f46ab..7fd8e77387 100644 --- a/src/quick/designer/qqmldesignermetaobject_p.h +++ b/src/quick/designer/qqmldesignermetaobject_p.h @@ -22,6 +22,8 @@ #include <private/qqmlopenmetaobject_p.h> #include <private/qqmlvmemetaobject_p.h> +#include <QtCore/qpointer.h> + #include <memory> QT_BEGIN_NAMESPACE diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp index bb9c5d254e..a00ebecae3 100644 --- a/src/quick/handlers/qquickpointerhandler.cpp +++ b/src/quick/handlers/qquickpointerhandler.cpp @@ -8,6 +8,8 @@ #include <QtQuick/private/qquickdeliveryagent_p_p.h> #include <QtGui/private/qinputdevice_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(lcPointerHandlerDispatch, "qt.quick.handler.dispatch") diff --git a/src/quick/handlers/qquickpointhandler.cpp b/src/quick/handlers/qquickpointhandler.cpp index 5fd956b0ed..ab1f274aa1 100644 --- a/src/quick/handlers/qquickpointhandler.cpp +++ b/src/quick/handlers/qquickpointhandler.cpp @@ -3,7 +3,9 @@ #include "qquickpointhandler_p.h" #include <private/qquickwindow_p.h> + #include <QDebug> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 42607e9999..32a3865c63 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -44,6 +44,8 @@ #include <private/qsgdefaultrendercontext_p.h> +#include <QtCore/qpointer.h> + #include <cmath> #if defined(Q_OS_QNX) || defined(Q_OS_ANDROID) #include <ctype.h> diff --git a/src/quick/items/qquickcolorgroup_p.h b/src/quick/items/qquickcolorgroup_p.h index 0021500894..dada14c2fc 100644 --- a/src/quick/items/qquickcolorgroup_p.h +++ b/src/quick/items/qquickcolorgroup_p.h @@ -22,6 +22,8 @@ #include <QtQml/qqml.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickPalette; diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp index 813ffa46b4..2538e0e238 100644 --- a/src/quick/items/qquickdroparea.cpp +++ b/src/quick/items/qquickdroparea.cpp @@ -7,6 +7,7 @@ #include <private/qv4arraybuffer_p.h> +#include <QtCore/qpointer.h> #include <QtCore/qregularexpression.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp index c5d50df1ae..2e48566295 100644 --- a/src/quick/items/qquickflipable.cpp +++ b/src/quick/items/qquickflipable.cpp @@ -7,6 +7,8 @@ #include <QtQml/qqmlinfo.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE // XXX todo - i think this needs work and a bit of a re-think diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index b7d879cbb8..5f98716084 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -48,6 +48,8 @@ # include <QtGui/qcursor.h> #endif +#include <QtCore/qpointer.h> + #include <algorithm> #include <limits> diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index ba7a4add94..698b892806 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -42,6 +42,7 @@ #include <QtCore/qlist.h> #include <QtCore/qdebug.h> #include <QtCore/qelapsedtimer.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickitemgrabresult.cpp b/src/quick/items/qquickitemgrabresult.cpp index adc36e0b93..74912323d6 100644 --- a/src/quick/items/qquickitemgrabresult.cpp +++ b/src/quick/items/qquickitemgrabresult.cpp @@ -19,6 +19,8 @@ #include <private/qsgcontext_p.h> #include <private/qsgadaptationlayer_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE const QEvent::Type Event_Grab_Completed = static_cast<QEvent::Type>(QEvent::User + 1); diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index 8f8d27663d..c05233d82a 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -29,6 +29,7 @@ QT_REQUIRE_CONFIG(quick_itemview); #include <QtQmlModels/private/qqmldelegatemodel_p.h> #include <QtQmlModels/private/qqmlchangeset_p.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickitemviewfxitem_p_p.h b/src/quick/items/qquickitemviewfxitem_p_p.h index eec72fdcf3..a8e40e4772 100644 --- a/src/quick/items/qquickitemviewfxitem_p_p.h +++ b/src/quick/items/qquickitemviewfxitem_p_p.h @@ -22,6 +22,8 @@ #endif #include <private/qanimationjobutil_p.h> +#include <QtCore/qpointer.h> + QT_REQUIRE_CONFIG(quick_itemview); QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickitemviewtransition_p.h b/src/quick/items/qquickitemviewtransition_p.h index f066b80962..c948533415 100644 --- a/src/quick/items/qquickitemviewtransition_p.h +++ b/src/quick/items/qquickitemviewtransition_p.h @@ -26,6 +26,8 @@ QT_REQUIRE_CONFIG(quick_viewtransitions); #include <private/qquicktransition_p.h> #include <private/qanimationjobutil_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickItem; diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h index 52afca5e45..a4942a2f55 100644 --- a/src/quick/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_p.h @@ -23,6 +23,8 @@ QT_REQUIRE_CONFIG(quick_listview); #include <private/qtquickglobal_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickListView; diff --git a/src/quick/items/qquickpalette_p.h b/src/quick/items/qquickpalette_p.h index 641646c403..7ea36a5b45 100644 --- a/src/quick/items/qquickpalette_p.h +++ b/src/quick/items/qquickpalette_p.h @@ -16,6 +16,8 @@ #include <QtQuick/private/qquickcolorgroup_p.h> +#include <QtCore/qpointer.h> + #include <array> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h index 61c0b2ce62..81bdd38294 100644 --- a/src/quick/items/qquickpathview_p_p.h +++ b/src/quick/items/qquickpathview_p_p.h @@ -31,6 +31,8 @@ QT_REQUIRE_CONFIG(quick_pathview); #include <private/qquicktimeline_p_p.h> #include <private/qpodvector_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQmlOpenMetaObjectType; diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index 1e4604601d..7481a30b3f 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -18,6 +18,8 @@ #include <QtQml/qqml.h> #include <QtQuick/private/qtquickglobal_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp index 1c8bee7253..1431b5ee5e 100644 --- a/src/quick/items/qquickstateoperations.cpp +++ b/src/quick/items/qquickstateoperations.cpp @@ -7,7 +7,10 @@ #include <private/qquickstate_p_p.h> #include <QtQml/qqmlinfo.h> + #include <QtCore/qmath.h> +#include <QtCore/qpointer.h> + #include <memory> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquicktextdocument.cpp b/src/quick/items/qquicktextdocument.cpp index a24ee163d8..ac876c2e74 100644 --- a/src/quick/items/qquicktextdocument.cpp +++ b/src/quick/items/qquicktextdocument.cpp @@ -12,6 +12,8 @@ #include <QtQml/qqmlcontext.h> #include <QtQuick/private/qquickpixmap_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE /*! diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 7cb7d1644b..e4c5e56e6c 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -48,6 +48,7 @@ #ifndef QT_NO_DEBUG_STREAM #include <private/qdebug_p.h> #endif +#include <QtCore/qpointer.h> #include <rhi/qrhi.h> diff --git a/src/quick/scenegraph/qsgcontext_p.h b/src/quick/scenegraph/qsgcontext_p.h index 7f251e100c..0bc50a2c2f 100644 --- a/src/quick/scenegraph/qsgcontext_p.h +++ b/src/quick/scenegraph/qsgcontext_p.h @@ -28,6 +28,8 @@ #include <QtQuick/qsgnode.h> #include <QtQuick/qsgrendererinterface.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QSGContextPrivate; diff --git a/src/quick/util/qquickanimation_p_p.h b/src/quick/util/qquickanimation_p_p.h index 217128da51..e4e666134b 100644 --- a/src/quick/util/qquickanimation_p_p.h +++ b/src/quick/util/qquickanimation_p_p.h @@ -31,7 +31,7 @@ #include <QDebug> #include <private/qobject_p.h> - +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/util/qquickanimator_p_p.h b/src/quick/util/qquickanimator_p_p.h index 29dd34a8e8..d138fc4f72 100644 --- a/src/quick/util/qquickanimator_p_p.h +++ b/src/quick/util/qquickanimator_p_p.h @@ -19,6 +19,8 @@ #include "qquickanimation_p_p.h" #include <QtQuick/qquickitem.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickAnimatorJob; diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h index fef29ac385..5569c392ea 100644 --- a/src/quick/util/qquickanimatorjob_p.h +++ b/src/quick/util/qquickanimatorjob_p.h @@ -23,6 +23,7 @@ #include <QtQuick/qquickitem.h> #include <QtCore/qeasingcurve.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/util/qquickbehavior.cpp b/src/quick/util/qquickbehavior.cpp index 31394fcb52..21207f1f06 100644 --- a/src/quick/util/qquickbehavior.cpp +++ b/src/quick/util/qquickbehavior.cpp @@ -14,6 +14,7 @@ #include <private/qquickanimatorjob_p.h> #include <private/qobject_p.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/util/qquickdeliveryagent.cpp b/src/quick/util/qquickdeliveryagent.cpp index 784d751087..947321755f 100644 --- a/src/quick/util/qquickdeliveryagent.cpp +++ b/src/quick/util/qquickdeliveryagent.cpp @@ -18,6 +18,8 @@ #include <QtQuick/private/qquickrendercontrol_p.h> #include <QtQuick/private/qquickwindow_p.h> +#include <QtCore/qpointer.h> + #include <memory> QT_BEGIN_NAMESPACE diff --git a/src/quick/util/qquickdeliveryagent_p_p.h b/src/quick/util/qquickdeliveryagent_p_p.h index 7852ad4673..b03c618cf2 100644 --- a/src/quick/util/qquickdeliveryagent_p_p.h +++ b/src/quick/util/qquickdeliveryagent_p_p.h @@ -21,6 +21,8 @@ #include <private/qevent_p.h> #include <private/qpointingdevice_p.h> + +#include <QtCore/qpointer.h> #include <private/qobject_p.h> #include <memory> diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 3eae2ac28d..f1aae5c6fa 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -24,6 +24,7 @@ #include <QtQml/private/qqmlanybinding_p.h> #include <QtCore/qiterable.h> +#include <QtCore/qpointer.h> #ifdef Q_CC_MSVC // MSVC2010 warns about 'unused variable t', even if it's used in t->~T() diff --git a/src/quick/util/qquickpropertychanges.cpp b/src/quick/util/qquickpropertychanges.cpp index f1c01e3a0b..f27c23cc9e 100644 --- a/src/quick/util/qquickpropertychanges.cpp +++ b/src/quick/util/qquickpropertychanges.cpp @@ -23,6 +23,7 @@ #include <QtQml/private/qqmlsignalnames_p.h> #include <private/qobject_p.h> +#include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/quickcontrols/material/impl/qquickmaterialplaceholdertext_p.h b/src/quickcontrols/material/impl/qquickmaterialplaceholdertext_p.h index 22e8b4e99a..7771adf08a 100644 --- a/src/quickcontrols/material/impl/qquickmaterialplaceholdertext_p.h +++ b/src/quickcontrols/material/impl/qquickmaterialplaceholdertext_p.h @@ -19,6 +19,8 @@ #include <QtGui/qcolor.h> #include <QtQuickControls2Impl/private/qquickplaceholdertext_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QParallelAnimationGroup; diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p_p.h index b7c4dc8e2c..503dff1a77 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickcolordialogimpl_p_p.h @@ -24,6 +24,8 @@ #include <QtQuickTemplates2/private/qquickabstractbutton_p.h> #include <QtQuickTemplates2/private/qquickslider_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickEyeDropperEventFilter : public QObject diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickcolorinputs_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickcolorinputs_p.h index e6ce02ea37..d100c5f6bf 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickcolorinputs_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickcolorinputs_p.h @@ -23,6 +23,8 @@ #include "qquickcolordialogutils_p.h" +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class Q_QUICKDIALOGS2QUICKIMPL_PRIVATE_EXPORT QQuickColorInputs : public QQuickItem diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p_p.h index a0d893543b..862d748f03 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickfiledialogimpl_p_p.h @@ -23,6 +23,8 @@ #include "qquickfiledialogimpl_p.h" +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickFileNameFilter; diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p_p.h index b5abda79ad..329391a972 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickfolderdialogimpl_p_p.h @@ -20,6 +20,8 @@ #include "qquickfolderdialogimpl_p.h" +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickFolderDialogImplPrivate : public QQuickDialogPrivate diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p_p.h index cd2ceb49b4..e7bbe9f474 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickfontdialogimpl_p_p.h @@ -21,6 +21,8 @@ #include "qquickfontdialogimpl_p.h" +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickFontDialogImplPrivate : public QQuickDialogPrivate diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p_p.h b/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p_p.h index dca7ad218c..c2a66eae28 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p_p.h +++ b/src/quickdialogs/quickdialogsquickimpl/qquickmessagedialogimpl_p_p.h @@ -19,6 +19,8 @@ #include "qquickmessagedialogimpl_p.h" +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickMessageDialogImplPrivate : public QQuickDialogPrivate diff --git a/src/quicknativestyle/items/qquickstyleitem.h b/src/quicknativestyle/items/qquickstyleitem.h index 1ad8932d23..08ba772efe 100644 --- a/src/quicknativestyle/items/qquickstyleitem.h +++ b/src/quicknativestyle/items/qquickstyleitem.h @@ -14,6 +14,8 @@ #include "qquickstyle.h" #include "qquickstyleoption.h" +#include <QtCore/qpointer.h> + // Work-around for now, to avoid creator getting confused // about missing macros. Should eventually be defined // in qt declarative somewhere I assume. diff --git a/src/quicktemplates/qquickabstractbutton_p_p.h b/src/quicktemplates/qquickabstractbutton_p_p.h index 731d36189b..e03b28fe82 100644 --- a/src/quicktemplates/qquickabstractbutton_p_p.h +++ b/src/quicktemplates/qquickabstractbutton_p_p.h @@ -21,6 +21,8 @@ # include <QtGui/qkeysequence.h> #endif +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickAction; diff --git a/src/quicktemplates/qquickaction.cpp b/src/quicktemplates/qquickaction.cpp index 466501226d..3c28ae98bc 100644 --- a/src/quicktemplates/qquickaction.cpp +++ b/src/quicktemplates/qquickaction.cpp @@ -13,6 +13,8 @@ #include <QtGui/private/qguiapplication_p.h> #include <QtQuick/private/qquickitem_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE /*! diff --git a/src/quicktemplates/qquickactiongroup.cpp b/src/quicktemplates/qquickactiongroup.cpp index 5e088f3924..1c41dd5ff0 100644 --- a/src/quicktemplates/qquickactiongroup.cpp +++ b/src/quicktemplates/qquickactiongroup.cpp @@ -11,6 +11,8 @@ #include "qquickaction_p.h" #include "qquickaction_p_p.h" +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE /*! diff --git a/src/quicktemplates/qquickmenubar_p_p.h b/src/quicktemplates/qquickmenubar_p_p.h index 2ac3af00ed..15a370836d 100644 --- a/src/quicktemplates/qquickmenubar_p_p.h +++ b/src/quicktemplates/qquickmenubar_p_p.h @@ -18,6 +18,8 @@ #include <QtQuickTemplates2/private/qquickmenubar_p.h> #include <QtQuickTemplates2/private/qquickcontainer_p_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQmlComponent; diff --git a/src/quicktemplates/qquickoverlay_p_p.h b/src/quicktemplates/qquickoverlay_p_p.h index 8fd3ff0a75..9951c597f0 100644 --- a/src/quicktemplates/qquickoverlay_p_p.h +++ b/src/quicktemplates/qquickoverlay_p_p.h @@ -20,6 +20,8 @@ #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qquickitemchangelistener_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickPopup; diff --git a/src/quicktemplates/qquickpopup_p_p.h b/src/quicktemplates/qquickpopup_p_p.h index b71d5bde77..fbe65687b8 100644 --- a/src/quicktemplates/qquickpopup_p_p.h +++ b/src/quicktemplates/qquickpopup_p_p.h @@ -25,6 +25,8 @@ #include <QtQuick/private/qquicktransitionmanager_p_p.h> #include <QtQuick/private/qquickitem_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickTransition; diff --git a/src/quicktemplates/qquickselectionrectangle_p.h b/src/quicktemplates/qquickselectionrectangle_p.h index 2cf3c22062..e380d40bcb 100644 --- a/src/quicktemplates/qquickselectionrectangle_p.h +++ b/src/quicktemplates/qquickselectionrectangle_p.h @@ -18,6 +18,8 @@ #include <QtQuick/qquickitem.h> #include <QtQuickTemplates2/private/qquickcontrol_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickSelectionRectanglePrivate; diff --git a/src/quicktemplates/qquickstackelement_p_p.h b/src/quicktemplates/qquickstackelement_p_p.h index ac3f42efbc..5af8149d91 100644 --- a/src/quicktemplates/qquickstackelement_p_p.h +++ b/src/quicktemplates/qquickstackelement_p_p.h @@ -23,6 +23,8 @@ #include <QtQuick/private/qquickitemchangelistener_p.h> #include <QtQml/private/qv4persistent_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQmlContext; diff --git a/src/quicktemplates/qquicktreeviewdelegate.cpp b/src/quicktemplates/qquicktreeviewdelegate.cpp index 2e074f70b0..32d51975be 100644 --- a/src/quicktemplates/qquicktreeviewdelegate.cpp +++ b/src/quicktemplates/qquicktreeviewdelegate.cpp @@ -7,6 +7,8 @@ #include <QtQuick/private/qquicktaphandler_p.h> #include <QtQuick/private/qquicktreeview_p_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE /*! diff --git a/src/quicktemplates/qquicktumbler_p_p.h b/src/quicktemplates/qquicktumbler_p_p.h index e53381c470..22bda25e76 100644 --- a/src/quicktemplates/qquicktumbler_p_p.h +++ b/src/quicktemplates/qquicktumbler_p_p.h @@ -18,6 +18,8 @@ #include <QtQuickTemplates2/private/qquickcontrol_p_p.h> #include <QtQuickTemplates2/private/qquicktumbler_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerPrivate : public QQuickControlPrivate diff --git a/src/quicktestutils/quick/visualtestutils_p.h b/src/quicktestutils/quick/visualtestutils_p.h index 4ef0464602..61327c87ca 100644 --- a/src/quicktestutils/quick/visualtestutils_p.h +++ b/src/quicktestutils/quick/visualtestutils_p.h @@ -20,6 +20,8 @@ #include <private/qmlutils_p.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QQuickItemView; diff --git a/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp b/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp index 3c288cbb3b..60b6c0d0fc 100644 --- a/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp +++ b/tests/auto/quick/pointerhandlers/mousearea_interop/tst_mousearea_interop.cpp @@ -16,6 +16,8 @@ #include <QtQuickTestUtils/private/qmlutils_p.h> #include <QtQuickTestUtils/private/viewtestutils_p.h> +#include <QtCore/qpointer.h> + Q_LOGGING_CATEGORY(lcPointerTests, "qt.quick.pointer.tests") class tst_MouseAreaInterop : public QQmlDataTest diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp index ab64f6bb24..eefca54d29 100644 --- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp +++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/tst_multipointtoucharea_interop.cpp @@ -15,6 +15,8 @@ #include <QtQuickTestUtils/private/qmlutils_p.h> #include <QtQuickTestUtils/private/viewtestutils_p.h> +#include <QtCore/qpointer.h> + Q_LOGGING_CATEGORY(lcPointerTests, "qt.quick.pointer.tests") class tst_MptaInterop : public QQmlDataTest diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp index 9d6e4409d0..f4b0ed6378 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/tst_qquickdraghandler.cpp @@ -17,6 +17,8 @@ #include <QtQuickTestUtils/private/qmlutils_p.h> #include <QtQuickTestUtils/private/viewtestutils_p.h> +#include <QtCore/qpointer.h> + Q_LOGGING_CATEGORY(lcPointerTests, "qt.quick.pointer.tests") class tst_DragHandler : public QQmlDataTest diff --git a/tests/auto/quick/pointerhandlers/qquickpointhandler/tst_qquickpointhandler.cpp b/tests/auto/quick/pointerhandlers/qquickpointhandler/tst_qquickpointhandler.cpp index 4435580d92..27d0a587c2 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointhandler/tst_qquickpointhandler.cpp +++ b/tests/auto/quick/pointerhandlers/qquickpointhandler/tst_qquickpointhandler.cpp @@ -18,6 +18,8 @@ #include <QtQuickTestUtils/private/viewtestutils_p.h> #include <QtQuickTestUtils/private/visualtestutils_p.h> +#include <QtCore/qpointer.h> + Q_LOGGING_CATEGORY(lcPointerTests, "qt.quick.pointer.tests") class tst_PointHandler : public QQmlDataTest diff --git a/tests/auto/quick/qquickdeliveryagent/tst_qquickdeliveryagent.cpp b/tests/auto/quick/qquickdeliveryagent/tst_qquickdeliveryagent.cpp index a0a1c66217..fc457666e6 100644 --- a/tests/auto/quick/qquickdeliveryagent/tst_qquickdeliveryagent.cpp +++ b/tests/auto/quick/qquickdeliveryagent/tst_qquickdeliveryagent.cpp @@ -22,6 +22,8 @@ #include <QtGui/private/qeventpoint_p.h> +#include <QtCore/qpointer.h> + Q_LOGGING_CATEGORY(lcTests, "qt.quick.tests") // On one hand, uncommenting this will make troubleshooting easier (avoid the 60FPS hover events). |