diff options
| author | Teo Mrnjavac <teo@kde.org> | 2013-09-11 17:22:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 11:47:06 +0200 |
| commit | 060b862b614285aae88540895736a57eb8563102 (patch) | |
| tree | 40d564877eb856e8f7d840d992552b00b8a1cd0c /configure | |
| parent | f4ebb061899da67aa26c08516fa7ee8c7b11dcbf (diff) | |
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 <Friedemann.Kleint@digia.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 |