summaryrefslogtreecommitdiffstats
path: root/src/core/services/qservicelocator.cpp
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2017-03-01 16:18:26 +0000
committerMike Krus <mike.krus@kdab.com>2017-03-03 10:41:03 +0000
commitd2910f97dc8a754cd8d41efdae8004e1b752cd51 (patch)
tree752fa136dae725eac6c2abe699138848fac3d3e6 /src/core/services/qservicelocator.cpp
parent2519573517979f6a2995f9a445321ef7d62091e8 (diff)
Make QAbstractServiceProvider a QObject
so it can have signals and slots Change-Id: I269ee6d1c8fb035864a8d46e9ace18de82911755 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/services/qservicelocator.cpp')
-rw-r--r--src/core/services/qservicelocator.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/services/qservicelocator.cpp b/src/core/services/qservicelocator.cpp
index 3d3d56386..176d9b078 100644
--- a/src/core/services/qservicelocator.cpp
+++ b/src/core/services/qservicelocator.cpp
@@ -53,17 +53,15 @@ namespace Qt3DCore {
\inmodule Qt3DCore
*/
-QAbstractServiceProvider::QAbstractServiceProvider(int type, const QString &description)
- : d_ptr(new QAbstractServiceProviderPrivate(type, description))
+QAbstractServiceProvider::QAbstractServiceProvider(int type, const QString &description, QObject *parent)
+ : QObject(*new QAbstractServiceProviderPrivate(type, description), parent)
{
- d_ptr->q_ptr = this;
}
/* \internal */
-QAbstractServiceProvider::QAbstractServiceProvider(QAbstractServiceProviderPrivate &dd)
- : d_ptr(&dd)
+QAbstractServiceProvider::QAbstractServiceProvider(QAbstractServiceProviderPrivate &dd, QObject *parent)
+ : QObject(dd, parent)
{
- d_ptr->q_ptr = this;
}
QAbstractServiceProvider::~QAbstractServiceProvider()