configure.ac |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 73af6241e9448af2dcbd0352e472e4d3153d0e1b
Author:     Noel Grandin <[email protected]>
AuthorDate: Tue Aug 29 14:54:59 2023 +0200
Commit:     Noel Grandin <[email protected]>
CommitDate: Tue Aug 29 20:57:58 2023 +0200

    Revert "remove warning about qt and icccm"
    
    This reverts commit 1ccd236d8dc833ab9de639cf903684d1ecebf5e1.
    
    As pointed as by mikekaganski, "Isn't 5.6 older than 5.12?", so I cannot 
remove this yet
    
    Change-Id: I33d5cf62063fa7cc05c5317b49665844760b7101
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156212
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <[email protected]>

diff --git a/configure.ac b/configure.ac
index 60bf5493a432..5ce8454546c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13073,7 +13073,10 @@ then
         PKG_CHECK_MODULES(QT5_XCB_ICCCM,[xcb-icccm],[
             QT5_HAVE_XCB_ICCCM=1
             AC_DEFINE(QT5_HAVE_XCB_ICCCM)
-        ],[:])
+        ],[
+            AC_MSG_WARN([XCB ICCCM not found, which is needed for old Qt 
versions (< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)])
+            add_warning "XCB ICCCM not found, which is needed for Qt versions 
(< 5.12) on some WMs to correctly group dialogs (like QTBUG-46626)"
+        ])
         QT5_CFLAGS="$QT5_CFLAGS $QT5_XCB_CFLAGS $QT5_XCB_ICCCM_CFLAGS"
         QT5_LIBS="$QT5_LIBS $QT5_XCB_LIBS $QT5_XCB_ICCCM_LIBS -lQt5X11Extras"
         QT5_USING_X11=1

Reply via email to