diff options
Diffstat (limited to 'src/core/services/qservicelocator_p.h')
-rw-r--r-- | src/core/services/qservicelocator_p.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/core/services/qservicelocator_p.h b/src/core/services/qservicelocator_p.h index c68b56ffd..9534b33ce 100644 --- a/src/core/services/qservicelocator_p.h +++ b/src/core/services/qservicelocator_p.h @@ -52,7 +52,8 @@ // #include <Qt3DCore/qt3dcore_global.h> -#include <QScopedPointer> +#include <QtCore/qobject.h> +#include <QtCore/qscopedpointer.h> QT_BEGIN_NAMESPACE @@ -60,8 +61,9 @@ namespace Qt3DCore { class QAbstractServiceProviderPrivate; -class QT3DCORESHARED_EXPORT QAbstractServiceProvider +class QT3DCORESHARED_EXPORT QAbstractServiceProvider : public QObject { + Q_OBJECT public: virtual ~QAbstractServiceProvider(); @@ -69,9 +71,8 @@ public: QString description() const; protected: - QAbstractServiceProvider(int type, const QString &description); - QAbstractServiceProvider(QAbstractServiceProviderPrivate &dd); - QScopedPointer<QAbstractServiceProviderPrivate> d_ptr; + explicit QAbstractServiceProvider(int type, const QString &description, QObject* parent = nullptr); + explicit QAbstractServiceProvider(QAbstractServiceProviderPrivate &dd, QObject* parent = nullptr); private: Q_DISABLE_COPY(QAbstractServiceProvider) @@ -83,6 +84,7 @@ class QOpenGLInformationService; class QSystemInformationService; class QServiceLocatorPrivate; class QEventFilterService; +class QDownloadHelperService; class QT3DCORESHARED_EXPORT QServiceLocator { @@ -96,6 +98,7 @@ public: CollisionService, FrameAdvanceService, EventFilterService, + DownloadHelperService, #if !defined(Q_QDOC) DefaultServiceCount, // Add additional default services before here #endif @@ -119,6 +122,7 @@ public: QOpenGLInformationService *openGLInformation(); QAbstractFrameAdvanceService *frameAdvanceService(); QEventFilterService *eventFilterService(); + QDownloadHelperService *downloadHelperService(); private: Q_DISABLE_COPY(QServiceLocator) |