summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure3
-rw-r--r--doc/html/qmake-manual-2.html2
-rw-r--r--doc/html/tqglobal-h.html3
-rw-r--r--mkspecs/dgux-g++/qmake.conf76
-rw-r--r--mkspecs/dgux-g++/qplatformdefs.h60
-rw-r--r--qmake/book/qmake-install.leaf6
-rw-r--r--src/3rdparty/libmng/aclocal.m415
-rwxr-xr-xsrc/3rdparty/libmng/config.guess16
-rwxr-xr-xsrc/3rdparty/libmng/config.sub8
-rwxr-xr-xsrc/3rdparty/libmng/configure15
-rw-r--r--src/tools/tqglobal.h3
11 files changed, 5 insertions, 202 deletions
diff --git a/configure b/configure
index c03fab755..965234723 100755
--- a/configure
+++ b/configure
@@ -1129,9 +1129,6 @@ if [ -z "$PLATFORM" ]; then
QNX:*)
PLATFORM=qnx-g++
;;
- dgux:*)
- PLATFORM=dgux-g++
- ;;
ULTRIX:*)
PLATFORM=ultrix-g++
;;
diff --git a/doc/html/qmake-manual-2.html b/doc/html/qmake-manual-2.html
index ed82475eb..42479b9bf 100644
--- a/doc/html/qmake-manual-2.html
+++ b/doc/html/qmake-manual-2.html
@@ -37,7 +37,7 @@ body { background: #ffffff; color: black; }
<p>Before building TQt manually the following environment variables must be set:</p>
<ul><li><p>QMAKESPEC <br> This must be set to the platform and compiler combination that you are using on your system. <br> For example, if you are using Windows and Microsoft Visual Studio, you would set this environment variable to <em>win32-msvc</em>. If you are using Solaris and g++, you would set this environment variable to <em>solaris-g++</em>.</p>
<p>The following is a list of environment variables available to choose from when setting QMAKESPEC:</p>
-<p>aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc dgux-g++ hurd-g++ linux-kcc tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p>
+<p>aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc hurd-g++ linux-kcc tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p>
<li><p>TQTDIR <br> This must be set to where TQt is (or will be) installed. For example, <em>c:\qt</em> and <em>\local\qt</em></p>
</ul><p>Once the environment variables are set go into the qmake directory, <em>$TQTDIR/qmake</em>, e.g. <em>C:\qt\qmake</em>. Now run <em>make</em> or <em>nmake</em> depending on your compiler.</p>
<p>When the make has completed, <em>qmake</em> is ready for use.</p>
diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html
index 05f45cac4..f668b0bb7 100644
--- a/doc/html/tqglobal-h.html
+++ b/doc/html/tqglobal-h.html
@@ -105,7 +105,6 @@ body { background: #ffffff; color: black; }
UNIXWARE - UnixWare 7, Open UNIX 8
AIX - AIX
HURD - GNU Hurd
- DGUX - DG/UX
DYNIX - DYNIX/ptx
TQNX - TQNX
TQNX6 - TQNX RTP 6.1
@@ -163,8 +162,6 @@ body { background: #ffffff; color: black; }
# define Q_OS_AIX
#elif defined(__Lynx__)
# define Q_OS_LYNX
-#elif defined(__DGUX__)
-# define Q_OS_DGUX
#elif defined(__QNXNTO__)
# define Q_OS_QNX6
#elif defined(__QNX__)
diff --git a/mkspecs/dgux-g++/qmake.conf b/mkspecs/dgux-g++/qmake.conf
deleted file mode 100644
index ee003c71d..000000000
--- a/mkspecs/dgux-g++/qmake.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-#
-# qmake configuration for dgux-g++
-#
-# Written for DG/UX R4.20MU06.
-#
-
-MAKEFILE_GENERATOR = UNIX
-TEMPLATE = app
-CONFIG += qt warn_on release link_prl
-
-QMAKE_CC = gcc
-QMAKE_LEX = flex
-QMAKE_LEXFLAGS =
-QMAKE_YACC = yacc
-QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS =
-QMAKE_CFLAGS_DEPS = -M
-QMAKE_CFLAGS_WARN_ON = -Wall -W
-QMAKE_CFLAGS_WARN_OFF = -w
-QMAKE_CFLAGS_RELEASE = -O2
-QMAKE_CFLAGS_DEBUG = -g
-QMAKE_CFLAGS_SHLIB = -fPIC
-QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
-
-QMAKE_CXX = g++
-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
-
-QMAKE_INCDIR =
-QMAKE_LIBDIR =
-QMAKE_INCDIR_X11 = /usr/X11R6/include
-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
-QMAKE_INCDIR_TQT = $(TQTDIR)/include
-QMAKE_LIBDIR_TQT = $(TQTDIR)/lib
-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-
-QMAKE_LINK = g++
-QMAKE_LINK_SHLIB = g++
-QMAKE_LFLAGS =
-QMAKE_LFLAGS_RELEASE =
-QMAKE_LFLAGS_DEBUG =
-QMAKE_LFLAGS_SHLIB = -shared
-QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME = -Wl,-h,
-
-QMAKE_LIBS =
-QMAKE_LIBS_DYNLOAD = -ldl
-QMAKE_LIBS_X11 = -lXext -lX11 -lm
-QMAKE_LIBS_QT = -lqt
-
-QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
-QMAKE_LIBS_OPENGL_QT = -lGL -lXmu
-
-QMAKE_MOC = $(TQTDIR)/bin/tqmoc
-QMAKE_UIC = $(TQTDIR)/bin/tquic
-
-QMAKE_AR = ar cq
-QMAKE_RANLIB =
-
-QMAKE_TAR = tar -cf
-QMAKE_GZIP = gzip -9f
-
-QMAKE_COPY = cp -f
-QMAKE_MOVE = mv -f
-QMAKE_DEL_FILE = rm -f
-QMAKE_DEL_DIR = rmdir
-QMAKE_CHK_DIR_EXISTS = test -d
-QMAKE_MKDIR = mkdir -p
diff --git a/mkspecs/dgux-g++/qplatformdefs.h b/mkspecs/dgux-g++/qplatformdefs.h
deleted file mode 100644
index ffca35e44..000000000
--- a/mkspecs/dgux-g++/qplatformdefs.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef TQPLATFORMDEFS_H
-#define TQPLATFORMDEFS_H
-
-// Get TQt defines/settings
-
-#include "tqglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-// This is to have PATH_MAX defined in <limits.h>
-#ifndef _SYSV3_LIMITS_FLAVOR
-# define _SYSV3_LIMITS_FLAVOR
-#endif
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-
-#ifdef TQT_THREAD_SUPPORT
-#include <pthread.h>
-#endif
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-// DNS header files are not fully covered by X/Open specifications.
-// In particular nothing is said about res_* :/
-// On IRIX header files <netinet/in.h> and <arpa/nameser.h> are not
-// included by <resolv.h>. Note that <arpa/nameser.h> must be included
-// before <resolv.h>.
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-
-#define QT_SIGNAL_RETTYPE void
-#define QT_SIGNAL_ARGS int
-#define QT_SIGNAL_IGNORE SIG_IGN
-
-#define QT_SOCKLEN_T int
-
-#define QT_SNPRINTF ::snprintf
-#define QT_VSNPRINTF ::vsnprintf
-
-#endif // TQPLATFORMDEFS_H
-
diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf
index e8199f97f..1126bd465 100644
--- a/qmake/book/qmake-install.leaf
+++ b/qmake/book/qmake-install.leaf
@@ -26,10 +26,10 @@ aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc
aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++
aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++
bsdi-g++ hpux-o64 linux-icc qnx-g++ win32-msvc
-dgux-g++ hurd-g++ linux-kcc unixware7-g++ win32-visa
-freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-g++
+freebsd-g++ hurd-g++ linux-kcc unixware7-g++ win32-visa
+hpux-acc irix-64 macx-pbuilder ultrix-g++ win32-g++
hpux-acc irix-g++ macx-g++ unixware-g win32-watc
-hpux-acc irix-n32 solaris-64 unixware7-cc
+ irix-n32 solaris-64 unixware7-cc
\i TQTDIR \BR This must be set to where TQt is (or will be) installed.
For example, \e {c:\\qt} and \e {\\local\\qt}
diff --git a/src/3rdparty/libmng/aclocal.m4 b/src/3rdparty/libmng/aclocal.m4
index 4283bf097..f7667191b 100644
--- a/src/3rdparty/libmng/aclocal.m4
+++ b/src/3rdparty/libmng/aclocal.m4
@@ -2024,12 +2024,6 @@ EOF
hardcode_shlibpath_var=no
;;
- dgux*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_shlibpath_var=no
- ;;
-
sysv4*MP*)
if test -d /usr/nec; then
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -2462,15 +2456,6 @@ uts4*)
shlibpath_var=LD_LIBRARY_PATH
;;
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
- soname_spec='${libname}${release}.so$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
sysv4*MP*)
if test -d /usr/nec ;then
version_type=linux
diff --git a/src/3rdparty/libmng/config.guess b/src/3rdparty/libmng/config.guess
index f75adf068..44b51774b 100755
--- a/src/3rdparty/libmng/config.guess
+++ b/src/3rdparty/libmng/config.guess
@@ -367,22 +367,6 @@ EOF
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
exit 0 ;;
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
- then
- echo m88k-dg-dgux${UNAME_RELEASE}
- else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
- fi
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
- exit 0 ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit 0 ;;
diff --git a/src/3rdparty/libmng/config.sub b/src/3rdparty/libmng/config.sub
index 4d87ba463..20a53902e 100755
--- a/src/3rdparty/libmng/config.sub
+++ b/src/3rdparty/libmng/config.sub
@@ -1025,7 +1025,7 @@ case $os in
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -luna* | -dgux* | -solaris* | -sym* \
+ | -hpux* | -unos* | -luna* | -solaris* | -sym* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1222,9 +1222,6 @@ case $basic_machine in
*-cbm)
os=-amigaos
;;
- *-dg)
- os=-dgux
- ;;
*-dolphin)
os=-sysv3
;;
@@ -1321,9 +1318,6 @@ case $basic_machine in
-unos*)
vendor=crds
;;
- -dgux*)
- vendor=dg
- ;;
-luna*)
vendor=omron
;;
diff --git a/src/3rdparty/libmng/configure b/src/3rdparty/libmng/configure
index 8bd536d25..162ef6a1d 100755
--- a/src/3rdparty/libmng/configure
+++ b/src/3rdparty/libmng/configure
@@ -3802,12 +3802,6 @@ EOF
hardcode_shlibpath_var=no
;;
- dgux*)
- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_shlibpath_var=no
- ;;
-
sysv4*MP*)
if test -d /usr/nec; then
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -4243,15 +4237,6 @@ uts4*)
shlibpath_var=LD_LIBRARY_PATH
;;
-dgux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
- soname_spec='${libname}${release}.so$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
sysv4*MP*)
if test -d /usr/nec ;then
version_type=linux
diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h
index b49fdc242..a227392a3 100644
--- a/src/tools/tqglobal.h
+++ b/src/tools/tqglobal.h
@@ -70,7 +70,6 @@
UNIXWARE - UnixWare 7, Open UNIX 8
AIX - AIX
HURD - GNU Hurd
- DGUX - DG/UX
DYNIX - DYNIX/ptx
TQNX - TQNX
TQNX6 - TQNX RTP 6.1
@@ -130,8 +129,6 @@
# define Q_OS_AIX
#elif defined(__Lynx__)
# define Q_OS_LYNX
-#elif defined(__DGUX__)
-# define Q_OS_DGUX
#elif defined(__QNXNTO__)
# define Q_OS_QNX6
#elif defined(__QNX__)