diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 10:15:35 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 10:15:35 +0100 |
| commit | b77269ff500e184237d523496e17639c94009ac8 (patch) | |
| tree | 43e51355eaa03f0185ef82826fa0436821674426 /src/compositor/extensions/qwaylandshell.h | |
| parent | 12058b161e5f0d6f76523dc831acc8bdbc027fec (diff) | |
| parent | bacb3cdd83fd5c3112c5120130881ac3faa421fe (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ia76896a4d06240ccc3d95ba478b6ce273c7a0be2
Diffstat (limited to 'src/compositor/extensions/qwaylandshell.h')
| -rw-r--r-- | src/compositor/extensions/qwaylandshell.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/compositor/extensions/qwaylandshell.h b/src/compositor/extensions/qwaylandshell.h index a572b3d6e..bb7c73c1d 100644 --- a/src/compositor/extensions/qwaylandshell.h +++ b/src/compositor/extensions/qwaylandshell.h @@ -60,10 +60,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> |