online.git: 2 commits - configure.ac engine/vcl qt/test

0 views
Skip to first unread message

"Jan Holesovsky (via cogerrit)"

unread,
4:00 AM (13 hours ago) 4:00 AM
to collaboraon...@googlegroups.com
configure.ac | 6 ++----
engine/vcl/unx/gtk3/gtkinst.cxx | 2 +-
qt/test/README.md | 24 ++++++++++++++++++++++--
3 files changed, 25 insertions(+), 7 deletions(-)

New commits:
commit 434a4f954a556e0eb4fbd2dcc8059af2766f7d5f
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Mon May 18 11:05:22 2026 +0200
Commit: Caolán McNamara <caolan....@collabora.com>
CommitDate: Mon May 25 07:59:49 2026 +0000

coda-q: Update installation instructions for openSUSE

Also provide a bit more helpful error messages when the ./configure
fails due to missing Qt6 packages.

Signed-off-by: Jan Holesovsky <ke...@collabora.com>
Change-Id: I79891ce807596408a7fac81e32da2a2ed608c613
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/2781
Reviewed-by: Caolán McNamara <caolan....@collabora.com>
Tested-by: Jenkins CPCI <rel...@collaboraoffice.com>

diff --git a/configure.ac b/configure.ac
index c50dedda0f57..cf24a528659d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1757,9 +1757,7 @@ AS_IF([test "$ENABLE_WINDOWSAPP" != "true"],
dnl config for qtapp frontend for cool
AS_IF([test "$ENABLE_QTAPP" = true],
[
- PKG_CHECK_MODULES([QT6],
- [Qt6Core Qt6Widgets Qt6Gui Qt6WebEngineCore Qt6WebChannel Qt6WebEngineWidgets Qt6DBus Qt6PrintSupport],,
- [AC_MSG_ERROR([Qt6 not found. Set QT6_CFLAGS and QT6_LIBS if your distro lacks .pc files.])])
+ PKG_CHECK_MODULES([QT6], [Qt6Core Qt6Widgets Qt6Gui Qt6WebEngineCore Qt6WebChannel Qt6WebEngineWidgets Qt6DBus Qt6PrintSupport])

dnl Locate qtpaths6 for Qt6 tool discovery
AC_PATH_PROG([QTPATHS6], [qtpaths6], [no],
@@ -1786,7 +1784,7 @@ AS_IF([test "$ENABLE_QTAPP" = true],
AC_MSG_RESULT([$LRELEASE])
else
AC_MSG_RESULT([no])
- AC_MSG_ERROR([lrelease not found in $QT_BIN_DIR])
+ AC_MSG_ERROR([lrelease not found in $QT_BIN_DIR, please install qt6-tools-linguist or so.])
fi
AC_SUBST(LRELEASE)

diff --git a/qt/test/README.md b/qt/test/README.md
index e8b094591fa9..cc812cca98fd 100644
--- a/qt/test/README.md
+++ b/qt/test/README.md
@@ -14,11 +14,18 @@ Setup

Fedora:
dnf install weston at-spi2-core python3-pyatspi \
- python3-gobject python3-lxml python3-numpy
+ python3-gobject python3-lxml python3-numpy \
+ qt6-qtwayland
+
+ openSUSE:
+ zypper in weston at-spi2-core python3-atspi \
+ python3-gobject python3-lxml python3-numpy \
+ qt6-wayland

Ubuntu/Debian:
apt install weston at-spi2-core python3-pyatspi \
- python3-gi python3-lxml python3-numpy
+ python3-gi python3-lxml python3-numpy \
+ qt6-wayland

2. Clone and set up selenium-webdriver-at-spi somewhere you prefer:

@@ -48,6 +55,19 @@ Build and run the tests:

`make check-qtapp` installs npm dependencies automatically on first run.

+Troubleshooting
+---------------
+
+The tests run headless inside a nested Weston compositor, so the coda-qt
+window is normally invisible. If eg. coda-qt crashes right after
+the test starts and you cannot tell why, set `CODA_QT_TEST_GUI=1`:
+
+ CODA_QT_TEST_GUI=1 make check-qtapp
+
+This opens the Weston window on your desktop so you can watch the test run
+interactively, or even launch coda-qt by hand inside that window to
+reproduce the crash without the harness.
+
Environment variables
---------------------

commit 83535cabe92ff23a7e32f816aa9c3a3ed19d66d1
Author: Stephan Bergmann <stephan....@collabora.com>
AuthorDate: Thu May 21 10:40:27 2026 +0200
Commit: Caolán McNamara <caolan....@collabora.com>
CommitDate: Mon May 25 07:58:59 2026 +0000

-Werror,-Wunused-function

> In file included from engine/vcl/unx/gtk4/gtkinst.cxx:19:
> engine/vcl/unx/gtk4/../gtk3/gtkinst.cxx:23657:7: error: unused function 'vcl_custom_widget_get_type' [-Werror,-Wunused-function]
> 23657 | GType vcl_custom_widget_get_type()
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~

...after d5e894dec11f5fbc8c1e42625c01d3d3c2c250c2 "vcl: add VclCustomWidget for
client-rendered widgets"

Signed-off-by: Stephan Bergmann <stephan....@collabora.com>
Change-Id: Ie235e4d77ae726264881ec705353ef2a443ca9f7
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/3032
Reviewed-by: Caolán McNamara <caolan....@collabora.com>
Tested-by: Jenkins CPCI <rel...@collaboraoffice.com>

diff --git a/engine/vcl/unx/gtk3/gtkinst.cxx b/engine/vcl/unx/gtk3/gtkinst.cxx
index 1c0af8b8d6e8..4c3fc5ba15f4 100644
--- a/engine/vcl/unx/gtk3/gtkinst.cxx
+++ b/engine/vcl/unx/gtk3/gtkinst.cxx
@@ -23649,7 +23649,6 @@ void silence_gwarning(const gchar* /*log_domain*/,
gpointer /*user_data*/)
{
}
-#endif

// VclCustomWidget is used by the jsdialog (online) for client-rendered
// widgets; on the desktop GTK path it has no rendering, so register an empty
@@ -23675,6 +23674,7 @@ GType vcl_custom_widget_get_type()
}
return type;
}
+#endif

void load_ui_file(GtkBuilder* pBuilder, const OUString& rUri)
{

Reply all
Reply to author
Forward
0 new messages