Skip to content

Commit

Permalink
Remove all references to X11 session management
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>
  • Loading branch information
Donald Carr authored and Qt by Nokia committed Jun 1, 2012
1 parent 22ef98c commit 698e5b3
Show file tree
Hide file tree
Showing 51 changed files with 0 additions and 103 deletions.
49 changes: 0 additions & 49 deletions config.tests/x11/sm/sm.cpp

This file was deleted.

4 changes: 0 additions & 4 deletions config.tests/x11/sm/sm.pro

This file was deleted.

1 change: 0 additions & 1 deletion mkspecs/aix-g++-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/aix-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/aix-xlc-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/aix-xlc/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/common/linux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/common/qws.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ QMAKE_LIBDIR_OPENGL_ES1 =
QMAKE_INCDIR_OPENGL_ES2 =
QMAKE_LIBDIR_OPENGL_ES2 =
QMAKE_LIBS_X11 =
QMAKE_LIBS_X11SM =
1 change: 0 additions & 1 deletion mkspecs/cygwin-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/darwin-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
1 change: 0 additions & 1 deletion mkspecs/features/unix/x11sm.prf
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
!isEmpty(QMAKE_LIBDIR_X11):QMAKE_LIBDIR += $$QMAKE_LIBDIR_X11
LIBS_PRIVATE += $$QMAKE_LIBS_X11SM
1 change: 0 additions & 1 deletion mkspecs/freebsd-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
1 change: 0 additions & 1 deletion mkspecs/freebsd-g++46/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
1 change: 0 additions & 1 deletion mkspecs/freebsd-icc/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
1 change: 0 additions & 1 deletion mkspecs/hpux-acc-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/hpux-acc-o64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/hpux-acc/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/hpux-g++-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/hpux-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/hpuxi-acc-32/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/hpuxi-acc-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/hpuxi-g++-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/hurd-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/irix-cc-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/irix-cc/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/irix-g++-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand Down
1 change: 0 additions & 1 deletion mkspecs/irix-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand Down
1 change: 0 additions & 1 deletion mkspecs/linux-cxx/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/linux-ecc-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/linux-icc/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/linux-kcc/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/linux-pgcc/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/lynxos-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/netbsd-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
1 change: 0 additions & 1 deletion mkspecs/openbsd-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
1 change: 0 additions & 1 deletion mkspecs/sco-cc/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/solaris-cc-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/solaris-cc/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/solaris-g++-64/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/solaris-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/tru64-cxx/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/tru64-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/unixware-cc/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/unixware-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/unsupported/integrity-ghs/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion mkspecs/unsupported/linux-host-g++/qmake.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 698e5b3

Please sign in to comment.