1 files changed, 42 insertions, 30 deletions

diff --git a/tests/auto/client/xdgdecorationv1/tst_xdgdecorationv1.cpp b/tests/auto/client/xdgdecorationv1/tst_xdgdecorationv1.cpp
index 386713cf5..5ee856944 100644
--- a/tests/auto/client/xdgdecorationv1/tst_xdgdecorationv1.cpp
+++ b/tests/auto/client/xdgdecorationv1/tst_xdgdecorationv1.cpp
@@ -1,37 +1,11 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "mockcompositor.h"
 
 #include <qwayland-server-xdg-decoration-unstable-v1.h>
 
 #include <QtGui/QRasterWindow>
-#include <QtGui/QOpenGLWindow>
 #include <QtGui/QClipboard>
 #include <QtCore/private/qcore_unix_p.h>
 
@@ -137,7 +111,7 @@ public:
     explicit XdgDecorationCompositor()
     {
         exec([this] {
-            m_config.autoConfigure = true;
+            m_config.autoConfigure = false;
             add<XdgDecorationManagerV1>(xdgDecorationVersion);
         });
     }
@@ -153,6 +127,8 @@ private slots:
     void initTestCase();
     void cleanup() { QTRY_VERIFY2(isClean(), qPrintable(dirtyMessage())); }
     void clientSidePreferredByCompositor();
+    void initialFramelessWindowHint();
+    void delayedFramelessWindowHint();
 };
 
 void tst_xdgdecorationv1::initTestCase()
@@ -175,12 +151,48 @@ void tst_xdgdecorationv1::clientSidePreferredByCompositor()
     QCOMPOSITOR_TRY_VERIFY(xdgToplevel());
     QCOMPOSITOR_TRY_VERIFY(toplevelDecoration()->m_unsetModeRequested);
     QVERIFY(window.frameMargins().isNull()); // We're still waiting for a configure
-    exec([=] {
+    exec([&] {
         toplevelDecoration()->sendConfigure(XdgToplevelDecorationV1::mode_client_side);
         xdgToplevel()->sendCompleteConfigure();
     });
     QTRY_VERIFY(!window.frameMargins().isNull());
 }
 
+void tst_xdgdecorationv1::initialFramelessWindowHint()
+{
+    QRasterWindow window;
+    window.setFlag(Qt::FramelessWindowHint, true);
+    window.show();
+    QCOMPOSITOR_TRY_COMPARE(get<XdgDecorationManagerV1>()->resourceMap().size(), 1);
+    QCOMPOSITOR_TRY_VERIFY(xdgToplevel());
+    exec([&]{
+        xdgToplevel()->sendCompleteConfigure();
+    });
+    QCOMPOSITOR_TRY_VERIFY(xdgSurface()->m_committedConfigureSerial);
+
+    // The client should not have create a decoration object, because that allows the compositor
+    // to override our decision and add server side decorations to our window.
+    QCOMPOSITOR_TRY_VERIFY(!toplevelDecoration());
+}
+
+void tst_xdgdecorationv1::delayedFramelessWindowHint()
+{
+    QRasterWindow window;
+    window.show();
+    QCOMPOSITOR_TRY_COMPARE(get<XdgDecorationManagerV1>()->resourceMap().size(), 1);
+    QCOMPOSITOR_TRY_VERIFY(xdgToplevel());
+    exec([&]{
+        xdgToplevel()->sendCompleteConfigure();
+    });
+    QCOMPOSITOR_TRY_VERIFY(xdgSurface()->m_committedConfigureSerial);
+    QCOMPOSITOR_TRY_VERIFY(toplevelDecoration());
+
+    window.setFlag(Qt::FramelessWindowHint, true);
+
+    // The client should now destroy the decoration object, so the compositor is no longer
+    // able to force window decorations
+    QCOMPOSITOR_TRY_VERIFY(!toplevelDecoration());
+}
+
 QCOMPOSITOR_TEST_MAIN(tst_xdgdecorationv1)
 #include "tst_xdgdecorationv1.moc"