summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/libmng/acinclude.m44
-rw-r--r--src/3rdparty/libmng/aclocal.m493
-rwxr-xr-xsrc/3rdparty/libmng/config.guess9
-rwxr-xr-xsrc/3rdparty/libmng/config.sub23
-rwxr-xr-xsrc/3rdparty/libmng/configure95
-rw-r--r--src/3rdparty/libmng/ltmain.sh25
-rwxr-xr-xsrc/3rdparty/libmng/missing2
-rw-r--r--src/3rdparty/libpng/INSTALL2
-rw-r--r--src/3rdparty/libpng/README4
-rw-r--r--src/3rdparty/libpng/scripts/makefile.sggcc211
-rw-r--r--src/3rdparty/libpng/scripts/makefile.sgi217
-rwxr-xr-xsrc/3rdparty/zlib/configure3
-rw-r--r--src/kernel/tqapplication.cpp2
-rw-r--r--src/kernel/tqapplication_x11.cpp101
-rw-r--r--src/kernel/tqevent.cpp7
-rw-r--r--src/kernel/tqt_x11_p.h7
-rw-r--r--src/tools/qt_tools.pri6
-rw-r--r--src/tools/tqglobal.h16
-rw-r--r--src/tools/tqlibrary.cpp3
19 files changed, 13 insertions, 817 deletions
diff --git a/src/3rdparty/libmng/acinclude.m4 b/src/3rdparty/libmng/acinclude.m4
index f3cb3c95c..c2baeb453 100644
--- a/src/3rdparty/libmng/acinclude.m4
+++ b/src/3rdparty/libmng/acinclude.m4
@@ -43,8 +43,8 @@ AC_DEFUN(AC_SYS_LARGEFILE,
ac_cv_sys_largefile_CC,
[ac_cv_sys_largefile_CC=no
if test "$GCC" != yes; then
- # IRIX 6.2 and later do not support large files by default,
- # so use the C compiler's -n32 option if that helps.
+ # If the OS does not support large files by default,
+ # use the C compiler's -n32 option if that helps.
AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
[ac_save_CC="$CC"
CC="$CC -n32"
diff --git a/src/3rdparty/libmng/aclocal.m4 b/src/3rdparty/libmng/aclocal.m4
index a0f9e41af..552f9a883 100644
--- a/src/3rdparty/libmng/aclocal.m4
+++ b/src/3rdparty/libmng/aclocal.m4
@@ -55,8 +55,8 @@ AC_DEFUN(AC_SYS_LARGEFILE,
ac_cv_sys_largefile_CC,
[ac_cv_sys_largefile_CC=no
if test "$GCC" != yes; then
- # IRIX 6.2 and later do not support large files by default,
- # so use the C compiler's -n32 option if that helps.
+ # If the OS does not support large files by default,
+ # use the C compiler's -n32 option if that helps.
AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
[ac_save_CC="$CC"
CC="$CC -n32"
@@ -369,25 +369,6 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -487,9 +468,6 @@ aix*)
cygwin* | mingw* | pw32*)
symcode='[[ABCDGISTW]]'
;;
-irix*)
- symcode='[[BCDEGRST]]'
- ;;
solaris* | sysv5*)
symcode='[[BDT]]'
;;
@@ -1126,8 +1104,8 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
# like `-m68040'.
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | irix5* | irix6*)
- # PIC is the default for these OSes.
+ beos*)
+ # PIC is the default for this OS
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -1162,12 +1140,6 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
fi
;;
- irix5* | irix6*)
- lt_cv_prog_cc_wl='-Wl,'
- lt_cv_prog_cc_static='-non_shared'
- # PIC (with -KPIC) is the default.
- ;;
-
cygwin* | mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
@@ -1831,17 +1803,6 @@ else
hardcode_shlibpath_var=no
;;
- irix5* | irix6*)
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- link_all_deplibs=yes
- ;;
-
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -2244,31 +2205,6 @@ gnu*)
hardcode_into_libs=yes
;;
-irix5* | irix6*)
- version_type=irix
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}.so$major'
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
- case $host_os in
- irix5*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- ;;
-
# No shared lib support for Linux oldld, aout, or coff.
linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
dynamic_linker=no
@@ -3419,27 +3355,6 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-irix5* | irix6*)
- case $host_os in
- irix5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
- ;;
- *)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
- ;;
- esac
- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
- lt_cv_deplibs_check_method=pass_all
- ;;
-
# This must be Linux ELF.
linux-gnu*)
case $host_cpu in
diff --git a/src/3rdparty/libmng/config.guess b/src/3rdparty/libmng/config.guess
index 1c66e983f..d23eba0a7 100755
--- a/src/3rdparty/libmng/config.guess
+++ b/src/3rdparty/libmng/config.guess
@@ -196,9 +196,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -380,9 +377,6 @@ EOF
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
exit 0 ;;
- *:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
@@ -877,9 +871,6 @@ EOF
NSR-[KW]:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
- *:NonStop-UX:*:*)
- echo mips-compaq-nonstopux
- exit 0 ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
exit 0 ;;
diff --git a/src/3rdparty/libmng/config.sub b/src/3rdparty/libmng/config.sub
index c23cdec33..fb9dfc911 100755
--- a/src/3rdparty/libmng/config.sub
+++ b/src/3rdparty/libmng/config.sub
@@ -137,7 +137,7 @@ case $os in
-sun*os*)
# Prevent following clause from handling this invalid input.
;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sony* | \
-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
@@ -534,16 +534,6 @@ case $basic_machine in
basic_machine=i386-unknown
os=-vsta
;;
- iris | iris4d)
- basic_machine=mips-sgi
- case $os in
- -irix*)
- ;;
- *)
- os=-irix4
- ;;
- esac
- ;;
isi68 | isi)
basic_machine=m68k-isi
os=-sysv
@@ -657,10 +647,6 @@ case $basic_machine in
basic_machine=i960-intel
os=-mon960
;;
- nonstopux)
- basic_machine=mips-compaq
- os=-nonstopux
- ;;
np1)
basic_machine=np1-gould
;;
@@ -1019,7 +1005,7 @@ case $os in
# The portable systems comes first.
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* \
| -*vms* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -unos* | -luna* | -solaris* | -sym* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -1034,7 +1020,7 @@ case $os in
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -openstep* | -oskit* | -conix* | -pw32* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos*)
# Remember, each alternative MUST END IN *, to match a version number.
@@ -1251,9 +1237,6 @@ case $basic_machine in
*-encore)
os=-bsd
;;
- *-sgi)
- os=-irix
- ;;
*-siemens)
os=-sysv4
;;
diff --git a/src/3rdparty/libmng/configure b/src/3rdparty/libmng/configure
index 8cc3b336b..7b1fe034d 100755
--- a/src/3rdparty/libmng/configure
+++ b/src/3rdparty/libmng/configure
@@ -733,7 +733,6 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# incompatible versions:
# SysV /etc/install, /usr/sbin/install
# SunOS /usr/etc/install
-# IRIX /sbin/install
# AIX /bin/install
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
@@ -1976,27 +1975,6 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-irix5* | irix6*)
- case $host_os in
- irix5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
- ;;
- *)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
- ;;
- esac
- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
- lt_cv_deplibs_check_method=pass_all
- ;;
-
# This must be Linux ELF.
linux-gnu*)
case $host_cpu in
@@ -2169,9 +2147,6 @@ aix*)
cygwin* | mingw* | pw32*)
symcode='[ABCDGISTW]'
;;
-irix*)
- symcode='[BCDEGRST]'
- ;;
solaris* | sysv5*)
symcode='[BDT]'
;;
@@ -2638,29 +2613,6 @@ fi
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '#line 2676 "configure"' > conftest.$ac_ext
- if { (eval echo configure:2677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-esac
-
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
Xsed='sed -e s/^X//'
@@ -2810,8 +2762,8 @@ else
# like `-m68040'.
lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | irix5* | irix6*)
- # PIC is the default for these OSes.
+ beos*)
+ # PIC is the default for this OS
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -2846,12 +2798,6 @@ else
fi
;;
- irix5* | irix6*)
- lt_cv_prog_cc_wl='-Wl,'
- lt_cv_prog_cc_static='-non_shared'
- # PIC (with -KPIC) is the default.
- ;;
-
cygwin* | mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
@@ -3600,17 +3546,6 @@ else
hardcode_shlibpath_var=no
;;
- irix5* | irix6*)
- if test "$GCC" = yes; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator=:
- link_all_deplibs=yes
- ;;
-
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -4016,31 +3951,6 @@ gnu*)
hardcode_into_libs=yes
;;
-irix5* | irix6*)
- version_type=irix
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}.so$major'
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
- case $host_os in
- irix5*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- ;;
-
# No shared lib support for Linux oldld, aout, or coff.
linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
dynamic_linker=no
@@ -5357,7 +5267,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
# incompatible versions:
# SysV /etc/install, /usr/sbin/install
# SunOS /usr/etc/install
-# IRIX /sbin/install
# AIX /bin/install
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
diff --git a/src/3rdparty/libmng/ltmain.sh b/src/3rdparty/libmng/ltmain.sh
index 244554861..45e445b74 100644
--- a/src/3rdparty/libmng/ltmain.sh
+++ b/src/3rdparty/libmng/ltmain.sh
@@ -988,15 +988,7 @@ compiler."
continue
;;
- # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
- # so, if we see these flags be careful not to treat them like -L
-L[A-Z][A-Z]*:*)
- case $with_gcc/$host in
- no/*-*-irix*)
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
- ;;
- esac
continue
;;
@@ -2273,23 +2265,6 @@ compiler."
versuffix=".$current";
;;
- irix)
- major=`expr $current - $age + 1`
- verstring="sgi$major.$revision"
-
- # Add in all the interfaces that we are compatible with.
- loop=$revision
- while test "$loop" -ne 0; do
- iface=`expr $revision - $loop`
- loop=`expr $loop - 1`
- verstring="sgi$major.$iface:$verstring"
- done
-
- # Before this point, $major must not contain `.'.
- major=.$major
- versuffix="$major.$revision"
- ;;
-
linux)
major=.`expr $current - $age`
versuffix="$major.$age.$revision"
diff --git a/src/3rdparty/libmng/missing b/src/3rdparty/libmng/missing
index d46f79f64..0b54a0e07 100755
--- a/src/3rdparty/libmng/missing
+++ b/src/3rdparty/libmng/missing
@@ -173,7 +173,7 @@ WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
+ DU). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL
index b4437d22a..90325f1ff 100644
--- a/src/3rdparty/libpng/INSTALL
+++ b/src/3rdparty/libpng/INSTALL
@@ -83,8 +83,6 @@ include
makefile.netbsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng.so.
makefile.ne0bsd => NetBSD/cc makefile, uses PNGGCCRD, makes libpng0.so
makefile.openbsd => OpenBSD makefile
- makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
- makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc, creates libpng12.so.0.1.2.5)
makefile.so9 => Solaris 9 makefile (gcc, creates libpng12.so.0.1.2.5)
diff --git a/src/3rdparty/libpng/README b/src/3rdparty/libpng/README
index 18e148fe5..0a4a9d246 100644
--- a/src/3rdparty/libpng/README
+++ b/src/3rdparty/libpng/README
@@ -205,8 +205,6 @@ Files in this distribution:
makefile.netbsd => NetBSD/cc makefile, PNGGCCRD, makes libpng.so.
makefile.ne0bsd => NetBSD/cc makefile, PNGGCCRD, makes libpng0.so
makefile.openbsd => OpenBSD makefile
- makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
- makefile.sggcc => Silicon Graphics (gcc, creates libpng12.so.0.1.2.5)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.5)
@@ -241,8 +239,6 @@ Files in this distribution:
makefile.gcmmx => Linux/ELF makefile (gcc, creates
libpng12.so.0m.1.2.5, uses assembler code
tuned for Intel MMX platform)
- makefile.sgi => Silicon Graphics (cc, creates libpng12m.so)
- makefile.sggcc => Silicon Graphics (gcc, creates libpng12m.so)
Good luck, and happy coding.
diff --git a/src/3rdparty/libpng/scripts/makefile.sggcc b/src/3rdparty/libpng/scripts/makefile.sggcc
deleted file mode 100644
index 082de1b89..000000000
--- a/src/3rdparty/libpng/scripts/makefile.sggcc
+++ /dev/null
@@ -1,211 +0,0 @@
-# makefile for libpng.a and libpng12.so, SGI IRIX with 'cc'
-# Copyright (C) 2001-2002 Glenn Randers-Pehrson
-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
-
-# Where make install puts libpng.a, libpng12.so, and libpng12/png.h
-# Prefix must be a full pathname.
-
-prefix=/usr/local
-
-# Where the zlib library and include files are located
-#ZLIBLIB=/usr/local/lib32
-#ZLIBINC=/usr/local/include
-#ZLIBLIB=/usr/local/lib
-#ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
-
-LIBNAME=libpng12
-PNGMAJ = 0
-PNGMIN = 1.2.5
-PNGVER = $(PNGMAJ).$(PNGMIN)
-CC=gcc
-
-# ABI can be blank to use default for your system, -32, -o32, -n32, or -64
-# See "man abi". zlib must be built with the same ABI.
-ABI=
-
-WARNMORE= # -g -DPNG_DEBUG=5
-CFLAGS=$(ABI) -I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32
-LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
-LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) \
- -set_version sgi$(PNGMAJ).0
-LDLEGACY=cc $(ABI) -shared -soname libpng.so.3 \
- -set_version sgi$3.0
-# See "man dso" for info about shared objects
-
-RANLIB=echo
-#RANLIB=ranlib
-
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-#LIBPATH=$(prefix)/lib32
-MANPATH=$(prefix)/man
-BINPATH=$(prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
-OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
-
-all: libpng.a pngtest shared libpng.pc libpng-config
-
-libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
- $(RANLIB) $@
-
-shared: $(LIBNAME).so.$(PNGVER)
-
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo ccopts=\"$(ABI)\"; \
- echo ldopts=\"$(ABI)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo libdir=\"$(LIBPATH)\"; \
- echo libs=\"-lpng12 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
-$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
- ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
-
-$(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
- ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
-
-$(LIBNAME).so.$(PNGVER): $(OBJS)
- $(LDSHARED) -o $@ $(OBJS)
- rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
-
-libpng.so.3.$(PNGMIN): $(OBJS)
- $(LDLEGACY) -o $@ $(OBJS)
-
-pngtest: pngtest.o libpng.a
- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-
-test: pngtest
- echo
- echo Testing local static library.
- ./pngtest
-
-install-headers: png.h pngconf.h
- -@if [ ! -d $(DI) ]; then mkdir $(DI); fi
- -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
- -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h
- -@/bin/rm -f $(DI)/libpng
- (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
-
-install-static: install-headers libpng.a
- -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@/bin/rm -f $(DL)/libpng.a
- (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
-
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
- -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
- -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
- -@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
- cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
- chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
- (cd $(DL); \
- ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -sf libpng.so.3 libpng.so; \
- ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
- ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
- -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
- -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
- -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
-
-install-man: libpng.3 libpngpf.3 png.5
- -@if [ ! -d $(DM) ]; then mkdir $(DM); fi
- -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
- -@/bin/rm -f $(DM)/man3/libpng.3
- -@/bin/rm -f $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
- -@/bin/rm -f $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- -@if [ ! -d $(DB) ]; then mkdir $(DB); fi
- -@/bin/rm -f $(DB)/libpng-config
- -@/bin/rm -f $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) -I$(ZLIBINC) \
- `$(BINPATH)/libpng12-config --cflags` pngtest.c \
- -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \
- -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
- ./pngtesti pngtest.png
-
-clean:
- rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
- $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
- libpng.so.3.$(PNGMIN) \
- so_locations
-
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-png.o: png.h pngconf.h
-pngerror.o: png.h pngconf.h
-pngrio.o: png.h pngconf.h
-pngwio.o: png.h pngconf.h
-pngmem.o: png.h pngconf.h
-pngset.o: png.h pngconf.h
-pngget.o: png.h pngconf.h
-pngread.o: png.h pngconf.h
-pngrtran.o: png.h pngconf.h
-pngrutil.o: png.h pngconf.h
-pngtest.o: png.h pngconf.h
-pngtrans.o: png.h pngconf.h
-pngwrite.o: png.h pngconf.h
-pngwtran.o: png.h pngconf.h
-pngwutil.o: png.h pngconf.h
-pngpread.o: png.h pngconf.h
-pnggccrd.o: png.h pngconf.h
-
diff --git a/src/3rdparty/libpng/scripts/makefile.sgi b/src/3rdparty/libpng/scripts/makefile.sgi
deleted file mode 100644
index 219b8adfb..000000000
--- a/src/3rdparty/libpng/scripts/makefile.sgi
+++ /dev/null
@@ -1,217 +0,0 @@
-# makefile for libpng.a and libpng12.so, SGI IRIX with 'cc'
-# Copyright (C) 2001-2002 Glenn Randers-Pehrson
-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
-
-LIBNAME=libpng12
-PNGMAJ = 0
-PNGMIN = 1.2.5
-PNGVER = $(PNGMAJ).$(PNGMIN)
-
-# Where make install puts libpng.a, libpng12.so, and libpng12/png.h
-# Prefix must be a full pathname.
-
-prefix=/usr/local
-
-# Where the zlib library and include files are located
-#ZLIBLIB=/usr/local/lib32
-#ZLIBINC=/usr/local/include
-#ZLIBLIB=/usr/local/lib
-#ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
-
-CC=cc
-
-# ABI can be blank to use default for your system, -32, -o32, -n32, or -64
-# See "man abi". zlib must be built with the same ABI.
-ABI=
-
-WARNMORE=-fullwarn
-# Note: -KPIC is the default anyhow
-#CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC -DPNG_USE_PNGGCCRD # -g -DPNG_DEBUG=5
-CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_USE_PNGGCCRD \
- -DPNG_NO_ASSEMBLER_CODE
-LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng12 -lz -lm
-LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
-LDSHARED=cc $(ABI) -shared -soname $(LIBNAME).so.$(PNGMAJ) \
- -set_version sgi$(PNGMAJ).0
-LDLEGACY=cc $(ABI) -shared -soname libpng.so.3 \
- -set_version sgi$3.0
-# See "man dso" for info about shared objects
-
-RANLIB=echo
-#RANLIB=ranlib
-
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-#LIBPATH=$(prefix)/lib32
-MANPATH=$(prefix)/man
-BINPATH=$(prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
-OBJS = pnggccrd.o png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
-
-all: libpng.a pngtest shared libpng.pc libpng-config
-
-libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
- $(RANLIB) $@
-
-shared: $(LIBNAME).so.$(PNGVER)
-
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo cppflags=\"-DPNG_USE_PNGGCCRD -DPNG_NO_ASSEMBLER_CODE\"; \
- echo ccopts=\"$(ABI)\"; \
- echo ldopts=\"$(ABI)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo libdir=\"$(LIBPATH)\"; \
- echo libs=\"-lpng12 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
-$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
- ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
-
-$(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
- ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
-
-$(LIBNAME).so.$(PNGVER): $(OBJS)
- $(LDSHARED) -o $@ $(OBJS)
- rm -f $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)
-
-libpng.so.3.$(PNGMIN): $(OBJS)
- $(LDLEGACY) -o $@ $(OBJS)
-
-pngtest: pngtest.o libpng.a
- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-
-test: pngtest
- echo
- echo Testing local static library.
- ./pngtest
-
-install-headers: png.h pngconf.h
- -@if [ ! -d $(DI) ]; then mkdir $(DI); fi
- -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
- -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h
- -@/bin/rm -f $(DI)/libpng
- (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
-
-install-static: install-headers libpng.a
- -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@/bin/rm -f $(DL)/libpng.a
- (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
-
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
- libpng.so.3.$(PNGMIN)
- -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
- -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
- -@/bin/rm -f $(DL)/libpng.so
- -@/bin/rm -f $(DL)/libpng.so.3
- -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
- cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.3.$(PNGMIN) $(DL)
- chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
- chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
- (cd $(DL); \
- ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
- ln -sf libpng.so.3 libpng.so; \
- ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
- ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
- -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
- -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
- -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
-
-install-man: libpng.3 libpngpf.3 png.5
- -@if [ ! -d $(DM) ]; then mkdir $(DM); fi
- -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
- -@/bin/rm -f $(DM)/man3/libpng.3
- -@/bin/rm -f $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
- -@/bin/rm -f $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- -@if [ ! -d $(DB) ]; then mkdir $(DB); fi
- -@/bin/rm -f $(DB)/libpng-config
- -@/bin/rm -f $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
-
-test-installed:
- echo
- echo Testing installed dynamic shared library.
- $(CC) -I$(ZLIBINC) \
- `$(BINPATH)/libpng12-config --cflags` pngtest.c \
- -L$(ZLIBLIB) -rpath $(ZLIBLIB):`$(BINPATH)/libpng12-config --libdir` \
- -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
- ./pngtesti pngtest.png
-
-clean:
- rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \
- $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
- libpng.so.3.$(PNGMIN) \
- so_locations
-
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-png.o: png.h pngconf.h
-pngerror.o: png.h pngconf.h
-pngrio.o: png.h pngconf.h
-pngwio.o: png.h pngconf.h
-pngmem.o: png.h pngconf.h
-pngset.o: png.h pngconf.h
-pngget.o: png.h pngconf.h
-pngread.o: png.h pngconf.h
-pngrtran.o: png.h pngconf.h
-pngrutil.o: png.h pngconf.h
-pngtest.o: png.h pngconf.h
-pngtrans.o: png.h pngconf.h
-pngwrite.o: png.h pngconf.h
-pngwtran.o: png.h pngconf.h
-pngwutil.o: png.h pngconf.h
-pngpread.o: png.h pngconf.h
-pnggccrd.o: png.h pngconf.h
-
diff --git a/src/3rdparty/zlib/configure b/src/3rdparty/zlib/configure
index d36abb38a..7dab28f86 100755
--- a/src/3rdparty/zlib/configure
+++ b/src/3rdparty/zlib/configure
@@ -93,9 +93,6 @@ else
# find system name and corresponding cc options
CC=${CC-cc}
case `(uname -sr || echo unknown) 2>/dev/null` in
- IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
- CFLAGS=${CFLAGS-"-ansi -O2"}
- LDSHARED=${LDSHARED-"cc -shared"};;
QNX*) SFLAGS=${CFLAGS-"-4 -O"}
CFLAGS=${CFLAGS-"-4 -O"}
LDSHARED=${LDSHARED-"cc"}
diff --git a/src/kernel/tqapplication.cpp b/src/kernel/tqapplication.cpp
index 97368b0c6..6f9e2872a 100644
--- a/src/kernel/tqapplication.cpp
+++ b/src/kernel/tqapplication.cpp
@@ -1434,8 +1434,6 @@ TQStyle& TQApplication::style()
style = "Windows"; // default styles for Windows
#elif defined(TQ_WS_X11) && defined(Q_OS_SOLARIS)
style = "CDE"; // default style for X11 on Solaris
-#elif defined(TQ_WS_X11) && defined(Q_OS_IRIX)
- style = "SGI"; // default style for X11 on IRIX
#elif defined(TQ_WS_X11)
style = "Motif"; // default style for X11
#elif defined(TQ_WS_MAC)
diff --git a/src/kernel/tqapplication_x11.cpp b/src/kernel/tqapplication_x11.cpp
index eeb5e0e36..5b0bba96e 100644
--- a/src/kernel/tqapplication_x11.cpp
+++ b/src/kernel/tqapplication_x11.cpp
@@ -2272,12 +2272,10 @@ void tqt_init_internal( int *argcptr, char **argv,
XEventClass *ev_class;
int curr_event_count;
-#if !defined(Q_OS_IRIX)
// XFree86 divides a stylus and eraser into 2 devices, so we must do for both...
const TQString XFREENAMESTYLUS = "stylus";
const TQString XFREENAMEPEN = "pen";
const TQString XFREENAMEERASER = "eraser";
-#endif
devices = XListInputDevices( appDpy, &ndev);
if ( devices == NULL ) {
@@ -2287,11 +2285,6 @@ void tqt_init_internal( int *argcptr, char **argv,
dev = NULL;
for ( devs = devices, i = 0; i < ndev; i++, devs++ ) {
gotEraser = false;
-#if defined(Q_OS_IRIX)
-
- gotStylus = ( !strncmp(devs->name,
- WACOM_NAME, sizeof(WACOM_NAME) - 1) );
-#else
TQString devName = devs->name;
devName = devName.lower();
gotStylus = ( devName.startsWith(XFREENAMEPEN)
@@ -2299,7 +2292,6 @@ void tqt_init_internal( int *argcptr, char **argv,
if ( !gotStylus )
gotEraser = devName.startsWith( XFREENAMEERASER );
-#endif
if ( gotStylus || gotEraser ) {
// I only wanted to do this once, so wrap pointers around these
curr_event_count = 0;
@@ -2358,11 +2350,7 @@ void tqt_init_internal( int *argcptr, char **argv,
v = (XValuatorInfoPtr) any;
a = (XAxisInfoPtr) ((char *) v +
sizeof (XValuatorInfo));
-#if defined (Q_OS_IRIX)
- max_pressure = a[WAC_PRESSURE_I].max_value;
-#else
max_pressure = a[2].max_value;
-#endif
// got the max pressure no need to go further...
break;
}
@@ -2373,11 +2361,7 @@ void tqt_init_internal( int *argcptr, char **argv,
}
// at this point we are assuming there is only one
// wacom device...
-#if defined (Q_OS_IRIX)
- if ( devStylus != NULL ) {
-#else
if ( devStylus != NULL && devEraser != NULL ) {
-#endif
break;
}
}
@@ -4237,18 +4221,6 @@ bool TQETWidget::translateMouseEvent( const XEvent *event )
case 9: button = HistoryForwardButton; break;
}
if ( event->type == ButtonPress ) { // mouse button pressed
-#if defined(Q_OS_IRIX) && defined(QT_TABLET_SUPPORT)
- XEvent myEv;
- if ( XCheckTypedEvent( appDpy, xinput_button_press, &myEv ) ) {
- if ( translateXinputEvent( &myEv ) ) {
- //Spontaneous event sent. Check if we need to continue.
- if ( chokeMouse ) {
- chokeMouse = false;
- return false;
- }
- }
- }
-#endif
qt_button_down = childAt( pos ); //magic for masked widgets
if ( !qt_button_down || !qt_button_down->testWFlags(WMouseNoMask) )
qt_button_down = this;
@@ -4270,18 +4242,6 @@ bool TQETWidget::translateMouseEvent( const XEvent *event )
mouseGlobalXPos = globalPos.x();
mouseGlobalYPos = globalPos.y();
} else { // mouse button released
-#if defined(Q_OS_IRIX) && defined(QT_TABLET_SUPPORT)
- XEvent myEv;
- if ( XCheckTypedEvent( appDpy, xinput_button_release, &myEv ) ) {
- if ( translateXinputEvent( &myEv ) ) {
- //Spontaneous event sent. Check if we need to continue.
- if ( chokeMouse ) {
- chokeMouse = false;
- return false;
- }
- }
- }
-#endif
if ( manualGrab ) { // release manual grab
manualGrab = false;
XUngrabPointer( x11Display(), CurrentTime );
@@ -4456,15 +4416,6 @@ bool TQETWidget::translateWheelEvent( int global_x, int global_y, int delta, int
#if defined (QT_TABLET_SUPPORT)
bool TQETWidget::translateXinputEvent( const XEvent *ev )
{
-#if defined (Q_OS_IRIX)
- // Wacom has put defines in their wacom.h file so it would be quite wise
- // to use them, need to think of a decent way of not using
- // it when it doesn't exist...
- XDeviceState *s;
- XInputClass *iClass;
- XValuatorState *vs;
- int j;
-#endif
TQWidget *w = this;
TQPoint global,
curr;
@@ -4475,9 +4426,6 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev )
TQPair<int, int> tId;
XEvent xinputMotionEvent;
XEvent mouseMotionEvent;
-#if defined (Q_OS_IRIX)
- XDevice *dev;
-#endif
const XDeviceMotionEvent *motion = 0;
XDeviceButtonEvent *button = 0;
TQEvent::Type t;
@@ -4527,10 +4475,6 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev )
*/
curr = TQPoint( button->x, button->y );
}
-#if defined(Q_OS_IRIX)
- // default...
- dev = devStylus;
-#else
if ( ev->type == xinput_motion ) {
if ( motion->deviceid == devStylus->device_id ) {
deviceType = TQTabletEvent::Stylus;
@@ -4544,7 +4488,6 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev )
deviceType = TQTabletEvent::Eraser;
}
}
-#endif
const int PRESSURE_LEVELS = 255;
// we got the maximum pressure at start time, since various tablets have
@@ -4557,49 +4500,6 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev )
else
scaleFactor = PRESSURE_LEVELS / max_pressure;
}
-#if defined (Q_OS_IRIX)
- s = XQueryDeviceState( appDpy, dev );
- if ( s == NULL )
- return false;
- iClass = s->data;
- for ( j = 0; j < s->num_classes; j++ ) {
- if ( iClass->c_class == ValuatorClass ) {
- vs = (XValuatorState *)iClass;
- // figure out what device we have, based on bitmasking...
- if ( vs->valuators[WAC_TRANSDUCER_I]
- & WAC_TRANSDUCER_PROX_MSK ) {
- switch ( vs->valuators[WAC_TRANSDUCER_I]
- & WAC_TRANSDUCER_MSK ) {
- case WAC_PUCK_ID:
- deviceType = TQTabletEvent::Puck;
- break;
- case WAC_STYLUS_ID:
- deviceType = TQTabletEvent::Stylus;
- break;
- case WAC_ERASER_ID:
- deviceType = TQTabletEvent::Eraser;
- break;
- }
- // Get a Unique Id for the device, Wacom gives us this ability
- tId.first = vs->valuators[WAC_TRANSDUCER_I] & WAC_TRANSDUCER_ID_MSK;
- tId.second = vs->valuators[WAC_SERIAL_NUM_I];
- } else
- deviceType = TQTabletEvent::NoDevice;
- // apparently Wacom needs a cast for the +/- values to make sense
- xTilt = short(vs->valuators[WAC_XTILT_I]);
- yTilt = short(vs->valuators[WAC_YTILT_I]);
- if ( max_pressure > PRESSURE_LEVELS )
- pressure = vs->valuators[WAC_PRESSURE_I] / scaleFactor;
- else
- pressure = vs->valuators[WAC_PRESSURE_I] * scaleFactor;
- global = TQPoint( vs->valuators[WAC_XCOORD_I],
- vs->valuators[WAC_YCOORD_I] );
- break;
- }
- iClass = (XInputClass*)((char*)iClass + iClass->length);
- }
- XFreeDeviceState( s );
-#else
if ( motion ) {
xTilt = short(motion->axis_data[3]);
yTilt = short(motion->axis_data[4]);
@@ -4619,7 +4519,6 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev )
}
// The only way to get these Ids is to scan the XFree86 log, which I'm not going to do.
tId.first = tId.second = -1;
-#endif
TQTabletEvent e( t, curr, global, deviceType, pressure, xTilt, yTilt, tId );
TQApplication::sendSpontaneousEvent( w, &e );
diff --git a/src/kernel/tqevent.cpp b/src/kernel/tqevent.cpp
index d1cf09fe9..053c00223 100644
--- a/src/kernel/tqevent.cpp
+++ b/src/kernel/tqevent.cpp
@@ -1970,9 +1970,6 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s
\a device's degree of tilt from the X and Y axis respectively. The \a uId contains an
event id.
- On Irix, \a globalPos will contain the high-resolution coordinates received from the
- tablet device driver, instead of from the windowing system.
-
\sa pos(), globalPos(), device(), pressure(), xTilt(), yTilt()
*/
@@ -2002,10 +1999,6 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP
yTilt contain the \a device's degrees of tilt from the X and Y
axis respectively. The \a uId contains an event id.
- On Irix, \a globalPos will contain the high-resolution coordinates
- received from the tablet device driver, instead of from the
- windowing system.
-
\sa pos(), globalPos(), device(), pressure(), xTilt(), yTilt()
*/
diff --git a/src/kernel/tqt_x11_p.h b/src/kernel/tqt_x11_p.h
index aeb120203..b84bfca4b 100644
--- a/src/kernel/tqt_x11_p.h
+++ b/src/kernel/tqt_x11_p.h
@@ -88,9 +88,6 @@
// the wacom tablet (currently just the IRIX version)
#if defined (QT_TABLET_SUPPORT)
# include <X11/extensions/XInput.h>
-#if defined (Q_OS_IRIX)
-# include <wacom.h> // wacom driver defines for IRIX (quite handy)
-#endif
#endif // QT_TABLET_SUPPORT
@@ -190,10 +187,6 @@ typedef char *XPointer;
#elif defined(Q_OS_AIX)
// broken in Xlib up to what version of AIX?
#define TQT_NO_XIM
-#elif defined(TQT_NO_DEBUG) && defined(Q_OS_IRIX)
-// XmbLookupString broken on IRIX
-// XCreateIC broken when compiling -64 on IRIX 6.5.2
-#define TQT_NO_XIM
#endif // TQT_NO_XIM
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 702e575f7..a01835953 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -138,11 +138,5 @@ tools {
$$TOOLS_CPP/tqunicodetables.cpp \
$$TOOLS_CPP/tqucom.cpp \
$$TOOLS_CPP/tquuid.cpp
-
- irix-cc* {
- CXXFLAGS_PRELINK = $$QMAKE_CXXFLAGS
- CXXFLAGS_PRELINK -= -O2
- QMAKE_PRE_LINK = $(CXX) -c $$CXXFLAGS_PRELINK -O1 $(INCPATH) -o $(OBJECTS_DIR)/tqlocale.o tools/tqlocale.cpp
- }
}
diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h
index ff0d7d835..1f98a5d85 100644
--- a/src/tools/tqglobal.h
+++ b/src/tools/tqglobal.h
@@ -65,7 +65,6 @@
NETBSD - NetBSD
OPENBSD - OpenBSD
BSDI - BSD/OS
- IRIX - SGI Irix
UNIXWARE - UnixWare 7, Open UNIX 8
AIX - AIX
HURD - GNU Hurd
@@ -120,8 +119,6 @@
#elif defined(__bsdi__)
# define Q_OS_BSDI
# define Q_OS_BSD4
-#elif defined(__sgi)
-# define Q_OS_IRIX
#elif defined(_AIX)
# define Q_OS_AIX
#elif defined(__Lynx__)
@@ -331,19 +328,6 @@
# define Q_CC_OC
# define Q_NO_USING_KEYWORD
-/* The MIPSpro compiler in o32 mode is based on EDG but disables features
- such as template specialization nevertheless */
-# elif defined(__sgi)
-# define Q_CC_MIPS
-# if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */
-# define TQ_TYPENAME
-# elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */
-# define TQ_TYPENAME
-# endif
-# define Q_NO_USING_KEYWORD /* ### check "using" status */
-# if defined(_COMPILER_VERSION) && (_COMPILER_VERSION >= 740)
-# pragma set woff 3624,3625, 3649 /* turn off some harmless warnings */
-# endif
# endif
/* The older UnixWare 2.X compiler? */
diff --git a/src/tools/tqlibrary.cpp b/src/tools/tqlibrary.cpp
index 65e2f5326..d2b038af8 100644
--- a/src/tools/tqlibrary.cpp
+++ b/src/tools/tqlibrary.cpp
@@ -57,8 +57,7 @@
#endif
#if (defined(TQ_WS_WIN) && !defined(QT_MAKEDLL)) \
- || (defined(Q_OS_FREEBSD) && defined(Q_CC_INTEL)) \
- || (defined(Q_OS_IRIX) && defined(Q_CC_GNU))
+ || (defined(Q_OS_FREEBSD) && defined(Q_CC_INTEL))
#define TQT_NO_LIBRARY_UNLOAD
#endif
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-04 09:55:43 +0000