diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-09-03 09:27:52 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-03 10:11:30 +0200 |
| commit | b3e67abc14563bf6b82a5375380168876e3369df (patch) | |
| tree | 566aa68be38d7d6af95f610e06c7d2ae6ea66df8 | |
| parent | 45ae0527aed387ddc6c6e2af400006ae0a8ea2ec (diff) | |
Compositor: Remove deprecated QWaylandShell constructors
Change-Id: I3cb158e0d2b9fbdbe414ce1af3d09ccaf24c564f
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| -rw-r--r-- | src/compositor/extensions/qwaylandshell.cpp | 10 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandshell.h | 4 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/compositor/extensions/qwaylandshell.cpp b/src/compositor/extensions/qwaylandshell.cpp index bb3b4675c..3e00a8029 100644 --- a/src/compositor/extensions/qwaylandshell.cpp +++ b/src/compositor/extensions/qwaylandshell.cpp @@ -102,14 +102,4 @@ QWaylandShell::QWaylandShell(QWaylandObject *container, QWaylandShellPrivate &dd { } -QWaylandShell::QWaylandShell(QWaylandCompositorExtensionPrivate &dd) - : QWaylandShell(static_cast<QWaylandShellPrivate &>(dd)) -{ -} - -QWaylandShell::QWaylandShell(QWaylandObject *container, QWaylandCompositorExtensionPrivate &dd) - : QWaylandShell(container, static_cast<QWaylandShellPrivate &>(dd)) -{ -} - QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwaylandshell.h b/src/compositor/extensions/qwaylandshell.h index 6f494be55..e158d01cd 100644 --- a/src/compositor/extensions/qwaylandshell.h +++ b/src/compositor/extensions/qwaylandshell.h @@ -70,10 +70,6 @@ Q_SIGNALS: protected: explicit QWaylandShell(QWaylandShellPrivate &dd); explicit QWaylandShell(QWaylandObject *container, QWaylandShellPrivate &dd); - - //Qt 6: remove - Q_DECL_DEPRECATED QWaylandShell(QWaylandCompositorExtensionPrivate &dd); - Q_DECL_DEPRECATED QWaylandShell(QWaylandObject *container, QWaylandCompositorExtensionPrivate &dd); }; template <typename T> |