Remove all references to X11 session management

There is no session management currently implemented for the xcb QPA
backend. Update the build system to reflect this.

Change-Id: I3486de5741f1fb7e09330ca142b8235a84d3b91d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

51 files changed, 0 insertions, 103 deletions

diff --git a/config.tests/x11/sm/sm.cpp b/config.tests/x11/sm/sm.cpp
deleted file mode 100644
index c75d78a754..0000000000
--- a/config.tests/x11/sm/sm.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <X11/SM/SMlib.h>
-
-int main(int, char **)
-{
-    SmPointer pointer;
-    pointer = 0;
-    return 0;
-}
diff --git a/config.tests/x11/sm/sm.pro b/config.tests/x11/sm/sm.pro
deleted file mode 100644
index 9be43d8aa2..0000000000
--- a/config.tests/x11/sm/sm.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-SOURCES += sm.cpp
-CONFIG += x11
-CONFIG -= qt
-LIBS += $$QMAKE_LIBS_X11SM
diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf
index 5a73aeb8c1..8c878265b4 100644
--- a/mkspecs/aix-g++-64/qmake.conf
+++ b/mkspecs/aix-g++-64/qmake.conf
@@ -62,7 +62,6 @@ QMAKE_AIX_SHLIB		= 1
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthreads
diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
index 9ddb1619ab..0651564357 100644
--- a/mkspecs/aix-g++/qmake.conf
+++ b/mkspecs/aix-g++/qmake.conf
@@ -62,7 +62,6 @@ QMAKE_AIX_SHLIB		= 1
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthreads
diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
index db5ddc33cd..ee4d0b00dd 100644
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ b/mkspecs/aix-xlc-64/qmake.conf
@@ -61,7 +61,6 @@ QMAKE_AIX_SHLIB		= 1
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthreads
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index ff83a45702..6b4364873f 100644
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -62,7 +62,6 @@ QMAKE_AIX_SHLIB		= 1
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthreads
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index 064d16c359..4c88e41cfd 100644
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -25,7 +25,6 @@ QMAKE_LIBDIR_OPENVG   =
 QMAKE_LIBS            =
 QMAKE_LIBS_DYNLOAD    = -ldl
 QMAKE_LIBS_X11        = -lXext -lX11 -lm
-QMAKE_LIBS_X11SM      = -lSM -lICE
 QMAKE_LIBS_NIS        = -lnsl
 QMAKE_LIBS_EGL        = -lEGL
 QMAKE_LIBS_OPENGL     = -lGL
diff --git a/mkspecs/common/qws.conf b/mkspecs/common/qws.conf
index 59820b8083..b1cd23db3d 100644
--- a/mkspecs/common/qws.conf
+++ b/mkspecs/common/qws.conf
@@ -19,4 +19,3 @@ QMAKE_LIBDIR_OPENGL_ES1 =
 QMAKE_INCDIR_OPENGL_ES2 =
 QMAKE_LIBDIR_OPENGL_ES2 =
 QMAKE_LIBS_X11          =
-QMAKE_LIBS_X11SM        =
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index ece21e226f..286f8ea1d6 100644
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -64,7 +64,6 @@ QMAKE_CYGWIN_EXE	= 1
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthread
diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index c059f0cb6f..3f6793ffb6 100644
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -73,7 +73,6 @@ QMAKE_LFLAGS_RPATH	=
 
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	=
diff --git a/mkspecs/features/unix/x11sm.prf b/mkspecs/features/unix/x11sm.prf
index 5176147eb5..3ff309e63d 100644
--- a/mkspecs/features/unix/x11sm.prf
+++ b/mkspecs/features/unix/x11sm.prf
@@ -1,2 +1 @@
 !isEmpty(QMAKE_LIBDIR_X11):QMAKE_LIBDIR += $$QMAKE_LIBDIR_X11
-LIBS_PRIVATE += $$QMAKE_LIBS_X11SM
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
index f1db098c19..35501d52ad 100644
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/freebsd-g++/qmake.conf
@@ -27,7 +27,6 @@ QMAKE_LFLAGS_THREAD	= -pthread
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	=
diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf
index faa79f8e69..8cff625b89 100644
--- a/mkspecs/freebsd-g++46/qmake.conf
+++ b/mkspecs/freebsd-g++46/qmake.conf
@@ -27,7 +27,6 @@ QMAKE_LFLAGS_THREAD	= -pthread
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	=
diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf
index fc7251bcbf..7ad34275c4 100644
--- a/mkspecs/freebsd-icc/qmake.conf
+++ b/mkspecs/freebsd-icc/qmake.conf
@@ -85,7 +85,6 @@ QMAKE_LFLAGS_RPATH	= -Qoption,ld,-rpath,
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	=
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index de0fff1d91..65120d3bb2 100644
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -105,7 +105,6 @@ QMAKE_EXTENSION_SHLIB	= sl
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL -lXt
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXt
 QMAKE_LIBS_THREAD	= -lpthread
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index 5773566b9e..370be040c9 100644
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -102,7 +102,6 @@ QMAKE_EXTENSION_SHLIB	= sl
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldld
 QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_X11SM	= -lSM -lICE
 
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index 6bc226c7e2..367e9a618b 100644
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -84,7 +84,6 @@ QMAKE_EXTENSION_SHLIB	= sl
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldld
 QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL -lXt
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXt
 QMAKE_LIBS_THREAD	= -lpthread
diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf
index 1f478ccca4..bfa71b6d67 100644
--- a/mkspecs/hpux-g++-64/qmake.conf
+++ b/mkspecs/hpux-g++-64/qmake.conf
@@ -67,7 +67,6 @@ QMAKE_EXTENSION_SHLIB	= sl
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldld
 QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthread
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
index 6685fe1a5e..19dea829c4 100644
--- a/mkspecs/hpux-g++/qmake.conf
+++ b/mkspecs/hpux-g++/qmake.conf
@@ -67,7 +67,6 @@ QMAKE_EXTENSION_SHLIB	= sl
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldld
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthread
diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf
index 53d05b7450..54295deadc 100644
--- a/mkspecs/hpuxi-acc-32/qmake.conf
+++ b/mkspecs/hpuxi-acc-32/qmake.conf
@@ -59,7 +59,6 @@ QMAKE_LFLAGS_RPATH	=
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL -lXt
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXt
 QMAKE_LIBS_THREAD	= -lpthread
diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
index d5d51a9dea..06749cd341 100644
--- a/mkspecs/hpuxi-acc-64/qmake.conf
+++ b/mkspecs/hpuxi-acc-64/qmake.conf
@@ -102,7 +102,6 @@ QMAKE_LFLAGS_RPATH	=
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL -lXt
 QMAKE_LIBS_OPENGL_QT	= -lGL -lXt
 QMAKE_LIBS_THREAD	= -lpthread
diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf
index 9d4daae5c3..b9d04590f5 100644
--- a/mkspecs/hpuxi-g++-64/qmake.conf
+++ b/mkspecs/hpuxi-g++-64/qmake.conf
@@ -70,7 +70,6 @@ QMAKE_LFLAGS_RPATH	= -Wl,+b,
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthread
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index e7416cd9f6..fda7ff2bf4 100644
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -32,7 +32,6 @@ QMAKE_LIBDIR_OPENVG   =
 QMAKE_LIBS            =
 QMAKE_LIBS_DYNLOAD    = -ldl
 QMAKE_LIBS_X11        = -lXext -lX11 -lm
-QMAKE_LIBS_X11SM      = -lSM -lICE
 QMAKE_LIBS_NIS        = -lnsl
 QMAKE_LIBS_EGL        = -lEGL
 QMAKE_LIBS_OPENGL     = -lGL
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index 08fd50dc54..db824ad481 100644
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -96,7 +96,6 @@ QMAKE_LFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL -lm
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthread
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index 26b3f7c14c..f11faa5627 100644
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -96,7 +96,6 @@ QMAKE_LFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL -lm
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthread
diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf
index 2dcd690c5a..dc1f127c72 100644
--- a/mkspecs/irix-g++-64/qmake.conf
+++ b/mkspecs/irix-g++-64/qmake.conf
@@ -63,7 +63,6 @@ QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 QMAKE_LIBS		= -lC
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 # libGLU is using the SGI C++ library internally and this somehow clashes
 # with the GNU C++ library (similar name mangling and symbol names?)
 # so we add -lC so that the SGI C++ library is used first...
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
index c532a35f6f..674ae6ec7e 100644
--- a/mkspecs/irix-g++/qmake.conf
+++ b/mkspecs/irix-g++/qmake.conf
@@ -63,7 +63,6 @@ QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 QMAKE_LIBS		= -lC
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 # libGLU is using the SGI C++ library internally and this somehow clashes
 # with the GNU C++ library (similar name mangling and symbol names?)
 # so we add -lC so that the SGI C++ library is used first...
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 0bd1193730..87b361ca25 100644
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -57,7 +57,6 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 
 QMAKE_LIBS_OPENGL	= -lGL
diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
index a4b9e03f2c..d9b5772cbf 100644
--- a/mkspecs/linux-ecc-64/qmake.conf
+++ b/mkspecs/linux-ecc-64/qmake.conf
@@ -61,7 +61,6 @@ QMAKE_LFLAGS_RPATH	= -Qoption,ld,-rpath,
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 90c5f41e92..4884ea1d1f 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -60,7 +60,6 @@ QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index ab1847f42d..5326348c6a 100644
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -70,7 +70,6 @@ QMAKE_LFLAGS_RPATH	= -rpath$$LITERAL_WHITESPACE
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index 80b4cc28ba..fe9e560692 100644
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -61,7 +61,6 @@ QMAKE_LFLAGS_RPATH	= -R
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf
index 500dc498ee..78d0b0019c 100644
--- a/mkspecs/lynxos-g++/qmake.conf
+++ b/mkspecs/lynxos-g++/qmake.conf
@@ -64,7 +64,6 @@ QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		= -lnsl
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index 17609f2fb7..f32ab5ff9c 100644
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -63,7 +63,6 @@ QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	=
diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf
index 1539c46960..5fba495b7c 100644
--- a/mkspecs/openbsd-g++/qmake.conf
+++ b/mkspecs/openbsd-g++/qmake.conf
@@ -64,7 +64,6 @@ QMAKE_LFLAGS_NOUNDEF	= -Wl,-no_unresolved
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	=
diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf
index 4cb71db520..45dac485fb 100644
--- a/mkspecs/sco-cc/qmake.conf
+++ b/mkspecs/sco-cc/qmake.conf
@@ -58,7 +58,6 @@ QMAKE_LFLAGS_SONAME	= -h$$LITERAL_WHITESPACE
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 
 QMAKE_LIBS_OPENGL	= -lGL -lXt
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index b28c4505c9..ab8a847175 100644
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -81,7 +81,6 @@ QMAKE_LFLAGS_RPATH	= -R
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		=
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index e29d37bc87..aa3fb0df40 100644
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -64,7 +64,6 @@ QMAKE_LFLAGS_RPATH	= -R
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		=
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index c08212765d..71b235b001 100644
--- a/mkspecs/solaris-g++-64/qmake.conf
+++ b/mkspecs/solaris-g++-64/qmake.conf
@@ -85,7 +85,6 @@ QMAKE_LFLAGS_RPATH	= -Wl,-R,
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		=
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index 5c9909210f..762d792ede 100644
--- a/mkspecs/solaris-g++/qmake.conf
+++ b/mkspecs/solaris-g++/qmake.conf
@@ -68,7 +68,6 @@ QMAKE_LFLAGS_RPATH	= -Wl,-R,
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_NIS		=
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
index a8db2a3c3a..6854f24d0c 100644
--- a/mkspecs/tru64-cxx/qmake.conf
+++ b/mkspecs/tru64-cxx/qmake.conf
@@ -59,7 +59,6 @@ QMAKE_LFLAGS_RPATH	= -rpath$$LITERAL_WHITESPACE
 QMAKE_LIBS		= -lm
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lrt
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
index e1236cf5f8..a914ba1771 100644
--- a/mkspecs/tru64-g++/qmake.conf
+++ b/mkspecs/tru64-g++/qmake.conf
@@ -61,7 +61,6 @@ QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lpthread -lexc -lrt
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
index 4e55970aa7..45af184450 100644
--- a/mkspecs/unixware-cc/qmake.conf
+++ b/mkspecs/unixware-cc/qmake.conf
@@ -62,7 +62,6 @@ QMAKE_LFLAGS_RPATH	= -R
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 
 QMAKE_LIBS_OPENGL	= -lGL -lXt
 QMAKE_LIBS_OPENGL_QT	= -lGL
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
index 753c3a86a7..a1b0061852 100644
--- a/mkspecs/unixware-g++/qmake.conf
+++ b/mkspecs/unixware-g++/qmake.conf
@@ -63,7 +63,6 @@ QMAKE_LFLAGS_RPATH	= -Wl,-R,
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lresolv -lsocket -lnsl -lm
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL -lXt
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	= -lthread
diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf
index 7f2ac2fb04..f3d9e943e5 100644
--- a/mkspecs/unsupported/integrity-ghs/qmake.conf
+++ b/mkspecs/unsupported/integrity-ghs/qmake.conf
@@ -47,7 +47,6 @@ QMAKE_LFLAGS_RPATH      =
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD      = -ldl
 QMAKE_LIBS_X11		=
-QMAKE_LIBS_X11SM	=
 QMAKE_LIBS_THREAD       =
 
 QMAKE_AR		= ar cqs
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 2e0b7dba44..ba3a1704bc 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -98,7 +98,6 @@ QMAKE_LIBDIR_OPENVG   =
 QMAKE_LIBS            =
 QMAKE_LIBS_DYNLOAD    = -ldl
 QMAKE_LIBS_X11        = -lXext -lX11 -lm
-QMAKE_LIBS_X11SM      = -lSM -lICE
 QMAKE_LIBS_NIS        = -lnsl
 QMAKE_LIBS_EGL        = -lEGL
 QMAKE_LIBS_OPENGL     = -lGL
diff --git a/mkspecs/unsupported/qnx-X11-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index 94f207aff6..048f0f0ab8 100644
--- a/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -31,7 +31,6 @@ QMAKE_LIBDIR_OPENGL	= /opt/X11R6/lib
 QMAKE_LIBS		=
 QMAKE_LIBS_DYNLOAD	=
 QMAKE_LIBS_X11		= -lXext -lX11 -lm -lsocket
-QMAKE_LIBS_X11SM	= -lSM -lICE
 QMAKE_LIBS_OPENGL	= -lGL
 QMAKE_LIBS_OPENGL_QT	= -lGL
 QMAKE_LIBS_THREAD	=
diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
index 10f2627d66..2bd6c005cd 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -76,7 +76,6 @@ QMAKE_LIBDIR_OPENGL   = $$QMAKE_LIBDIR_X11
 QMAKE_LIBS            =
 QMAKE_LIBS_DYNLOAD    =
 QMAKE_LIBS_X11        = -lXext -lX11
-QMAKE_LIBS_X11SM      = -lSM -lICE
 QMAKE_LIBS_NIS        = -lnsl
 QMAKE_LIBS_OPENGL     = -lGL
 QMAKE_LIBS_OPENGL_QT  = -lGL
diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
index c3c974e3e7..3ed5190b90 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -76,7 +76,6 @@ QMAKE_LIBDIR_OPENGL   = $$QMAKE_LIBDIR_X11
 QMAKE_LIBS            =
 QMAKE_LIBS_DYNLOAD    =
 QMAKE_LIBS_X11        = -lXext -lX11
-QMAKE_LIBS_X11SM      = -lSM -lICE
 QMAKE_LIBS_NIS        = -lnsl
 QMAKE_LIBS_OPENGL     = -lGL
 QMAKE_LIBS_OPENGL_QT  = -lGL
diff --git a/qtbase.pro b/qtbase.pro
index ec3b0b2e9f..5efe77e99d 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -65,7 +65,6 @@ unix {
 			(cd config.tests/x11/xinput && $(MAKE) distclean); \
 			(cd config.tests/x11/fontconfig && $(MAKE) distclean); \
 			(cd config.tests/x11/xinerama && $(MAKE) distclean); \
-			(cd config.tests/x11/sm && $(MAKE) distclean); \
 			(cd config.tests/x11/xshape && $(MAKE) distclean); \
 			(cd config.tests/x11/opengl && $(MAKE) distclean); \
                         $(DEL_FILE) config.tests/.qmake.cache; \
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index 4eb9634366..91ac4074e9 100644
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@@ -20,8 +20,6 @@ QMAKE_DOCS_INDEX = ../../doc
 
 include(../qbase.pri)
 
-contains(QT_CONFIG, x11sm):CONFIG += x11sm
-
 #platforms
 mac:include(kernel/mac.pri)
 win32:include(kernel/win.pri)