diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-06-05 15:48:38 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-06-05 15:48:38 +0100 |
commit | 8f58119cd18d69fac28528f0a7536cb9fccc15e3 (patch) | |
tree | 844835179ebeca6724c62e47c2cd22650025ef1f /src/core/services/qservicelocator.cpp | |
parent | 2e778e83cb12c830dbbf4887d107e1788a0ce605 (diff) | |
parent | ca2ae5592d4a2eb01f0254c712159657c79c9449 (diff) |
Merge branch '5.5' into dev
Change-Id: I8b3235703b7ceeb23de0b07753bed5f29436da31
Diffstat (limited to 'src/core/services/qservicelocator.cpp')
-rw-r--r-- | src/core/services/qservicelocator.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/services/qservicelocator.cpp b/src/core/services/qservicelocator.cpp index 65421f69f..3d7dfad4f 100644 --- a/src/core/services/qservicelocator.cpp +++ b/src/core/services/qservicelocator.cpp @@ -43,11 +43,16 @@ QT_BEGIN_NAMESPACE namespace Qt3D { +/*! + \class Qt3D::QAbstractServiceProvider +*/ + QAbstractServiceProvider::QAbstractServiceProvider(int type, const QString &description) : d_ptr(new QAbstractServiceProviderPrivate(type, description)) { } +/*! \internal */ QAbstractServiceProvider::QAbstractServiceProvider(QAbstractServiceProviderPrivate &dd) : d_ptr(&dd) { |