AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove all references to X11 session management

Browse Source 
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>
This commit is contained in:
Donald Carr 2012-05-31 02:12:32 +00:00 committed by Qt by Nokia
parent 22ef98c0b1
commit 698e5b376d
51 changed files with 0 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
config.tests/x11/sm/sm.cpp
View File

@ -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;
}

4
config.tests/x11/sm/sm.pro
View File

@ -1,4 +0,0 @@
SOURCES += sm.cpp
CONFIG += x11
CONFIG -= qt
LIBS += $$QMAKE_LIBS_X11SM

1
mkspecs/aix-g++-64/qmake.conf
View File

@ -62,7 +62,6 @@ QMAKE_AIX_SHLIB = 1
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthreads QMAKE_LIBS_THREAD = -lpthreads

1
mkspecs/aix-g++/qmake.conf
View File

@ -62,7 +62,6 @@ QMAKE_AIX_SHLIB = 1
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthreads QMAKE_LIBS_THREAD = -lpthreads

1
mkspecs/aix-xlc-64/qmake.conf
View File

@ -61,7 +61,6 @@ QMAKE_AIX_SHLIB = 1
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthreads QMAKE_LIBS_THREAD = -lpthreads

1
mkspecs/aix-xlc/qmake.conf
View File

@ -62,7 +62,6 @@ QMAKE_AIX_SHLIB = 1
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthreads QMAKE_LIBS_THREAD = -lpthreads

1
mkspecs/common/linux.conf
View File

@ -25,7 +25,6 @@ QMAKE_LIBDIR_OPENVG =
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_EGL = -lEGL QMAKE_LIBS_EGL = -lEGL
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL

1
mkspecs/common/qws.conf
View File

@ -19,4 +19,3 @@ QMAKE_LIBDIR_OPENGL_ES1 =
QMAKE_INCDIR_OPENGL_ES2 = QMAKE_INCDIR_OPENGL_ES2 =
QMAKE_LIBDIR_OPENGL_ES2 = QMAKE_LIBDIR_OPENGL_ES2 =
QMAKE_LIBS_X11 = QMAKE_LIBS_X11 =
QMAKE_LIBS_X11SM =

1
mkspecs/cygwin-g++/qmake.conf
View File

@ -64,7 +64,6 @@ QMAKE_CYGWIN_EXE = 1
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_THREAD = -lpthread

1
mkspecs/darwin-g++/qmake.conf
View File

@ -73,7 +73,6 @@ QMAKE_LFLAGS_RPATH =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = QMAKE_LIBS_THREAD =

1
mkspecs/features/unix/x11sm.prf
View File

@ -1,2 +1 @@
!isEmpty(QMAKE_LIBDIR_X11):QMAKE_LIBDIR += $$QMAKE_LIBDIR_X11 !isEmpty(QMAKE_LIBDIR_X11):QMAKE_LIBDIR += $$QMAKE_LIBDIR_X11
LIBS_PRIVATE += $$QMAKE_LIBS_X11SM

1
mkspecs/freebsd-g++/qmake.conf
View File

@ -27,7 +27,6 @@ QMAKE_LFLAGS_THREAD = -pthread
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = QMAKE_LIBS_THREAD =

1
mkspecs/freebsd-g++46/qmake.conf
View File

@ -27,7 +27,6 @@ QMAKE_LFLAGS_THREAD = -pthread
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = QMAKE_LIBS_THREAD =

1
mkspecs/freebsd-icc/qmake.conf
View File

@ -85,7 +85,6 @@ QMAKE_LFLAGS_RPATH = -Qoption,ld,-rpath,
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = QMAKE_LIBS_THREAD =

1
mkspecs/hpux-acc-64/qmake.conf
View File

@ -105,7 +105,6 @@ QMAKE_EXTENSION_SHLIB = sl
QMAKE_LIBS = -lm QMAKE_LIBS = -lm
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL -lXt QMAKE_LIBS_OPENGL = -lGL -lXt
QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_OPENGL_QT = -lGL -lXt
QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_THREAD = -lpthread

1
mkspecs/hpux-acc-o64/qmake.conf
View File

@ -102,7 +102,6 @@ QMAKE_EXTENSION_SHLIB = sl
QMAKE_LIBS = -lm QMAKE_LIBS = -lm
QMAKE_LIBS_DYNLOAD = -ldld QMAKE_LIBS_DYNLOAD = -ldld
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/hpux-acc/qmake.conf
View File

@ -84,7 +84,6 @@ QMAKE_EXTENSION_SHLIB = sl
QMAKE_LIBS = -lm QMAKE_LIBS = -lm
QMAKE_LIBS_DYNLOAD = -ldld QMAKE_LIBS_DYNLOAD = -ldld
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL -lXt QMAKE_LIBS_OPENGL = -lGL -lXt
QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_OPENGL_QT = -lGL -lXt
QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_THREAD = -lpthread

1
mkspecs/hpux-g++-64/qmake.conf
View File

@ -67,7 +67,6 @@ QMAKE_EXTENSION_SHLIB = sl
QMAKE_LIBS = -lm QMAKE_LIBS = -lm
QMAKE_LIBS_DYNLOAD = -ldld QMAKE_LIBS_DYNLOAD = -ldld
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_THREAD = -lpthread

1
mkspecs/hpux-g++/qmake.conf
View File

@ -67,7 +67,6 @@ QMAKE_EXTENSION_SHLIB = sl
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldld QMAKE_LIBS_DYNLOAD = -ldld
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_THREAD = -lpthread

1
mkspecs/hpuxi-acc-32/qmake.conf
View File

@ -59,7 +59,6 @@ QMAKE_LFLAGS_RPATH =
QMAKE_LIBS = -lm QMAKE_LIBS = -lm
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL -lXt QMAKE_LIBS_OPENGL = -lGL -lXt
QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_OPENGL_QT = -lGL -lXt
QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_THREAD = -lpthread

1
mkspecs/hpuxi-acc-64/qmake.conf
View File

@ -102,7 +102,6 @@ QMAKE_LFLAGS_RPATH =
QMAKE_LIBS = -lm QMAKE_LIBS = -lm
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL -lXt QMAKE_LIBS_OPENGL = -lGL -lXt
QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_OPENGL_QT = -lGL -lXt
QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_THREAD = -lpthread

1
mkspecs/hpuxi-g++-64/qmake.conf
View File

@ -70,7 +70,6 @@ QMAKE_LFLAGS_RPATH = -Wl,+b,
QMAKE_LIBS = -lm QMAKE_LIBS = -lm
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_THREAD = -lpthread

1
mkspecs/hurd-g++/qmake.conf
View File

@ -32,7 +32,6 @@ QMAKE_LIBDIR_OPENVG =
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_EGL = -lEGL QMAKE_LIBS_EGL = -lEGL
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL

1
mkspecs/irix-cc-64/qmake.conf
View File

@ -96,7 +96,6 @@ QMAKE_LFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL -lm QMAKE_LIBS_OPENGL = -lGL -lm
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_THREAD = -lpthread

1
mkspecs/irix-cc/qmake.conf
View File

@ -96,7 +96,6 @@ QMAKE_LFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL -lm QMAKE_LIBS_OPENGL = -lGL -lm
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_THREAD = -lpthread

1
mkspecs/irix-g++-64/qmake.conf
View File

@ -63,7 +63,6 @@ QMAKE_LFLAGS_RPATH = -Wl,-rpath,
QMAKE_LIBS = -lC QMAKE_LIBS = -lC
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
# libGLU is using the SGI C++ library internally and this somehow clashes # libGLU is using the SGI C++ library internally and this somehow clashes
# with the GNU C++ library (similar name mangling and symbol names?) # with the GNU C++ library (similar name mangling and symbol names?)
# so we add -lC so that the SGI C++ library is used first... # so we add -lC so that the SGI C++ library is used first...

1
mkspecs/irix-g++/qmake.conf
View File

@ -63,7 +63,6 @@ QMAKE_LFLAGS_RPATH = -Wl,-rpath,
QMAKE_LIBS = -lC QMAKE_LIBS = -lC
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
# libGLU is using the SGI C++ library internally and this somehow clashes # libGLU is using the SGI C++ library internally and this somehow clashes
# with the GNU C++ library (similar name mangling and symbol names?) # with the GNU C++ library (similar name mangling and symbol names?)
# so we add -lC so that the SGI C++ library is used first... # so we add -lC so that the SGI C++ library is used first...

1
mkspecs/linux-cxx/qmake.conf
View File

@ -57,7 +57,6 @@ QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL

1
mkspecs/linux-ecc-64/qmake.conf
View File

@ -61,7 +61,6 @@ QMAKE_LFLAGS_RPATH = -Qoption,ld,-rpath,
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/linux-icc/qmake.conf
View File

@ -60,7 +60,6 @@ QMAKE_LFLAGS_RPATH = -Wl,-rpath,
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/linux-kcc/qmake.conf
View File

@ -70,7 +70,6 @@ QMAKE_LFLAGS_RPATH = -rpath$$LITERAL_WHITESPACE
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/linux-pgcc/qmake.conf
View File

@ -61,7 +61,6 @@ QMAKE_LFLAGS_RPATH = -R
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/lynxos-g++/qmake.conf
View File

@ -64,7 +64,6 @@ QMAKE_LFLAGS_RPATH = -Wl,-rpath,
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/netbsd-g++/qmake.conf
View File

@ -63,7 +63,6 @@ QMAKE_LFLAGS_RPATH = -Wl,-rpath,
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = QMAKE_LIBS_THREAD =

1
mkspecs/openbsd-g++/qmake.conf
View File

@ -64,7 +64,6 @@ QMAKE_LFLAGS_NOUNDEF = -Wl,-no_unresolved
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = QMAKE_LIBS_THREAD =

1
mkspecs/sco-cc/qmake.conf
View File

@ -58,7 +58,6 @@ QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL -lXt QMAKE_LIBS_OPENGL = -lGL -lXt
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/solaris-cc-64/qmake.conf
View File

@ -81,7 +81,6 @@ QMAKE_LFLAGS_RPATH = -R
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = QMAKE_LIBS_NIS =
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/solaris-cc/qmake.conf
View File

@ -64,7 +64,6 @@ QMAKE_LFLAGS_RPATH = -R
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = QMAKE_LIBS_NIS =
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/solaris-g++-64/qmake.conf
View File

@ -85,7 +85,6 @@ QMAKE_LFLAGS_RPATH = -Wl,-R,
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = QMAKE_LIBS_NIS =
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/solaris-g++/qmake.conf
View File

@ -68,7 +68,6 @@ QMAKE_LFLAGS_RPATH = -Wl,-R,
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = QMAKE_LIBS_NIS =
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/tru64-cxx/qmake.conf
View File

@ -59,7 +59,6 @@ QMAKE_LFLAGS_RPATH = -rpath$$LITERAL_WHITESPACE
QMAKE_LIBS = -lm QMAKE_LIBS = -lm
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lrt QMAKE_LIBS_THREAD = -lrt

1
mkspecs/tru64-g++/qmake.conf
View File

@ -61,7 +61,6 @@ QMAKE_LFLAGS_RPATH = -Wl,-rpath,
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthread -lexc -lrt QMAKE_LIBS_THREAD = -lpthread -lexc -lrt

1
mkspecs/unixware-cc/qmake.conf
View File

@ -62,7 +62,6 @@ QMAKE_LFLAGS_RPATH = -R
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL -lXt QMAKE_LIBS_OPENGL = -lGL -lXt
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/unixware-g++/qmake.conf
View File

@ -63,7 +63,6 @@ QMAKE_LFLAGS_RPATH = -Wl,-R,
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL -lXt QMAKE_LIBS_OPENGL = -lGL -lXt
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lthread QMAKE_LIBS_THREAD = -lthread

1
mkspecs/unsupported/integrity-ghs/qmake.conf
View File

@ -47,7 +47,6 @@ QMAKE_LFLAGS_RPATH =
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = QMAKE_LIBS_X11 =
QMAKE_LIBS_X11SM =
QMAKE_LIBS_THREAD = QMAKE_LIBS_THREAD =
QMAKE_AR = ar cqs QMAKE_AR = ar cqs

1
mkspecs/unsupported/linux-host-g++/qmake.conf
View File

@ -98,7 +98,6 @@ QMAKE_LIBDIR_OPENVG =
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_DYNLOAD = -ldl
QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11 = -lXext -lX11 -lm
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_EGL = -lEGL QMAKE_LIBS_EGL = -lEGL
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL

1
mkspecs/unsupported/qnx-X11-g++/qmake.conf
View File

@ -31,7 +31,6 @@ QMAKE_LIBDIR_OPENGL = /opt/X11R6/lib
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 -lm -lsocket QMAKE_LIBS_X11 = -lXext -lX11 -lm -lsocket
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = QMAKE_LIBS_THREAD =

1
mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
View File

@ -76,7 +76,6 @@ QMAKE_LIBDIR_OPENGL = $$QMAKE_LIBDIR_X11
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
View File

@ -76,7 +76,6 @@ QMAKE_LIBDIR_OPENGL = $$QMAKE_LIBDIR_X11
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_DYNLOAD =
QMAKE_LIBS_X11 = -lXext -lX11 QMAKE_LIBS_X11 = -lXext -lX11
QMAKE_LIBS_X11SM = -lSM -lICE
QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_NIS = -lnsl
QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL = -lGL
QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_QT = -lGL

1
qtbase.pro
View File

@ -65,7 +65,6 @@ unix {
(cd config.tests/x11/xinput && $(MAKE) distclean); \ (cd config.tests/x11/xinput && $(MAKE) distclean); \
(cd config.tests/x11/fontconfig && $(MAKE) distclean); \ (cd config.tests/x11/fontconfig && $(MAKE) distclean); \
(cd config.tests/x11/xinerama && $(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/xshape && $(MAKE) distclean); \
(cd config.tests/x11/opengl && $(MAKE) distclean); \ (cd config.tests/x11/opengl && $(MAKE) distclean); \
$(DEL_FILE) config.tests/.qmake.cache; \ $(DEL_FILE) config.tests/.qmake.cache; \

2
src/widgets/widgets.pro
View File

@ -20,8 +20,6 @@ QMAKE_DOCS_INDEX = ../../doc
include(../qbase.pri) include(../qbase.pri)
contains(QT_CONFIG, x11sm):CONFIG += x11sm
#platforms #platforms
mac:include(kernel/mac.pri) mac:include(kernel/mac.pri)
win32:include(kernel/win.pri) win32:include(kernel/win.pri)