4 files changed, 20 insertions, 90 deletions
diff --git a/tests/auto/client/nooutput/.prev_CMakeLists.txt b/tests/auto/client/nooutput/.prev_CMakeLists.txt
deleted file mode 100644
index 18479bdfc..000000000
--- a/tests/auto/client/nooutput/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated from nooutput.pro.
-
-#####################################################################
-## tst_nooutput Test:
-#####################################################################
-
-qt_internal_add_test(tst_nooutput
-    SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
-        tst_nooutput.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_nooutput
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
-)
diff --git a/tests/auto/client/nooutput/CMakeLists.txt b/tests/auto/client/nooutput/CMakeLists.txt
index b353d3246..eeee57909 100644
--- a/tests/auto/client/nooutput/CMakeLists.txt
+++ b/tests/auto/client/nooutput/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 # Generated from nooutput.pro.
 
 #####################################################################
@@ -6,28 +9,7 @@
 
 qt_internal_add_test(tst_nooutput
     SOURCES
-        ../shared/corecompositor.cpp ../shared/corecompositor.h
-        ../shared/coreprotocol.cpp ../shared/coreprotocol.h
-        ../shared/datadevice.cpp ../shared/datadevice.h
-        ../shared/mockcompositor.cpp ../shared/mockcompositor.h
-        ../shared/textinput.cpp ../shared/textinput.h
-        ../shared/xdgoutputv1.cpp ../shared/xdgoutputv1.h
-        ../shared/xdgshell.cpp ../shared/xdgshell.h
         tst_nooutput.cpp
-    INCLUDE_DIRECTORIES
-        ../shared
-    PUBLIC_LIBRARIES
-        Qt::Gui
-        Qt::OpenGL
-        Qt::WaylandClientPrivate
-        Wayland::Server
-        Threads::Threads # special case
-)
-
-qt6_generate_wayland_protocol_server_sources(tst_nooutput
-    FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/text-input-unstable-v2.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/wayland.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-output-unstable-v1.xml
-        ${CMAKE_CURRENT_SOURCE_DIR}/../shared/../../../../src/3rdparty/protocol/xdg-shell.xml
+    LIBRARIES
+        SharedClientTest
 )
diff --git a/tests/auto/client/nooutput/nooutput.pro b/tests/auto/client/nooutput/nooutput.pro
deleted file mode 100644
index 1d8dc5626..000000000
--- a/tests/auto/client/nooutput/nooutput.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-include (../shared/shared.pri)
-
-TARGET = tst_nooutput
-SOURCES += tst_nooutput.cpp
-
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)