diff options
Diffstat (limited to 'src/client/global/qwaylandclientextension.cpp')
| -rw-r--r-- | src/client/global/qwaylandclientextension.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/client/global/qwaylandclientextension.cpp b/src/client/global/qwaylandclientextension.cpp index b71c41d1..04aca8c2 100644 --- a/src/client/global/qwaylandclientextension.cpp +++ b/src/client/global/qwaylandclientextension.cpp @@ -43,8 +43,6 @@ QT_BEGIN_NAMESPACE -namespace QtWaylandClient { - QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate() : QObjectPrivate() , waylandIntegration(NULL) @@ -57,7 +55,7 @@ QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate() if (QGuiApplication::platformNativeInterface()) { waylandDisplay = static_cast<struct ::wl_display*>(QGuiApplication::platformNativeInterface()->nativeResourceForIntegration("wl_display")); } else { - waylandIntegration = new QWaylandIntegration(); + waylandIntegration = new QtWaylandClient::QWaylandIntegration(); waylandDisplay = waylandIntegration->display()->wl_display(); } @@ -84,7 +82,7 @@ QWaylandClientExtension::QWaylandClientExtension(const int ver) d->version = ver; } -QWaylandIntegration *QWaylandClientExtension::integration() const +QtWaylandClient::QWaylandIntegration *QWaylandClientExtension::integration() const { Q_D(const QWaylandClientExtension); return d->waylandIntegration; @@ -105,12 +103,10 @@ void QWaylandClientExtension::setVersion(const int ver) } } -bool QWaylandClientExtension::active() const +bool QWaylandClientExtension::isActive() const { Q_D(const QWaylandClientExtension); return d->active; } -} - QT_END_NAMESPACE |