From 060b862b614285aae88540895736a57eb8563102 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 11 Sep 2013 17:22:45 +0200 Subject: Bring back Qt4 X11 session management functionality. Added QXcbSessionManager to the Xcb plugin. QXcbSessionManager inherits from QPlatformSessionManager, it's a port of QSessionManager as it is in Qt 4.8. Minor changes also in QPlatformSessionManager and QGuiApplication to hook it up. Task-number: QTBUG-28228 Task-number: QTBUG-30011 Task-number: QTBUG-33033 Change-Id: I50b33d05a1e32c5278dea339f693713acc870a70 Reviewed-by: Friedemann Kleint Reviewed-by: David Faure --- configure | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 1e7f01c3f8..d376c1d719 100755 --- a/configure +++ b/configure @@ -5348,6 +5348,12 @@ if [ "$CFG_XCB" != "no" ]; then QT_CONFIG="$QT_CONFIG xcb-xlib" fi + if [ "$CFG_SM" != "no" ] && [ -n "$PKG_CONFIG" ]; then + if $PKG_CONFIG --exists "sm" 2>/dev/null && $PKG_CONFIG --exists "ice" 2>/dev/null; then + QT_CONFIG="$QT_CONFIG xcb-sm" + fi + fi + # auto-detect Xrender support if [ "$CFG_XRENDER" != "no" ]; then if compileTest x11/xrender "Xrender"; then -- cgit v1.2.3