diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-27 08:51:53 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-29 13:51:58 +0200 |
| commit | 6319bc72e2dc63175ca797ee3042955f852e008f (patch) | |
| tree | c9c1c71c43394a4cd2f0f6a75df8ba6f3a2550f3 /src/qtwaylandscanner | |
| parent | 00c8a79da0c80616f18329cdfc61338a2c1af7df (diff) | |
| parent | 28e7d940c42c47cf039522709883ae3de9f4fb88 (diff) | |
| download | qtwayland-6319bc72e2dc63175ca797ee3042955f852e008f.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/client/xdgoutput/tst_xdgoutput.cpp
Regenerated CMake projects.
Removed duplicate wayland source in
tests/auto/client/xdgoutput/xdgoutput.pro. It's still
referenced via the included shared.pri file. Regenerated
the CMake project to adapt to that. Otherwise the CMake
project fails to configure due to duplicate rules with
a error like the one below
CMake Error at src/compositor/Qt6WaylandCompositorMacros.cmake:13 (add_custom_command):
Attempt to add a custom rule to output
tests/auto/client/xdgoutput/wayland-xdg-output-unstable-v1-server-protocol.h.rule
Also use a workaround fix for configuring CMake standalone tests
due to regression introduced by
dd7e40b1086020f6a054957f4972720cd684 in qtbase.
Change-Id: Ib364b851a1fa828c153efbf8653c9e4ef5e618cd
Diffstat (limited to 'src/qtwaylandscanner')
| -rw-r--r-- | src/qtwaylandscanner/qtwaylandscanner.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp index 05f00bee..3cecb5bc 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/qtwaylandscanner/qtwaylandscanner.cpp @@ -906,6 +906,11 @@ bool Scanner::process() printEvent(e); printf("\n"); printf(" {\n"); + printf(" Q_ASSERT_X(m_resource, \"%s::%s\", \"Uninitialised resource\");\n", interfaceName, e.name.constData()); + printf(" if (Q_UNLIKELY(!m_resource)) {\n"); + printf(" qWarning(\"could not call %s::%s as it's not initialised\");\n", interfaceName, e.name.constData()); + printf(" return;\n"); + printf(" }\n"); printf(" send_%s(\n", e.name.constData()); printf(" m_resource->handle"); for (const WaylandArgument &a : e.arguments) { |