Revert "Add a (temporary) way to attach popups to layer surfaces"
This reverts commit fdab1544fb
.
Qt 6.6 is out with all the necessary multi-shell apis.
This commit is contained in:
parent
d1ab27dd53
commit
6f0bca5593
|
@ -6,9 +6,6 @@
|
|||
|
||||
#include "window.h"
|
||||
#include "../qwaylandlayershellintegration_p.h"
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
|
||||
#include "../qwaylandlayersurface_p.h"
|
||||
#endif
|
||||
|
||||
#include <layershellqt_logging.h>
|
||||
|
||||
|
@ -141,21 +138,6 @@ void Window::setCloseOnDismissed(bool close)
|
|||
d->closeOnDismissed = close;
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
|
||||
void Window::attachPopup(QWindow *window, xdg_popup *popup)
|
||||
{
|
||||
auto waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
|
||||
if (!waylandWindow) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto shellSurface = dynamic_cast<QWaylandLayerSurface *>(waylandWindow->shellSurface());
|
||||
if (shellSurface) {
|
||||
shellSurface->get_popup(popup);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
Window::Window(QWindow *window)
|
||||
: QObject(window)
|
||||
, d(new WindowPrivate(window))
|
||||
|
|
|
@ -14,10 +14,6 @@
|
|||
|
||||
#include "layershellqt_export.h"
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
|
||||
struct xdg_popup;
|
||||
#endif
|
||||
|
||||
namespace LayerShellQt
|
||||
{
|
||||
class WindowPrivate;
|
||||
|
@ -120,10 +116,6 @@ public:
|
|||
*/
|
||||
static Window *get(QWindow *window);
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
|
||||
static void attachPopup(QWindow *window, xdg_popup *popup);
|
||||
#endif
|
||||
|
||||
static Window *qmlAttachedProperties(QObject *object);
|
||||
|
||||
Q_SIGNALS:
|
||||
|
|
Loading…
Reference in a new issue