1 files changed, 15 insertions, 30 deletions
diff --git a/tests/auto/client/nooutput/tst_nooutput.cpp b/tests/auto/client/nooutput/tst_nooutput.cpp
index 098d88d99..1d8a838f3 100644
--- a/tests/auto/client/nooutput/tst_nooutput.cpp
+++ b/tests/auto/client/nooutput/tst_nooutput.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 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) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "mockcompositor.h"
 #include <QtGui/QScreen>
@@ -37,7 +12,7 @@ public:
     NoOutputCompositor()
     {
         exec([this] { removeAll<Output>(); });
-        m_config.autoConfigure = true;
+        m_config.autoConfigure = false;
     }
 };
 
@@ -60,8 +35,18 @@ void tst_nooutput::noScreens()
     window.resize(16, 16);
     window.show();
 
-    // We have to handle showing a window when there are no real outputs
-    QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
+    QCOMPOSITOR_TRY_VERIFY(xdgToplevel());
+
+    QTRY_VERIFY(window.isVisible());
+    // The window should not be exposed before the first xdg_surface configure event
+    QTRY_VERIFY(!window.isExposed());
+
+    exec([&] {
+        xdgToplevel()->sendConfigure({0, 0}, {}); // Let the window decide the size
+        xdgSurface()->sendConfigure(nextSerial());
+    });
+
+    QTRY_VERIFY(window.isExposed());
 }
 
 QCOMPOSITOR_TEST_MAIN(tst_nooutput)