From 2080def64c64099ea7685d903d070e028a8cb916 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 17 Jan 2026 19:34:22 +0900 Subject: Remove support for HPUX, which is discontinued and does not provide a c++17 complaint compiler. Signed-off-by: Michele Calgaro --- INSTALL | 2 +- PLATFORMS | 28 +++- README.Qt3 | 2 - config.tests/unix/ipv6/ipv6test.cpp | 4 - config.tests/x11/notype.test | 4 +- configure | 36 ---- doc/abouttqt.doc | 2 +- doc/faq.doc | 2 +- doc/html/abouttqt.html | 2 +- doc/html/faq.html | 2 +- doc/html/install-x11.html | 2 +- doc/html/qmake-manual-2.html | 2 +- doc/html/tqglobal-h.html | 18 -- doc/installation.doc | 2 +- examples/demo/i18n/en.po | 4 +- examples/demo/i18n/i18n.cpp | 4 +- examples/demo/i18n/ja.po | 4 +- examples/demo/i18n/ko.po | 4 +- examples/demo/i18n/no.po | 4 +- examples/demo/translations/demo.ts | 4 +- examples/demo/translations/demo_ar.ts | 6 +- examples/demo/translations/demo_de.ts | 4 +- examples/demo/translations/demo_es_AR.ts | 2 +- examples/demo/translations/demo_fr.ts | 2 +- examples/demo/translations/demo_he.ts | 4 +- mkspecs/hpux-acc-64/qmake.conf | 125 -------------- mkspecs/hpux-acc-64/qplatformdefs.h | 58 ------- mkspecs/hpux-acc-o64/qmake.conf | 124 -------------- mkspecs/hpux-acc-o64/qplatformdefs.h | 60 ------- mkspecs/hpux-acc/qmake.conf | 104 ------------ mkspecs/hpux-acc/qplatformdefs.h | 68 -------- mkspecs/hpux-cc/qmake.conf | 99 ----------- mkspecs/hpux-cc/qplatformdefs.h | 57 ------- mkspecs/hpux-g++-64/qmake.conf | 85 ---------- mkspecs/hpux-g++-64/qplatformdefs.h | 58 ------- mkspecs/hpux-g++/qmake.conf | 86 ---------- mkspecs/hpux-g++/qplatformdefs.h | 66 -------- mkspecs/hpuxi-acc-32/qmake.conf | 123 -------------- mkspecs/hpuxi-acc-32/qplatformdefs.h | 60 ------- mkspecs/hpuxi-acc-64/qmake.conf | 123 -------------- mkspecs/hpuxi-acc-64/qplatformdefs.h | 60 ------- qmake/book/qmake-install.leaf | 37 ++++- qmake/generators/unix/unixmake.cpp | 5 +- qmake/generators/unix/unixmake2.cpp | 46 +----- src/3rdparty/libmng/acinclude.m4 | 4 +- src/3rdparty/libmng/aclocal.m4 | 79 +-------- src/3rdparty/libmng/config.guess | 70 +------- src/3rdparty/libmng/config.sub | 12 +- src/3rdparty/libmng/configure | 75 +-------- src/3rdparty/libmng/ltmain.sh | 9 - src/3rdparty/libmng/makefiles/acinclude.m4 | 4 +- src/3rdparty/libpng/INSTALL | 4 +- src/3rdparty/libpng/README | 2 - src/3rdparty/libpng/scripts/makefile.hpgcc | 217 ------------------------- src/3rdparty/libpng/scripts/makefile.hpux | 202 ----------------------- src/3rdparty/sqlite/os.h | 4 - src/3rdparty/sqlite/trolltech.patch | 4 +- src/3rdparty/zlib/README | 2 +- src/3rdparty/zlib/configure | 9 - src/dialogs/tqprintdialog.cpp | 1 - src/kernel/tqapplication_x11.cpp | 32 +--- src/kernel/tqcursor_x11.cpp | 2 +- src/kernel/tqt_x11_p.h | 3 - src/kernel/tqthread_unix.cpp | 6 - src/tools/tqdatastream.cpp | 6 - src/tools/tqglobal.h | 18 -- src/tools/tqgpluginmanager.cpp | 2 - src/tools/tqlibrary.cpp | 2 - src/tools/tqlibrary_unix.cpp | 51 ------ src/tools/tqstring.cpp | 2 +- tools/designer/designer/designer.pro | 10 +- tools/designer/designer/orderindicator.cpp | 2 +- tools/designer/designer/pixmapchooser.cpp | 2 +- tools/designer/designer/propertyeditor.cpp | 2 +- tools/designer/designer/sizehandle.cpp | 2 +- tools/designer/designer/styledbutton.cpp | 2 +- tools/designer/designer/widgetfactory.cpp | 2 +- tools/designer/designer/workspace.cpp | 2 +- tools/designer/plugins/cppeditor/cppeditor.pro | 6 +- tools/designer/tquic/form.cpp | 2 +- translations/qt_cs.ts | 2 +- 81 files changed, 127 insertions(+), 2323 deletions(-) delete mode 100644 mkspecs/hpux-acc-64/qmake.conf delete mode 100644 mkspecs/hpux-acc-64/qplatformdefs.h delete mode 100644 mkspecs/hpux-acc-o64/qmake.conf delete mode 100644 mkspecs/hpux-acc-o64/qplatformdefs.h delete mode 100644 mkspecs/hpux-acc/qmake.conf delete mode 100644 mkspecs/hpux-acc/qplatformdefs.h delete mode 100644 mkspecs/hpux-cc/qmake.conf delete mode 100644 mkspecs/hpux-cc/qplatformdefs.h delete mode 100644 mkspecs/hpux-g++-64/qmake.conf delete mode 100644 mkspecs/hpux-g++-64/qplatformdefs.h delete mode 100644 mkspecs/hpux-g++/qmake.conf delete mode 100644 mkspecs/hpux-g++/qplatformdefs.h delete mode 100644 mkspecs/hpuxi-acc-32/qmake.conf delete mode 100644 mkspecs/hpuxi-acc-32/qplatformdefs.h delete mode 100644 mkspecs/hpuxi-acc-64/qmake.conf delete mode 100644 mkspecs/hpuxi-acc-64/qplatformdefs.h delete mode 100644 src/3rdparty/libpng/scripts/makefile.hpgcc delete mode 100644 src/3rdparty/libpng/scripts/makefile.hpux diff --git a/INSTALL b/INSTALL index e9fdd2da..5b961568 100644 --- a/INSTALL +++ b/INSTALL @@ -34,7 +34,7 @@ the directories where you choose to install Qt. LD_LIBRARY64_PATH variables are used for specifying library search paths. Set the variable that matches your configuration, or see the rld(5) man page for more information. - On AIX set LIBPATH and on HP-UX set SHLIB_PATH instead of LD_LIBRARY_PATH. + On AIX set LIBPATH instead of LD_LIBRARY_PATH. This is done like this: diff --git a/PLATFORMS b/PLATFORMS index 91d1deac..80dfc98e 100644 --- a/PLATFORMS +++ b/PLATFORMS @@ -5,12 +5,28 @@ system and compiler you are using. Supported platforms and compilers: - aix-g++ hpux-g++ linux-g++ solaris-cc-64 win32-g++ - aix-xlc hpux-g++-64 linux-g++-64 solaris-g++ win32-icc - aix-xlc-64 irix-cc linux-icc solaris-g++-64 win32-msvc - freebsd-g++ irix-cc-64 macx-g++ tru64-cxx win32-msvc.net - freebsd-icc irix-g++ macx-pbuilder tru64-g++ - hpux-acc linux-ecc-64 solaris-cc +aix-g++ +aix-xlc +aix-xlc-64 +freebsd-g++ +freebsd-icc +irix-cc +irix-cc-64 +irix-g++ +linux-ecc-64 +linux-g++ +linux-g++-64 +linux-icc +macx-g++ +macx-pbuilder +solaris-cc +solaris-cc-64 +solaris-g++ +solaris-g++-64 +win32-g++ +win32-icc +win32-msvc +win32-msvc.net Example: diff --git a/README.Qt3 b/README.Qt3 index e0da22c8..391f84ba 100644 --- a/README.Qt3 +++ b/README.Qt3 @@ -24,8 +24,6 @@ aix-xlc aix-xlc-64 freebsd-g++ freebsd-icc -hpux-acc -hpux-g++ irix-cc irix-cc-64 irix-g++ diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp index 4700ae62..7b6a4732 100644 --- a/config.tests/unix/ipv6/ipv6test.cpp +++ b/config.tests/unix/ipv6/ipv6test.cpp @@ -1,10 +1,6 @@ /* Sample program for configure to test IPv6 support on target platforms. We check for the required IPv6 data structures. */ -#if defined(__hpux) -#define _HPUX_SOURCE -#endif - #include #include #include diff --git a/config.tests/x11/notype.test b/config.tests/x11/notype.test index 49743dfe..5a1251d6 100755 --- a/config.tests/x11/notype.test +++ b/config.tests/x11/notype.test @@ -13,8 +13,6 @@ OUTDIR=$4 # Xsun on Solaris 2.5.1: # Patches are available for Solaris 2.6, 7, and 8 but # not for Solaris 2.5.1. -# HP-UX: -# Patches are available for HP-UX 10.20, 11.00, and 11.11. # AIX 4.3.3 and AIX 5.1: # Headers are clearly broken on all AIX versions, and we # don't know of any patches. The strange thing is that we @@ -23,7 +21,7 @@ OUTDIR=$4 # work for us with gcc 2.95.2. NOTYPE=no -if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix-g++" -o $XPLATFORM = "aix-g++-64" ]; then +if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "aix-g++" -o $XPLATFORM = "aix-g++-64" ]; then NOTYPE=yes test -d $OUTDIR/config.tests/x11/notype || mkdir -p $OUTDIR/config.tests/x11/notype diff --git a/configure b/configure index d40f9ab0..ddba22fb 100755 --- a/configure +++ b/configure @@ -407,15 +407,6 @@ while [ "$#" -gt 0 ]; do aix-64) PLATFORM=aix-xlc-64 ;; - hpux-o64) - PLATFORM=hpux-acc-o64 - ;; - hpux-n64) - PLATFORM=hpux-acc-64 - ;; - hpux-acc-n64) - PLATFORM=hpux-acc-64 - ;; irix-o32) PLATFORM=irix-cc-o32 ;; @@ -1152,16 +1143,6 @@ if [ -z "$PLATFORM" ]; then - Also available for IRIX: irix-g++ irix-cc-64 " ;; - HP-UX:*) - #PLATFORM=hpux-g++ - PLATFORM=hpux-acc - #PLATFORM=hpux-acc-64 - #PLATFORM=hpux-cc - #PLATFORM=hpux-acc-o64 - PLATFORM_NOTES=" - - Also available for HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64 - " - ;; Linux:*|GNU:*|GNU/*:*) PLATFORM=linux-g++ PLATFORM_NOTES=" @@ -1291,11 +1272,6 @@ else AUTOTHREAD=never fi # common qmake.conf file but dependency on OS version -if [ "$UNAME_SYSTEM" = "HP-UX" ]; then - if echo $UNAME_RELEASE | grep -E "^B\.(09|10)" >/dev/null 2>&1; then - AUTOTHREAD=never - fi -fi if [ "$UNAME_SYSTEM" = "SunOS" ]; then # Solaris 2.5 and 2.6 have libposix4, which was renamed to librt for Solaris >=7 if echo $UNAME_RELEASE | grep "^5\.[5|6]" >/dev/null 2>&1; then @@ -2182,18 +2158,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then [ $NOTYPE = "yes" ] && QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=-fpermissive\"" fi -# find if the compiler supports enough of STL for our purposes -if [ $PLATFORM = "hpux-acc" -a "$CFG_STL" != "no" ]; then - echo - echo "As of aCC A.3.0.30 you may enable STL support in TQt by adding -AA" - echo "to the QMAKE_CXXFLAGS and QMAKE_LFLAGS variables in" - echo "$XQMAKESPEC/qmake.conf" - echo "and re-running configure. Make sure to use the -AA compiler switch" - echo "in all your software projects using TQt as it turns on the new C++" - echo "Standard Library which is not binary compatible with the old one." - echo -fi - if [ "$CFG_ENDIAN" = "auto" ]; then if [ "$PLATFORM_MAC" = "yes" ]; then true diff --git a/doc/abouttqt.doc b/doc/abouttqt.doc index a78e7e01..ffe3da47 100644 --- a/doc/abouttqt.doc +++ b/doc/abouttqt.doc @@ -24,7 +24,7 @@ development. Qt is supported on the following platforms: \list \i MS/Windows -- 95, 98, NT 4.0, ME, 2000, and XP - \i Unix/X11 -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, + \i Unix/X11 -- Linux, Sun Solaris, IBM AIX, SGI IRIX and a wide range of others \i Macintosh -- Mac OS X \endlist diff --git a/doc/faq.doc b/doc/faq.doc index b1024ac7..6a0fb03f 100644 --- a/doc/faq.doc +++ b/doc/faq.doc @@ -24,7 +24,7 @@ Qt is supported on the following platforms: \list \i MS/Windows -- 95, 98, NT 4.0, ME, 2000, and XP - \i Unix/X11 -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, + \i Unix/X11 -- Linux, Sun Solaris, IBM AIX, SGI IRIX and a wide range of others \i Macintosh -- Mac OS X \endlist diff --git a/doc/html/abouttqt.html b/doc/html/abouttqt.html index 2d637e11..a9f0cdb5 100644 --- a/doc/html/abouttqt.html +++ b/doc/html/abouttqt.html @@ -46,7 +46,7 @@ development.

TQt is supported on the following platforms:

  • MS/Windows -- 95, 98, NT 4.0, ME, 2000, and XP -
  • Unix/X11 -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, +
  • Unix/X11 -- Linux, Sun Solaris, IBM AIX, SGI IRIX and a wide range of others
  • Macintosh -- Mac OS X
diff --git a/doc/html/faq.html b/doc/html/faq.html index 7e530faf..f248d400 100644 --- a/doc/html/faq.html +++ b/doc/html/faq.html @@ -161,7 +161,7 @@ extensible, and allows true component programming.

TQt is supported on the following platforms:

  • MS/Windows -- 95, 98, NT 4.0, ME, 2000, and XP -
  • Unix/X11 -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, +
  • Unix/X11 -- Linux, Sun Solaris, IBM AIX, SGI IRIX and a wide range of others
  • Macintosh -- Mac OS X
diff --git a/doc/html/install-x11.html b/doc/html/install-x11.html index 096636db..2ced953c 100644 --- a/doc/html/install-x11.html +++ b/doc/html/install-x11.html @@ -82,7 +82,7 @@ following lines: re-source the profile before continuing, so that at least $TQTDIR is set. The installation will give an error message and not proceed otherwise. -

On AIX set LIBPATH and on HP-UX set SHLIB_PATH instead of LD_LIBRARY_PATH. +

On AIX set LIBPATH instead of LD_LIBRARY_PATH.

Note that the SGI MIPSpro o32 and Sun WorkShop 5.0 targets are no longer supported as of TQt 3.3.

  • Install your license file as $HOME/.qt-license. diff --git a/doc/html/qmake-manual-2.html b/doc/html/qmake-manual-2.html index 42479b9b..404024f9 100644 --- a/doc/html/qmake-manual-2.html +++ b/doc/html/qmake-manual-2.html @@ -37,7 +37,7 @@ body { background: #ffffff; color: black; }

    Before building TQt manually the following environment variables must be set:

    • QMAKESPEC
      This must be set to the platform and compiler combination that you are using on your system.
      For example, if you are using Windows and Microsoft Visual Studio, you would set this environment variable to win32-msvc. If you are using Solaris and g++, you would set this environment variable to solaris-g++.

      The following is a list of environment variables available to choose from when setting QMAKESPEC:

      -

      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

      +

      aix-64 irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ linux-cxx openbsd-g++ solaris-g++ aix-xlc linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ 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 irix-g++ macx-g++ unixware-g irix-n32 solaris-64 unixware7-cc

    • TQTDIR
      This must be set to where TQt is (or will be) installed. For example, c:\qt and \local\qt

    Once the environment variables are set go into the qmake directory, $TQTDIR/qmake, e.g. C:\qt\qmake. Now run make or nmake depending on your compiler.

    When the make has completed, qmake is ready for use.

    diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html index e96c1a4d..4a37f180 100644 --- a/doc/html/tqglobal-h.html +++ b/doc/html/tqglobal-h.html @@ -94,7 +94,6 @@ body { background: #ffffff; color: black; } WIN32 - Win32 (Windows 95/98/ME and Windows NT/2000/XP) CYGWIN - Cygwin SOLARIS - Sun Solaris - HPUX - HP-UX ULTRIX - DEC Ultrix LINUX - Linux FREEBSD - FreeBSD @@ -138,8 +137,6 @@ body { background: #ffffff; color: black; } # define Q_OS_WIN32 #elif defined(__sun) || defined(sun) # define Q_OS_SOLARIS -#elif defined(hpux) || defined(__hpux) -# define Q_OS_HPUX #elif defined(__ultrix) || defined(ultrix) # define Q_OS_ULTRIX #elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__) @@ -224,8 +221,6 @@ body { background: #ffffff; color: black; } SUN - Sun WorkShop, Forte Developer, or Sun ONE Studio C++ MIPS - MIPSpro C++ DEC - DEC C++ - HP - HPUX C++ - HPACC - HPUX ANSI C++ USLC - UDK, and UnixWare 2.X C++ KAI - KAI C++ INTEL - Intel C++ for Linux, Intel C++ for Windows @@ -274,10 +269,6 @@ body { background: #ffffff; color: black; } # if __GNUC__ == 2 && __GNUC_MINOR__ <= 95 # define Q_NO_USING_KEYWORD # endif -/* GCC 3.1 and GCC 3.2 wrongly define _SB_CTYPE_MACROS on HP-UX */ -# if defined(Q_OS_HPUX) && __GNUC__ == 3 && __GNUC_MINOR__ >= 1 -# define Q_WRONG_SB_CTYPE_MACROS -# endif /* ARM gcc pads structs to 32 bits, even when they contain a single char, or short. We tell gcc to pack TQChars to 16 bits, to avoid @@ -410,15 +401,6 @@ body { background: #ffffff; color: black; } # define Q_NO_USING_KEYWORD # endif -#elif defined(Q_OS_HPUX) -/* __HP_aCC was not defined in first aCC releases */ -# if defined(__HP_aCC) || __cplusplus >= 199707L -# define Q_CC_HPACC -# else -# define Q_CC_HP -# endif -# define Q_NO_USING_KEYWORD /* ### check "using" status */ - #else # error "TQt has not been tested with this compiler - talk to qt-bugs@trolltech.com" #endif diff --git a/doc/installation.doc b/doc/installation.doc index d9291b80..584b9b77 100644 --- a/doc/installation.doc +++ b/doc/installation.doc @@ -116,7 +116,7 @@ where you choose to install Qt. is set. The installation will give an error message and not proceed otherwise. - On AIX set LIBPATH and on HP-UX set SHLIB_PATH instead of LD_LIBRARY_PATH. + On AIX set LIBPATH instead of LD_LIBRARY_PATH. Note that the SGI MIPSpro o32 and Sun WorkShop 5.0 targets are no longer supported as of TQt 3.3. diff --git a/examples/demo/i18n/en.po b/examples/demo/i18n/en.po index 2e6ef09b..711d59b5 100644 --- a/examples/demo/i18n/en.po +++ b/examples/demo/i18n/en.po @@ -831,12 +831,12 @@ msgstr "Ignore" msgid "" "

    About Qt

    This program uses TQt version %1, a multiplatform C++ GUI " "toolkit from Trolltech. TQt provides single-source portability across Windows " -"95/98/NT/2000, Mac OS X, Linux, Solaris, HP-UX and many other versions of Unix with X11" +"95/98/NT/2000, Mac OS X, Linux, Solaris and many other versions of Unix with X11" ".

    See http://www.trolltech.com/qt/ for more information.

    " msgstr "" "

    About Qt

    This program uses TQt version %1, a multiplatform C++ GUI " "toolkit from Trolltech. TQt provides single-source portability across Windows " -"95/98/NT/2000, Mac OS X, Linux, Solaris, HP-UX and many other versions of Unix with X11" +"95/98/NT/2000, Mac OS X, Linux, Solaris and many other versions of Unix with X11" ".

    See http://www.trolltech.com/qt/ for more information.

    " #: none:0 diff --git a/examples/demo/i18n/i18n.cpp b/examples/demo/i18n/i18n.cpp index 1e7ca80a..34a506b5 100644 --- a/examples/demo/i18n/i18n.cpp +++ b/examples/demo/i18n/i18n.cpp @@ -134,8 +134,8 @@ void I18nDemo::newSlot(int id) setText(tr("

    About TQt

    " "

    This program uses TQt version %1, a multiplatform C++ " "GUI toolkit from Trolltech. TQt provides single-source " - "portability across Windows 95/98/NT/2000, Mac OS X, Linux, Solaris, " - "HP-UX and many other versions of Unix with X11.

    " + "portability across Windows 95/98/NT/2000, Mac OS X, Linux, Solaris " + "and many other versions of Unix with X11.

    " "

    See http://www.trolltech.com/qt/ for more " "information.

    ").arg(TQT_VERSION_STR)); diff --git a/examples/demo/i18n/ja.po b/examples/demo/i18n/ja.po index e6be082b..2efb210c 100644 --- a/examples/demo/i18n/ja.po +++ b/examples/demo/i18n/ja.po @@ -828,12 +828,12 @@ msgstr "無視" msgid "" "

    About Qt

    This program uses TQt version %1, a multiplatform C++ GUI " "toolkit from Trolltech. TQt provides single-source portability across Windows " -"95/98/NT/2000, Mac OS X, Linux, Solaris, HP-UX and many other versions of Unix with X11" +"95/98/NT/2000, Mac OS X, Linux, Solaris and many other versions of Unix with X11" ".

    See http://www.trolltech.com/qt/ for more information.

    " msgstr "" "

    TQt について

    このプログラムは Trolltech社のマルチ" "プラットフォームC++ GUI ツールキットQt バージョン %1 を" -"使用しています。Qt はWindows 95/98/NT/2000, Mac OS X, Linux, Solaris, HP-UX " +"使用しています。Qt はWindows 95/98/NT/2000, Mac OS X, Linux, Solaris " "他X11とUnixの多くの版でソースコード互換を実現します。<" "/p>

    詳細はhttp://www.trolltech.com/qt/を参照してくださ" "い。

    " diff --git a/examples/demo/i18n/ko.po b/examples/demo/i18n/ko.po index 24e59eae..f29d30cb 100644 --- a/examples/demo/i18n/ko.po +++ b/examples/demo/i18n/ko.po @@ -838,10 +838,10 @@ msgstr "가장 크게" msgid "" "

    About Qt

    This program uses TQt version %1, a multiplatform C++ GUI " "toolkit from Trolltech. TQt provides single-source portability across Windows " -"95/98/NT/2000, Mac OS X, Linux, Solaris, HP-UX and many other versions of Unix with X11" +"95/98/NT/2000, Mac OS X, Linux, Solaris and many other versions of Unix with X11" ".

    See http://www.trolltech.com/qt/ for more information.

    " msgstr "" "

    Qt에 대하여

    이 프로그램은 TQt version %1을 사용합니다, 트롤텍사의 " "다중플렛폼 C++ GUI 툴킷.Qt는 윈도우즈 95/98/NT/2000, X11이 가능한 Mac OS X, Linux, " -"Solaris, HP-UX에이전가능한 싱글소스를 제공합니다.

    좀 더 많은 정보를 " +"Solaris 에이전가능한 싱글소스를 제공합니다.

    좀 더 많은 정보를 " "원하시면 http://www.trolltech.com/qt/을방문해 주시길 바랍니다.

    " diff --git a/examples/demo/i18n/no.po b/examples/demo/i18n/no.po index 47a42375..f7584c5e 100644 --- a/examples/demo/i18n/no.po +++ b/examples/demo/i18n/no.po @@ -830,12 +830,12 @@ msgstr "Ignorer" msgid "" "

    About Qt

    This program uses TQt version %1, a multiplatform C++ GUI " "toolkit from Trolltech. TQt provides single-source portability across Windows " -"95/98/NT/2000, Mac OS X, Linux, Solaris, HP-UX and many other versions of Unix with X11" +"95/98/NT/2000, Mac OS X, Linux, Solaris and many other versions of Unix with X11" ".

    See http://www.trolltech.com/qt/ for more information.

    " msgstr "" "

    Om Qt

    Dette programmet bruker TQt versjon %1, et multiplatform C++ " "GUI-verktøy fra Trolltech. Kode skrevet for TQt gir portabel kode for Windows 9" -"5/98/NT/2000, Mac OS X, Linux, Solaris, HP-UX og mange andre versjoner av Unix med X11." +"5/98/NT/2000, Mac OS X, Linux, Solaris og mange andre versjoner av Unix med X11." "

    Se http://www.trolltech.com/qt/ for mer informasjon.

    " #: none:0 diff --git a/examples/demo/translations/demo.ts b/examples/demo/translations/demo.ts index c662659f..e365b047 100644 --- a/examples/demo/translations/demo.ts +++ b/examples/demo/translations/demo.ts @@ -495,9 +495,9 @@ - <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris, HP-UX and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> + <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> <h3>Über Qt</h3><p>dieses Programm benutzt Qt Version %1, ein plattformunabhängiges C++ GUI toolkit von Trolltech. TQt liefert Portabilität über -Windows 95/98/NT/2000, Linux, Solaris, HP-UX. und viele andere Unix-Derivate mit X11 in einem Quellcode. </p><p>Siehe <tt>http://www.trolltech.com/qt/</tt> für weitere Informationen</p> +Windows 95/98/NT/2000, Linux, Solaris. und viele andere Unix-Derivate mit X11 in einem Quellcode. </p><p>Siehe <tt>http://www.trolltech.com/qt/</tt> für weitere Informationen</p> diff --git a/examples/demo/translations/demo_ar.ts b/examples/demo/translations/demo_ar.ts index b63b22da..bc5c4822 100644 --- a/examples/demo/translations/demo_ar.ts +++ b/examples/demo/translations/demo_ar.ts @@ -683,8 +683,8 @@ --اللّغة-- - <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris, HP-UX and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> - <h3>حول Qt</h3><p>هذا البرنامج يستعمل TQt إصدار %1، طقم أدوات C++ لتطوير البرامج البيانية على جميع المنصّات من شركة ترولتك. TQt توفّر إمكانية حمل نفس المصدر إلى ويندوز95\98\NT\2000 ، لينكس، سولاريس، HP-UX و العديد من الإصدارات الأخرى ليونيكس مع X11. أنظر <tt>http://www.trolltech.com/qt/</tt> للمزيد من المعلومات.</p> + <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> + <h3>حول Qt</h3><p>هذا البرنامج يستعمل TQt إصدار %1، طقم أدوات C++ لتطوير البرامج البيانية على جميع المنصّات من شركة ترولتك. TQt توفّر إمكانية حمل نفس المصدر إلى ويندوز95\98\NT\2000 ، لينكس، سولاريس، و العديد من الإصدارات الأخرى ليونيكس مع X11. أنظر <tt>http://www.trolltech.com/qt/</tt> للمزيد من المعلومات.</p> &New @@ -695,7 +695,7 @@ - <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Mac OS X, Linux, Solaris, HP-UX and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> + <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Mac OS X, Linux, Solaris and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> diff --git a/examples/demo/translations/demo_de.ts b/examples/demo/translations/demo_de.ts index 3c7b2ca5..c5ec3351 100644 --- a/examples/demo/translations/demo_de.ts +++ b/examples/demo/translations/demo_de.ts @@ -496,9 +496,9 @@ - <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris, HP-UX and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> + <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> <h3>Über Qt</h3><p>dieses Programm benutzt Qt Version %1, ein plattformunabhängiges C++ GUI toolkit von Trolltech. TQt liefert Portabilität über -Windows 95/98/NT/2000, Linux, Solaris, HP-UX. und viele andere Unix-Derivate mit X11 in einem Quellcode. </p><p>Siehe <tt>http://www.trolltech.com/qt/</tt> für weitere Informationen</p> +Windows 95/98/NT/2000, Linux, Solaris. und viele andere Unix-Derivate mit X11 in einem Quellcode. </p><p>Siehe <tt>http://www.trolltech.com/qt/</tt> für weitere Informationen</p> diff --git a/examples/demo/translations/demo_es_AR.ts b/examples/demo/translations/demo_es_AR.ts index 21965727..13d0b114 100644 --- a/examples/demo/translations/demo_es_AR.ts +++ b/examples/demo/translations/demo_es_AR.ts @@ -496,7 +496,7 @@ - <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris, HP-UX and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> + <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> diff --git a/examples/demo/translations/demo_fr.ts b/examples/demo/translations/demo_fr.ts index 8e59cae1..8b79768e 100644 --- a/examples/demo/translations/demo_fr.ts +++ b/examples/demo/translations/demo_fr.ts @@ -496,7 +496,7 @@ - <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris, HP-UX and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> + <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> diff --git a/examples/demo/translations/demo_he.ts b/examples/demo/translations/demo_he.ts index 35247dab..bf78a4b9 100644 --- a/examples/demo/translations/demo_he.ts +++ b/examples/demo/translations/demo_he.ts @@ -494,8 +494,8 @@ --שפה-- - <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris, HP-UX and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> - <div dir=rtl><h3>אודות Qt</h3></div><p dir=rtl>תוכנית זו עושה שימוש ב-Qt מרובת פלטפורמות גירסה %1, ערכת כלי ממשק משתמש גרפי ל-++C מ-Qt .Trolltech מספקת ניידות קוד מקור יחיד בין Windows 95/98/NT/2000, Linux, Solaris, HP-UX וגירסאות רבות נוספות של יוניקס עם X11.</p><p dir=rtl>עיין ב-<tt>http://www.trolltech.com/qt/</tt> למידע נוסף.</p> + <h3>About Qt</h3><p>This program uses TQt version %1, a multiplatform C++ GUI toolkit from Trolltech. TQt provides single-source portability across Windows 95/98/NT/2000, Linux, Solaris and many other versions of Unix with X11.</p><p>See <tt>http://www.trolltech.com/qt/</tt> for more information.</p> + <div dir=rtl><h3>אודות Qt</h3></div><p dir=rtl>תוכנית זו עושה שימוש ב-Qt מרובת פלטפורמות גירסה %1, ערכת כלי ממשק משתמש גרפי ל-++C מ-Qt .Trolltech מספקת ניידות קוד מקור יחיד בין Windows 95/98/NT/2000, Linux, Solaris וגירסאות רבות נוספות של יוניקס עם X11.</p><p dir=rtl>עיין ב-<tt>http://www.trolltech.com/qt/</tt> למידע נוסף.</p> diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf deleted file mode 100644 index 4a47ed6e..00000000 --- a/mkspecs/hpux-acc-64/qmake.conf +++ /dev/null @@ -1,125 +0,0 @@ -# -# -# qmake configuration for hpux-n64 -# -# We define _POSIX_C_SOURCE to 199506L when using threads, therefore -# we also need to redefine _HPUX_SOURCE. -# From pthread(3t): -# Some documentation will recommend the use of -D_REENTRANT for -# compilation. While this also functions properly, it is considered -# an obsolescent form. -# See pthread(3t) for more details. -# -# From the "HP aC++ Online Programmer's Guide": -# When +DA2.0W is specified: -# * 64-bit SVR4 Executable and Linking Format (ELF) object files -# are generated for PA-RISC 2.0. -# * The preprocessor predefined macro, __LP64__ is defined. -# * The correct path for 64-bit system and language libraries is -# selected. -# When +DD32 is specified: -# * The size of an int, long, or pointer data type is 32-bits. -# The size of an int data type is 32-bits. The size of a long or -# pointer data type is 64-bits. -# * This is the default, currently equivalent to +DA1.1 architecture. -# When +DD64 is specified: -# * The size of an int data type is 32-bits. The size of a long or -# pointer data type is 64-bits. -# * This is currently equivalent to +DA2.OW architecture. -# * The preprocessor predefined macro, __LP64__ is defined. -# Using +DS to Specify Instruction Scheduling: -# * By default, the compiler performs scheduling tuned for the system -# on which you are compiling, or, if specified, tuned for the setting -# of the +DA option. -# -# From the online "C/HP-UX Reference Manual": -# -Aa -# Enables strict ANSI C compliance. -# -Ae -# Enables ANSI C compliance, HP value-added features (as described -# for +e option), and _HPUX_SOURCE name space macro. It is equivalent -# to -Aa +e -D_HPUX_SOURCE. -# +e -# Enables the following HP value added features while compiling in -# ANSI C mode: sized enum, long long, long pointers, compiler supplied -# defaults for missing arguments to intrinsic calls, and $ in identifier -# HP C extensions. -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl - -QMAKE_CC = cc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Ae +DA2.0W -w -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O +Osize -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = +Z -QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE - -QMAKE_CXX = aCC -QMAKE_CXXFLAGS = -Aa +DA2.0W -w -D__STRICT_ANSI__ -D_HPUX_SOURCE -QMAKE_CXXFLAGS_DEPS = +M -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_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /usr/include/X11R6 -QMAKE_LIBDIR_X11 = /usr/lib/X11R6/pa20_64 -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include -QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 - -QMAKE_LINK = aCC -QMAKE_LINK_SHLIB = aCC -QMAKE_LFLAGS = +DA2.0W -Wl,+s -QMAKE_LFLAGS_RELEASE = -O -QMAKE_LFLAGS_DEBUG = -g -QMAKE_LFLAGS_SHLIB = -b -Wl,-a,shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,+h, -QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,+b, -QMAKE_HPUX_SHLIB = 3 -QMAKE_EXTENSION_SHLIB = sl - -QMAKE_LIBS = -lm -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt -QMAKE_LIBS_QT_THREAD = -ltqt-mt -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt -QMAKE_LIBS_THREAD = -lpthread -QMAKE_LIBS_YACC = -ly - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cqs -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/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h deleted file mode 100644 index eda20ebf..00000000 --- a/mkspecs/hpux-acc-64/qplatformdefs.h +++ /dev/null @@ -1,58 +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 - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// #ifdef __cplusplus -// extern "C" { -// #endif -// getres() is mangled because of missing extern "C" on -// HP-UX 11.x systems missing PHCO_23963 -#include -// #ifdef __cplusplus -// } -// #endif -// Undeclared - at least on HP-UX 10.20. -extern "C" int res_init(); - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T int - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf deleted file mode 100644 index 906092ac..00000000 --- a/mkspecs/hpux-acc-o64/qmake.conf +++ /dev/null @@ -1,124 +0,0 @@ -# -# -# qmake configuration for hpux-o64 -# -# We define _POSIX_C_SOURCE to 199506L when using threads, therefore -# we also need to redefine _HPUX_SOURCE. -# From pthread(3t): -# Some documentation will recommend the use of -D_REENTRANT for -# compilation. While this also functions properly, it is considered -# an obsolescent form. -# See pthread(3t) for more details. -# -# From the "HP aC++ Online Programmer's Guide": -# When +DA2.0W is specified: -# * 64-bit SVR4 Executable and Linking Format (ELF) object files -# are generated for PA-RISC 2.0. -# * The preprocessor predefined macro, __LP64__ is defined. -# * The correct path for 64-bit system and language libraries is -# selected. -# When +DD32 is specified: -# * The size of an int, long, or pointer data type is 32-bits. -# The size of an int data type is 32-bits. The size of a long or -# pointer data type is 64-bits. -# * This is the default, currently equivalent to +DA1.1 architecture. -# When +DD64 is specified: -# * The size of an int data type is 32-bits. The size of a long or -# pointer data type is 64-bits. -# * This is currently equivalent to +DA2.OW architecture. -# * The preprocessor predefined macro, __LP64__ is defined. -# Using +DS to Specify Instruction Scheduling: -# * By default, the compiler performs scheduling tuned for the system -# on which you are compiling, or, if specified, tuned for the setting -# of the +DA option. -# -# From the online "C/HP-UX Reference Manual": -# -Aa -# Enables strict ANSI C compliance. -# -Ae -# Enables ANSI C compliance, HP value-added features (as described -# for +e option), and _HPUX_SOURCE name space macro. It is equivalent -# to -Aa +e -D_HPUX_SOURCE. -# +e -# Enables the following HP value added features while compiling in -# ANSI C mode: sized enum, long long, long pointers, compiler supplied -# defaults for missing arguments to intrinsic calls, and $ in identifier -# HP C extensions. -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl - -QMAKE_CC = cc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Ae +DA2.0 -w -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = -O +Oentrysched +Onolimit -QMAKE_CFLAGS_DEBUG = -y -g -QMAKE_CFLAGS_SHLIB = +Z -QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE - -QMAKE_CXX = aCC -QMAKE_CXXFLAGS = +DA2.0 -w -D__STRICT_ANSI__ -D_HPUX_SOURCE -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 = -g -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /usr/include/X11R6 -QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include -QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib - -QMAKE_LINK = aCC -QMAKE_LINK_SHLIB = aCC -QMAKE_LFLAGS = +DA2.0 -Wl,+s -QMAKE_LFLAGS_RELEASE = -O -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -b -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,+h, -QMAKE_RPATH = -Wl,+b, -QMAKE_HPUX_SHLIB = 2 -QMAKE_EXTENSION_SHLIB = sl - -QMAKE_LIBS = -lm -QMAKE_LIBS_DYNLOAD = -ldld -QMAKE_LIBS_X11 = -lXext -lX11 -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt -QMAKE_LIBS_QT_THREAD = -ltqt-mt - -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_LIBS_THREAD = -lpthread -QMAKE_LIBS_YACC = -ly - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cqs -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/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h deleted file mode 100644 index 37c59cc1..00000000 --- a/mkspecs/hpux-acc-o64/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 - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include -#define QT_HPUX_LD -#define TQT_NO_LIBRARY_UNLOAD - -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// #ifdef __cplusplus -// extern "C" { -// #endif -// getres() is mangled because of missing extern "C" on -// HP-UX 11.x systems missing PHCO_23963 -#include -// #ifdef __cplusplus -// } -// #endif -// Undeclared - at least on HP-UX 10.20. -extern "C" int res_init(); - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T int - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf deleted file mode 100644 index d9ca7fe9..00000000 --- a/mkspecs/hpux-acc/qmake.conf +++ /dev/null @@ -1,104 +0,0 @@ -# -# -# qmake configuration for hpux-acc -# -# We define _POSIX_C_SOURCE to 199506L when using threads, therefore -# we also need to redefine _HPUX_SOURCE. See pthread(3t) for more details. -# -# From the "HP aC++ Online Programmer's Guide": -# Using +DS to Specify Instruction Scheduling: -# * By default, the compiler performs scheduling tuned for the system -# on which you are compiling, or, if specified, tuned for the setting -# of the +DA option. -# -# From the online "C/HP-UX Reference Manual": -# -Aa -# Enables strict ANSI C compliance. -# -Ae -# Enables ANSI C compliance, HP value-added features (as described -# for +e option), and _HPUX_SOURCE name space macro. It is equivalent -# to -Aa +e -D_HPUX_SOURCE. -# +e -# Enables the following HP value added features while compiling in -# ANSI C mode: sized enum, long long, long pointers, compiler supplied -# defaults for missing arguments to intrinsic calls, and $ in identifier -# HP C extensions. -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl - -QMAKE_CC = cc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Ae +DAportable -w -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = +Z -QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE - -QMAKE_CXX = aCC -QMAKE_CXXFLAGS = +DAportable -w -D__STRICT_ANSI__ -D_HPUX_SOURCE -QMAKE_CXXFLAGS_DEPS = +M -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_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /usr/include/X11R6 -QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include -QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib - -QMAKE_LINK = aCC -QMAKE_LINK_SHLIB = aCC -QMAKE_LFLAGS = +DAportable -Wl,+s -QMAKE_LFLAGS_RELEASE = -O -QMAKE_LFLAGS_DEBUG = -g -QMAKE_LFLAGS_SHLIB = -b -Wl,-a,shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,+h, -QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,+b, -QMAKE_HPUX_SHLIB = 1 -QMAKE_EXTENSION_SHLIB = sl - -QMAKE_LIBS = -lm -QMAKE_LIBS_DYNLOAD = -ldld -QMAKE_LIBS_X11 = -lXext -lX11 -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt -QMAKE_LIBS_QT_THREAD = -ltqt-mt -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXt -QMAKE_LIBS_OPENGL_QT = -lGL -lXt -QMAKE_LIBS_THREAD = -lpthread -QMAKE_LIBS_YACC = -ly - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cqs -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/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h deleted file mode 100644 index ae371c99..00000000 --- a/mkspecs/hpux-acc/qplatformdefs.h +++ /dev/null @@ -1,68 +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 - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include -#define QT_HPUX_LD -#define TQT_NO_LIBRARY_UNLOAD - -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// #ifdef __cplusplus -// extern "C" { -// #endif -// getres() is mangled because of missing extern "C" on -// HP-UX 11.x systems missing PHCO_23963 -#include -// #ifdef __cplusplus -// } -// #endif -// Undeclared - at least on HP-UX 10.20. -extern "C" int res_init(); - -#define TQT_NO_LIBRARY_UNLOAD - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T int - -// presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher -#if !defined(_XOPEN_UNIX) -// HP-UX 9's select() didn't accept fd_set, yet. -#define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e)) -#endif - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf deleted file mode 100644 index 0f217e45..00000000 --- a/mkspecs/hpux-cc/qmake.conf +++ /dev/null @@ -1,99 +0,0 @@ -# -# -# qmake configuration for hpux-cc -# -# We define _POSIX_C_SOURCE to 199506L when using threads, therefore -# we also need to redefine _HPUX_SOURCE. -# See pthread(3t) for more details. -# -# From the "HP aC++ Online Programmer's Guide": -# Using +DS to Specify Instruction Scheduling: -# * By default, the compiler performs scheduling tuned for the system -# on which you are compiling, or, if specified, tuned for the setting -# of the +DA option. -# -# From the online "C/HP-UX Reference Manual": -# -Aa -# Enables strict ANSI C compliance. -# -Ae -# Enables ANSI C compliance, HP value-added features (as described -# for +e option), and _HPUX_SOURCE name space macro. It is equivalent -# to -Aa +e -D_HPUX_SOURCE. -# +e -# Enables the following HP value added features while compiling in -# ANSI C mode: sized enum, long long, long pointers, compiler supplied -# defaults for missing arguments to intrinsic calls, and $ in identifier -# HP C extensions. -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl - -QMAKE_CC = cc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -Ae +DA1.1e -w -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = -O -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = +Z -QMAKE_CFLAGS_YACC = - -QMAKE_CXX = CC -QMAKE_CXXFLAGS = +DA1.1e -w +a1 -D_HPUX_SOURCE -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/include/X11R6 -QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include -QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib - -QMAKE_LINK = CC -QMAKE_LINK_SHLIB = CC -# CC generates template code during linking, and so needs -I's -QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_TQT -QMAKE_LFLAGS_RELEASE = -O -s -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -b -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,+h, -QMAKE_RPATH = -Wl,+b, -QMAKE_HPUX_SHLIB = 1 - -QMAKE_LIBS = -lm -QMAKE_LIBS_DYNLOAD = -ldld -QMAKE_LIBS_X11 = -lXext -lX11 -QMAKE_LIBS_X11SM = -lSM -lICE -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 cqs -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/hpux-cc/qplatformdefs.h b/mkspecs/hpux-cc/qplatformdefs.h deleted file mode 100644 index 7c6408fb..00000000 --- a/mkspecs/hpux-cc/qplatformdefs.h +++ /dev/null @@ -1,57 +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 - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include -#define QT_HPUX_LD -#define TQT_NO_LIBRARY_UNLOAD - -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -#include -// Undeclared - at least on HP-UX 10.20. -extern "C" int res_init(); - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T int - -// presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher -#if !defined(_XOPEN_UNIX) -// HP-UX 9's select() didn't accept fd_set, yet. -#define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e)) -#endif - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf deleted file mode 100644 index 519ad3bb..00000000 --- a/mkspecs/hpux-g++-64/qmake.conf +++ /dev/null @@ -1,85 +0,0 @@ -# -# -# qmake configuration for hpux-g++-64 -# -# We define _POSIX_C_SOURCE to 199506L when using threads, -# therefore we also need to redefine _HPUX_SOURCE. -# - -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_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE - -QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -D_HPUX_SOURCE -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_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /usr/include/X11R6 -QMAKE_LIBDIR_X11 = /usr/lib/X11R6/pa20_64 -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = /opt/Mesa/include /usr/contrib/X11R6/include -QMAKE_LIBDIR_OPENGL = /opt/Mesa/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64 - -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = -Wl,+s -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -fPIC -shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,+h, -QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,+b, -QMAKE_HPUX_SHLIB = 3 -QMAKE_EXTENSION_SHLIB = sl - -QMAKE_LIBS = -lm -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_LIBS_THREAD = -lpthread -QMAKE_LIBS_YACC = -ly - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cqs -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/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h deleted file mode 100644 index eda20ebf..00000000 --- a/mkspecs/hpux-g++-64/qplatformdefs.h +++ /dev/null @@ -1,58 +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 - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// #ifdef __cplusplus -// extern "C" { -// #endif -// getres() is mangled because of missing extern "C" on -// HP-UX 11.x systems missing PHCO_23963 -#include -// #ifdef __cplusplus -// } -// #endif -// Undeclared - at least on HP-UX 10.20. -extern "C" int res_init(); - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T int - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf deleted file mode 100644 index bd08469f..00000000 --- a/mkspecs/hpux-g++/qmake.conf +++ /dev/null @@ -1,86 +0,0 @@ -# -# -# qmake configuration for hpux-g++ -# -# We define _POSIX_C_SOURCE to 199506L when using threads, -# therefore we also need to redefine _HPUX_SOURCE. -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl plugin_no_soname - -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_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE - -QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -D_HPUX_SOURCE -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_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = /usr/lib/X11R6 -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = /opt/Mesa/include /usr/contrib/X11R6/include -QMAKE_LIBDIR_OPENGL = /opt/Mesa/lib /usr/contrib/X11R6/lib - -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = -Wl,+s -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -fPIC -shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,+h, -QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = -Wl,+b, -QMAKE_HPUX_SHLIB = 1 -QMAKE_EXTENSION_SHLIB = sl - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -ldld -QMAKE_LIBS_X11 = -lXext -lX11 -lm -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt -QMAKE_LIBS_QT_THREAD = -ltqt-mt -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_LIBS_THREAD = -lpthread -QMAKE_LIBS_YACC = -ly - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cqs -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/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h deleted file mode 100644 index 035d27ed..00000000 --- a/mkspecs/hpux-g++/qplatformdefs.h +++ /dev/null @@ -1,66 +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 - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include -#define QT_HPUX_LD -#define TQT_NO_LIBRARY_UNLOAD - -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// #ifdef __cplusplus -// extern "C" { -// #endif -// getres() is mangled because of missing extern "C" on -// HP-UX 11.x systems missing PHCO_23963 -#include -// #ifdef __cplusplus -// } -// #endif -// Undeclared - at least on HP-UX 10.20. -extern "C" int res_init(); - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T int - -// presence of _XOPEN_UNIX can be used to detect HP-UX 10 or higher -#if !defined(_XOPEN_UNIX) -// HP-UX 9's select() didn't accept fd_set, yet. -#define select(a,b,c,d,e) select((a), (int *)(b), (int *)(c), (int *)(d), (e)) -#endif - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf deleted file mode 100644 index dcb21300..00000000 --- a/mkspecs/hpuxi-acc-32/qmake.conf +++ /dev/null @@ -1,123 +0,0 @@ -# -# -# qmake configuration for hpuxi-acc-32 -# -# We define _POSIX_C_SOURCE to 199506L when using threads, therefore -# we also need to redefine _HPUX_SOURCE. -# From pthread(3t): -# Some documentation will recommend the use of -D_REENTRANT for -# compilation. While this also functions properly, it is considered -# an obsolescent form. -# See pthread(3t) for more details. -# -# From the "HP aC++ Online Programmer's Guide": -# When +DA2.0W is specified: -# * 64-bit SVR4 Executable and Linking Format (ELF) object files -# are generated for PA-RISC 2.0. -# * The preprocessor predefined macro, __LP64__ is defined. -# * The correct path for 64-bit system and language libraries is -# selected. -# When +DD32 is specified: -# * The size of an int, long, or pointer data type is 32-bits. -# The size of an int data type is 32-bits. The size of a long or -# pointer data type is 64-bits. -# * This is the default, currently equivalent to +DA1.1 architecture. -# When +DD64 is specified: -# * The size of an int data type is 32-bits. The size of a long or -# pointer data type is 64-bits. -# * This is currently equivalent to +DA2.OW architecture. -# * The preprocessor predefined macro, __LP64__ is defined. -# Using +DS to Specify Instruction Scheduling: -# * By default, the compiler performs scheduling tuned for the system -# on which you are compiling, or, if specified, tuned for the setting -# of the +DA option. -# -# From the online "C/HP-UX Reference Manual": -# -Aa -# Enables strict ANSI C compliance. -# -Ae -# Enables ANSI C compliance, HP value-added features (as described -# for +e option), and _HPUX_SOURCE name space macro. It is equivalent -# to -Aa +e -D_HPUX_SOURCE. -# +e -# Enables the following HP value added features while compiling in -# ANSI C mode: sized enum, long long, long pointers, compiler supplied -# defaults for missing arguments to intrinsic calls, and $ in identifier -# HP C extensions. -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release plugin_no_soname - -QMAKE_CC = cc -QMAKE_LEX = lex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +DD32 +DSitanium -w -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = +O2 +Osize -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = +Z -QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE - -QMAKE_CXX = aCC -QMAKE_CXXFLAGS = +DD32 +DSitanium -w -D__STRICT_ANSI__ -D_HPUX_SOURCE -QMAKE_CXXFLAGS_DEPS = +M -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_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /usr/include/X11R6 -QMAKE_LIBDIR_X11 = /usr/lib/hpux32/X11R6 -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include -QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib/hpux32 /usr/contrib/X11R6/lib/hpux32 - -QMAKE_LINK = aCC -QMAKE_LINK_SHLIB = aCC -QMAKE_LFLAGS = +DD32 +DSitanium -Wl,+s -QMAKE_LFLAGS_RELEASE = +O2 -QMAKE_LFLAGS_DEBUG = -g -QMAKE_LFLAGS_SHLIB = -b -Wl,-a,shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,+h, -QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = - -QMAKE_LIBS = -lm -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt -QMAKE_LIBS_QT_THREAD = -ltqt-mt -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt -QMAKE_LIBS_THREAD = -lpthread -QMAKE_LIBS_YACC = -ly - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cqs -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/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h deleted file mode 100644 index 37c59cc1..00000000 --- a/mkspecs/hpuxi-acc-32/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 - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include -#define QT_HPUX_LD -#define TQT_NO_LIBRARY_UNLOAD - -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// #ifdef __cplusplus -// extern "C" { -// #endif -// getres() is mangled because of missing extern "C" on -// HP-UX 11.x systems missing PHCO_23963 -#include -// #ifdef __cplusplus -// } -// #endif -// Undeclared - at least on HP-UX 10.20. -extern "C" int res_init(); - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T int - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf deleted file mode 100644 index c5e913c1..00000000 --- a/mkspecs/hpuxi-acc-64/qmake.conf +++ /dev/null @@ -1,123 +0,0 @@ -# -# -# qmake configuration for hpuxi-acc-64 -# -# We define _POSIX_C_SOURCE to 199506L when using threads, therefore -# we also need to redefine _HPUX_SOURCE. -# From pthread(3t): -# Some documentation will recommend the use of -D_REENTRANT for -# compilation. While this also functions properly, it is considered -# an obsolescent form. -# See pthread(3t) for more details. -# -# From the "HP aC++ Online Programmer's Guide": -# When +DA2.0W is specified: -# * 64-bit SVR4 Executable and Linking Format (ELF) object files -# are generated for PA-RISC 2.0. -# * The preprocessor predefined macro, __LP64__ is defined. -# * The correct path for 64-bit system and language libraries is -# selected. -# When +DD32 is specified: -# * The size of an int, long, or pointer data type is 32-bits. -# The size of an int data type is 32-bits. The size of a long or -# pointer data type is 64-bits. -# * This is the default, currently equivalent to +DA1.1 architecture. -# When +DD64 is specified: -# * The size of an int data type is 32-bits. The size of a long or -# pointer data type is 64-bits. -# * This is currently equivalent to +DA2.OW architecture. -# * The preprocessor predefined macro, __LP64__ is defined. -# Using +DS to Specify Instruction Scheduling: -# * By default, the compiler performs scheduling tuned for the system -# on which you are compiling, or, if specified, tuned for the setting -# of the +DA option. -# -# From the online "C/HP-UX Reference Manual": -# -Aa -# Enables strict ANSI C compliance. -# -Ae -# Enables ANSI C compliance, HP value-added features (as described -# for +e option), and _HPUX_SOURCE name space macro. It is equivalent -# to -Aa +e -D_HPUX_SOURCE. -# +e -# Enables the following HP value added features while compiling in -# ANSI C mode: sized enum, long long, long pointers, compiler supplied -# defaults for missing arguments to intrinsic calls, and $ in identifier -# HP C extensions. -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release plugin_no_soname - -QMAKE_CC = cc -QMAKE_LEX = lex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +DD64 +DSitanium -w -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = +O2 +Osize -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = +Z -QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_THREAD = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE - -QMAKE_CXX = aCC -QMAKE_CXXFLAGS = +DD64 +DSitanium -w -D__STRICT_ANSI__ -D_HPUX_SOURCE -QMAKE_CXXFLAGS_DEPS = +M -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_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /usr/include/X11R6 -QMAKE_LIBDIR_X11 = /usr/lib/hpux64/X11R6 -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include -QMAKE_LIBDIR_OPENGL = /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64 - -QMAKE_LINK = aCC -QMAKE_LINK_SHLIB = aCC -QMAKE_LFLAGS = +DD64 +DSitanium -Wl,+s -QMAKE_LFLAGS_RELEASE = +O2 -QMAKE_LFLAGS_DEBUG = -g -QMAKE_LFLAGS_SHLIB = -b -Wl,-a,shared_archive -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -Wl,+h, -QMAKE_LFLAGS_THREAD = -QMAKE_RPATH = - -QMAKE_LIBS = -lm -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt -QMAKE_LIBS_QT_THREAD = -ltqt-mt -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt -QMAKE_LIBS_THREAD = -lpthread -QMAKE_LIBS_YACC = -ly - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cqs -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/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h deleted file mode 100644 index 37c59cc1..00000000 --- a/mkspecs/hpuxi-acc-64/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 - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include -#endif - -#include -#include -#include -#include -#include -#include -#define QT_HPUX_LD -#define TQT_NO_LIBRARY_UNLOAD - -#include -#include -#include -#include -#include -#include -#include -#include - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// #ifdef __cplusplus -// extern "C" { -// #endif -// getres() is mangled because of missing extern "C" on -// HP-UX 11.x systems missing PHCO_23963 -#include -// #ifdef __cplusplus -// } -// #endif -// Undeclared - at least on HP-UX 10.20. -extern "C" int res_init(); - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T int - - -#endif // TQPLATFORMDEFS_H diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf index 1126bd46..7a1569f1 100644 --- a/qmake/book/qmake-install.leaf +++ b/qmake/book/qmake-install.leaf @@ -22,14 +22,35 @@ g++, you would set this environment variable to \e solaris-g++. The following is a list of environment variables available to choose from when setting QMAKESPEC: -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 -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 - irix-n32 solaris-64 unixware7-cc +aix-64 +aix-g++ +aix-xlc +bsdi-g++ +freebsd-g++ +hurd-g++ +irix-032 +irix-64 +irix-g++ +irix-n32 +linux-cxx +linux-g++ +linux-icc +linux-kcc +macx-g++ +macx-pbuilder +netbsd-g++ +openbsd-g++ +openunix-cc +qnx-g++ +solaris-64 +solaris-cc +solaris-g++ +unixware-g +unixware7-cc +unixware7-g++ +win32-g++ +win32-msvc +win32-watc \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/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 405c0faf..4da39740 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -806,10 +806,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t) } if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") && project->isEmpty("QMAKE_OPENBSD_SHLIBS") ) { if ( !project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin") ) { - if ( project->isEmpty("QMAKE_HPUX_SHLIB") ) { - links << "$(TARGET0)" << "$(TARGET1)" << "$(TARGET2)"; - } else { - links << "$(TARGET0)"; + links << "$(TARGET0)" << "$(TARGET1)" << "$(TARGET2)"; } } } diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 1efcb3d7..c7d16052 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -299,19 +299,14 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) t << "TARGETD = " << var("TARGET") << endl; } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) { t << "TARGETA = " << var("TARGETA") << endl; - if (project->isEmpty("QMAKE_HPUX_SHLIB")) { - if (!project->isEmpty("QMAKE_OPENBSD_SHLIBS")) { - t << "LIB"+var("OBSD_TARGET_NAME")+"_VERSION = " << var("OBSD_TARGET_VERSION") << endl; - t << "TARGETD = " << var("TARGET_x.y") << endl; - } else { - t << "TARGETD = " << var("TARGET_x.y.z") << endl; - t << "TARGET0 = " << var("TARGET_") << endl; - t << "TARGET1 = " << var("TARGET_x") << endl; - t << "TARGET2 = " << var("TARGET_x.y") << endl; - } + if (!project->isEmpty("QMAKE_OPENBSD_SHLIBS")) { + t << "LIB"+var("OBSD_TARGET_NAME")+"_VERSION = " << var("OBSD_TARGET_VERSION") << endl; + t << "TARGETD = " << var("TARGET_x.y") << endl; } else { - t << "TARGETD = " << var("TARGET_x") << endl; + t << "TARGETD = " << var("TARGET_x.y.z") << endl; t << "TARGET0 = " << var("TARGET_") << endl; + t << "TARGET1 = " << var("TARGET_x") << endl; + t << "TARGET2 = " << var("TARGET_x.y") << endl; } } writeExtraVariables(t); @@ -572,7 +567,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) if(!project->isEmpty("QMAKE_POST_LINK")) t << "\n\t" << var("QMAKE_POST_LINK") << "\n\t"; t << endl << endl; - } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) { + } else { t << "\n\t" << "-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)" << "\n\t" << var("QMAKE_LINK_SHLIB_CMD") << "\n\t"; @@ -589,19 +584,6 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) if(!project->isEmpty("QMAKE_POST_LINK")) t << "\n\t" << var("QMAKE_POST_LINK"); t << endl << endl; - } else { - t << "\n\t" - << "-$(DEL_FILE) $(TARGET) $(TARGET0)" << "\n\t" - << var("QMAKE_LINK_SHLIB_CMD") << "\n\t"; - t << varGlue("QMAKE_LN_SHLIB",""," "," $(TARGET) $(TARGET0)"); - if(!destdir.isEmpty()) - t << "\n\t" - << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)\n\t" - << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET0)\n\t" - << "-$(MOVE) $(TARGET) $(TARGET0) " << var("DESTDIR"); - if(!project->isEmpty("QMAKE_POST_LINK")) - t << "\n\t" << var("QMAKE_POST_LINK"); - t << endl << endl; } t << endl << endl; @@ -1245,15 +1227,6 @@ void UnixMakefileGenerator::init2() project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"]; if(project->isActiveConfig("qt")) project->variables()["DEFINES"].append("QT_PLUGIN"); - } else if ( !project->isEmpty("QMAKE_HPUX_SHLIB") ) { - project->variables()["TARGET_"].append("lib" + project->first("TARGET") + ".sl"); - if(project->isActiveConfig("lib_version_first")) - project->variables()["TARGET_x"].append("lib" + project->first("VER_MAJ") + "." + - project->first("TARGET")); - else - project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." + - project->first("VER_MAJ")); - project->variables()["TARGET"] = project->variables()["TARGET_x"]; } else if ( !project->isEmpty("QMAKE_AIX_SHLIB") ) { project->variables()["TARGET_"].append("lib" + project->first("TARGET") + ".a"); if(project->isActiveConfig("lib_version_first")) { @@ -1450,9 +1423,8 @@ UnixMakefileGenerator::writeLibtoolFile() if(project->isActiveConfig("plugin")) { t << var("TARGET"); } else { - if (project->isEmpty("QMAKE_HPUX_SHLIB")) - t << var("TARGET_x.y.z") << " " << var("TARGET_x.y") << " "; - t << var("TARGET_x") << " " << var("TARGET_"); + t << var("TARGET_x.y.z") << " " << var("TARGET_x.y") << " "; + t << var("TARGET_x") << " " << var("TARGET_"); } t << "'\n\n"; diff --git a/src/3rdparty/libmng/acinclude.m4 b/src/3rdparty/libmng/acinclude.m4 index 60506df3..f3cb3c95 100644 --- a/src/3rdparty/libmng/acinclude.m4 +++ b/src/3rdparty/libmng/acinclude.m4 @@ -61,14 +61,14 @@ AC_DEFUN(AC_SYS_LARGEFILE, [Number of bits in a file offset, on hosts where this is settable.]) AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, ac_cv_sys_largefile_source, - [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).], + [Define to make ftello visible on some hosts.], [#include ], [return !ftello;]) AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files, [Define for large files, on AIX-style hosts.]) AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500, ac_cv_sys_xopen_source, - [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).], + [Define to make ftello visible on some hosts.], [#include ], [return !ftello;]) fi ]) diff --git a/src/3rdparty/libmng/aclocal.m4 b/src/3rdparty/libmng/aclocal.m4 index f7667191..a0f9e41a 100644 --- a/src/3rdparty/libmng/aclocal.m4 +++ b/src/3rdparty/libmng/aclocal.m4 @@ -73,14 +73,14 @@ AC_DEFUN(AC_SYS_LARGEFILE, [Number of bits in a file offset, on hosts where this is settable.]) AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, ac_cv_sys_largefile_source, - [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).], + [Define to make ftello visible on some hosts.], [#include ], [return !ftello;]) AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files, [Define for large files, on AIX-style hosts.]) AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500, ac_cv_sys_xopen_source, - [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).], + [Define to make ftello visible on some hosts.], [#include ], [return !ftello;]) fi ]) @@ -246,7 +246,7 @@ AC_DEFUN([AM_PROG_CC_STDC], [AC_REQUIRE([AC_PROG_CC]) AC_BEFORE([$0], [AC_C_INLINE]) AC_BEFORE([$0], [AC_C_CONST]) -dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require +dnl Force this before AC_PROG_CPP. Some cpp's require dnl a magic option to avoid problems with ANSI preprocessor commands dnl like #elif. dnl FIXME: can't do this because then AC_AIX won't work due to a @@ -259,9 +259,8 @@ ac_save_CC="$CC" # Don't try gcc -ansi; that turns off useful extensions and # breaks some systems' header files. # AIX -qlanglvl=ansi -# HP-UX -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in "" -qlanglvl=ansi -std1 "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" AC_TRY_COMPILE( @@ -488,10 +487,6 @@ aix*) cygwin* | mingw* | pw32*) symcode='[[ABCDGISTW]]' ;; -hpux*) # Its linker distinguishes data from code symbols - lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; irix*) symcode='[[BCDEGRST]]' ;; @@ -693,10 +688,6 @@ EOF exit 0 fi -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it @@ -1171,13 +1162,6 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, fi ;; - hpux9* | hpux10* | hpux11*) - # Is there a better lt_cv_prog_cc_static that works with the bundled CC? - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" - lt_cv_prog_cc_pic='+Z' - ;; - irix5* | irix6*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' @@ -1247,16 +1231,6 @@ else CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" AC_TRY_COMPILE([], [], [dnl case $host_os in - hpux9* | hpux10* | hpux11*) - # On HP-UX, both CC and GCC only warn that PIC is supported... then - # they create non-PIC objects. So, if there were any warnings, we - # assume that PIC is not supported. - if test -s conftest.err; then - lt_cv_prog_cc_pic_works=no - else - lt_cv_prog_cc_pic_works=yes - fi - ;; *) lt_cv_prog_cc_pic_works=yes ;; @@ -1857,19 +1831,6 @@ else hardcode_shlibpath_var=no ;; - hpux9* | hpux10* | hpux11*) - case $host_os in - hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; - esac - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_minus_L=yes # Not in the search PATH, but as the default - # location of the library. - export_dynamic_flag_spec='${wl}-E' - ;; - 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' @@ -2283,21 +2244,6 @@ gnu*) hardcode_into_libs=yes ;; -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' - soname_spec='${libname}${release}.sl$major' - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - irix5* | irix6*) version_type=irix need_lib_prefix=no @@ -2649,10 +2595,6 @@ if test -f "$ltmain"; then # Sed that helps us avoid accidentally triggering echo(1) options like -n. Xsed="sed -e s/^X//" -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - # ### BEGIN LIBTOOL CONFIG # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: @@ -3477,12 +3419,6 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; -hpux10.20*|hpux11*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - irix5* | irix6*) case $host_os in irix5*) @@ -3591,13 +3527,10 @@ else tmp_nm=$ac_dir/${ac_tool_prefix}nm if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then + if ($tmp_nm -B /dev/null 2>&1; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then lt_cv_path_NM="$tmp_nm -B" break - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then + elif ($tmp_nm -p /dev/null 2>&1; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" break else diff --git a/src/3rdparty/libmng/config.guess b/src/3rdparty/libmng/config.guess index 44b51774..1c66e983 100755 --- a/src/3rdparty/libmng/config.guess +++ b/src/3rdparty/libmng/config.guess @@ -455,74 +455,6 @@ EOF hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 exit 0 ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - case "${HPUX_REV}" in - 11.[0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - esac ;; - esac - fi ;; - esac - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; - esac - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -1028,7 +960,7 @@ main () printf ("arm-acorn-riscix"); exit (0); #endif -#if defined (hp300) && !defined (hpux) +#if defined (hp300) printf ("m68k-hp-bsd\n"); exit (0); #endif diff --git a/src/3rdparty/libmng/config.sub b/src/3rdparty/libmng/config.sub index 20a53902..c23cdec3 100755 --- a/src/3rdparty/libmng/config.sub +++ b/src/3rdparty/libmng/config.sub @@ -470,10 +470,6 @@ case $basic_machine in basic_machine=m68k-hp os=-bsd ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) basic_machine=hppa1.0-hp ;; @@ -1025,7 +1021,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* | -solaris* | -sym* \ + | -unos* | -luna* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1210,9 +1206,6 @@ case $basic_machine in *-oki) os=-proelf ;; - *-hp) - os=-hpux - ;; *-hitachi) os=-hiux ;; @@ -1306,9 +1299,6 @@ case $basic_machine in -beos*) vendor=be ;; - -hpux*) - vendor=hp - ;; -mpeix*) vendor=hp ;; diff --git a/src/3rdparty/libmng/configure b/src/3rdparty/libmng/configure index 162ef6a1..8cc3b336 100755 --- a/src/3rdparty/libmng/configure +++ b/src/3rdparty/libmng/configure @@ -66,10 +66,6 @@ EOF exit 0 fi -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it @@ -1248,9 +1244,8 @@ ac_save_CC="$CC" # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix -std1 -# HP-UX -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in "" -qlanglvl=ansi -std1 "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext <&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then + if ($tmp_nm -B /dev/null 2>&1; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then lt_cv_path_NM="$tmp_nm -B" break - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then + elif ($tmp_nm -p /dev/null 2>&1; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" break else @@ -1984,12 +1976,6 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; -hpux10.20*|hpux11*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - irix5* | irix6*) case $host_os in irix5*) @@ -2183,10 +2169,6 @@ aix*) cygwin* | mingw* | pw32*) symcode='[ABCDGISTW]' ;; -hpux*) # Its linker distinguishes data from code symbols - lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; irix*) symcode='[BCDEGRST]' ;; @@ -2864,13 +2846,6 @@ else fi ;; - hpux9* | hpux10* | hpux11*) - # Is there a better lt_cv_prog_cc_static that works with the bundled CC? - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive" - lt_cv_prog_cc_pic='+Z' - ;; - irix5* | irix6*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' @@ -2954,16 +2929,6 @@ EOF if { (eval echo configure:3031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* case $host_os in - hpux9* | hpux10* | hpux11*) - # On HP-UX, both CC and GCC only warn that PIC is supported... then - # they create non-PIC objects. So, if there were any warnings, we - # assume that PIC is not supported. - if test -s conftest.err; then - lt_cv_prog_cc_pic_works=no - else - lt_cv_prog_cc_pic_works=yes - fi - ;; *) lt_cv_prog_cc_pic_works=yes ;; @@ -3635,19 +3600,6 @@ else hardcode_shlibpath_var=no ;; - hpux9* | hpux10* | hpux11*) - case $host_os in - hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;; - *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;; - esac - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_minus_L=yes # Not in the search PATH, but as the default - # location of the library. - export_dynamic_flag_spec='${wl}-E' - ;; - 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' @@ -4064,21 +4016,6 @@ gnu*) hardcode_into_libs=yes ;; -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - dynamic_linker="$host_os dld.sl" - version_type=sunos - need_lib_prefix=no - need_version=no - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl' - soname_spec='${libname}${release}.sl$major' - # HP-UX runs *really* slowly unless shared libraries are mode 555. - postinstall_cmds='chmod 555 $lib' - ;; - irix5* | irix6*) version_type=irix need_lib_prefix=no @@ -4943,10 +4880,6 @@ if test -f "$ltmain"; then # Sed that helps us avoid accidentally triggering echo(1) options like -n. Xsed="sed -e s/^X//" -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi - # ### BEGIN LIBTOOL CONFIG # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: @@ -6649,7 +6582,7 @@ EOF cat >> $CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on HP-UX. +# small command number limits. ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. ac_file=1 # Number of current file. ac_beg=1 # First line for current file. diff --git a/src/3rdparty/libmng/ltmain.sh b/src/3rdparty/libmng/ltmain.sh index 3b0d7b2b..24455486 100644 --- a/src/3rdparty/libmng/ltmain.sh +++ b/src/3rdparty/libmng/ltmain.sh @@ -3350,11 +3350,6 @@ static const void *lt_preloaded_setup() { *" -static "*) ;; *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DPIC";; - esac esac # Now compile the dynamic symbol file. @@ -3556,10 +3551,6 @@ static const void *lt_preloaded_setup() { Xsed='sed -e 1s/^X//' sed_quote_subst='$sed_quote_subst' -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi - relink_command=\"$relink_command\" # This environment variable determines our operation mode. diff --git a/src/3rdparty/libmng/makefiles/acinclude.m4 b/src/3rdparty/libmng/makefiles/acinclude.m4 index 60506df3..f3cb3c95 100644 --- a/src/3rdparty/libmng/makefiles/acinclude.m4 +++ b/src/3rdparty/libmng/makefiles/acinclude.m4 @@ -61,14 +61,14 @@ AC_DEFUN(AC_SYS_LARGEFILE, [Number of bits in a file offset, on hosts where this is settable.]) AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, ac_cv_sys_largefile_source, - [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).], + [Define to make ftello visible on some hosts.], [#include ], [return !ftello;]) AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files, [Define for large files, on AIX-style hosts.]) AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500, ac_cv_sys_xopen_source, - [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).], + [Define to make ftello visible on some hosts.], [#include ], [return !ftello;]) fi ]) diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL index 6960aae8..b4437d22 100644 --- a/src/3rdparty/libpng/INSTALL +++ b/src/3rdparty/libpng/INSTALL @@ -75,9 +75,7 @@ include makefile.cygwin => Cygwin/gcc makefile makefile.darwin => Darwin makefile makefile.dec => DEC Alpha UNIX makefile - makefile.hpgcc => FreeBSD makefile - makefile.hpgcc => HPUX makefile using gcc - makefile.hpux => HPUX (10.20 and 11.00) makefile + makefile.freebsd => FreeBSD makefile makefile.ibmc => IBM C/C++ version 3.x for Win32 and OS/2 (static) makefile.intel => Intel C/C++ version 4.0 and later libpng.icc => Project file for IBM VisualAge/C++ version 4.0 or later diff --git a/src/3rdparty/libpng/README b/src/3rdparty/libpng/README index 9ffb3e2e..18e148fe 100644 --- a/src/3rdparty/libpng/README +++ b/src/3rdparty/libpng/README @@ -198,8 +198,6 @@ Files in this distribution: makefile.darwin => Darwin makefile makefile.dec => DEC Alpha UNIX makefile makefile.freebsd => FreeBSD makefile - makefile.hpgcc => HPUX makefile using gcc - makefile.hpux => HPUX (10.20 and 11.00) makefile makefile.ibmc => IBM C/C++ version 3.x for Win32 and OS/2 (static) makefile.intel => Intel C/C++ version 4.0 and later libpng.icc => Project file, IBM VisualAge/C++ 4.0 or later diff --git a/src/3rdparty/libpng/scripts/makefile.hpgcc b/src/3rdparty/libpng/scripts/makefile.hpgcc deleted file mode 100644 index f677308c..00000000 --- a/src/3rdparty/libpng/scripts/makefile.hpgcc +++ /dev/null @@ -1,217 +0,0 @@ -# makefile for libpng on HP-UX using GCC with the HP ANSI/C linker. -# Copyright (C) 2002, Glenn Randers-Pehrson -# Copyright (C) 2001, Laurent faillie -# Copyright (C) 1998, 1999 Greg Roelofs -# Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h - -CC=gcc -LD=ld - -# where "make install" puts libpng.a, libpng.sl*, png.h and pngconf.h -prefix=/usr/local - -# Where the zlib library and include files are located -ZLIBLIB=/opt/zlib/lib -ZLIBINC=/opt/zlib/include - -# Note that if you plan to build a libpng shared library, zlib must also -# be a shared library, which zlib's configure does not do. After running -# zlib's configure, edit the appropriate lines of makefile to read: -# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ -# LDSHARED=ld -b -# SHAREDLIB=libz.sl - -ALIGN= -# for i386: -#ALIGN=-malign-loops=2 -malign-functions=2 - -WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ - -Wmissing-declarations -Wtraditional -Wcast-align \ - -Wstrict-prototypes -Wmissing-prototypes #-Wconversion - -# for pgcc version 2.95.1, -O3 is buggy; don't use it. - -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ - $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 -#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm -LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm - -RANLIB=ranlib -#RANLIB=echo - -PNGMAJ = 0 -PNGMIN = 1.2.5 -PNGVER = $(PNGMAJ).$(PNGMIN) -LIBNAME = libpng12 - -INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib -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 = 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 - -OBJSDLL = $(OBJS:.o=.pic.o) - -.SUFFIXES: .c .o .pic.o - -.c.pic.o: - $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c - -all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config - -libpng.a: $(OBJS) - ar rc $@ $(OBJS) - $(RANLIB) $@ - -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 libs=\"-lpng12 -lz -lm\"; \ - cat scripts/libpng-config-body.in ) > libpng-config - chmod +x libpng-config - -$(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ) - ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl - -$(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER) - ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) - -$(LIBNAME).sl.$(PNGVER): $(OBJSDLL) - $(LD) -b +s \ - +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL) - -libpng.sl.3.$(PNGMIN): $(OBJSDLL) - $(LD) -b +s \ - +h libpng.sl.3 -o libpng.sl.3.$(PNGMIN) $(OBJSDLL) - -pngtest: pngtest.o $(LIBNAME).sl - $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) - -test: pngtest - ./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).sl.$(PNGVER) libpng.pc \ - libpng.sl.3.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl - -@/bin/rm -f $(DL)/libpng.sl - -@/bin/rm -f $(DL)/libpng.sl.3 - -@/bin/rm -f $(DL)/libpng.sl.3.$(PNGMIN)* - cp $(LIBNAME).sl.$(PNGVER) $(DL) - cp libpng.sl.3.$(PNGMIN) $(DL) - chmod 755 $(DL)/$(LIBNAME).sl.$(PNGVER) - chmod 755 $(DL)/libpng.sl.3.$(PNGMIN) - (cd $(DL); \ - ln -sf libpng.sl.3.$(PNGMIN) libpng.sl.3; \ - ln -sf libpng.sl.3 libpng.sl; \ - ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ - ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) - -@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) -Wl,-rpath,$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` - ./pngtesti pngtest.png - -clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ - libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \ - libpng.sl.3.$(PNGMIN) \ - libpng.pc - -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.pic.o: png.h pngconf.h -pngerror.o pngerror.pic.o: png.h pngconf.h -pngrio.o pngrio.pic.o: png.h pngconf.h -pngwio.o pngwio.pic.o: png.h pngconf.h -pngmem.o pngmem.pic.o: png.h pngconf.h -pngset.o pngset.pic.o: png.h pngconf.h -pngget.o pngget.pic.o: png.h pngconf.h -pngread.o pngread.pic.o: png.h pngconf.h -pngrtran.o pngrtran.pic.o: png.h pngconf.h -pngrutil.o pngrutil.pic.o: png.h pngconf.h -pngtrans.o pngtrans.pic.o: png.h pngconf.h -pngwrite.o pngwrite.pic.o: png.h pngconf.h -pngwtran.o pngwtran.pic.o: png.h pngconf.h -pngwutil.o pngwutil.pic.o: png.h pngconf.h -pngpread.o pngpread.pic.o: png.h pngconf.h - -pngtest.o: png.h pngconf.h diff --git a/src/3rdparty/libpng/scripts/makefile.hpux b/src/3rdparty/libpng/scripts/makefile.hpux deleted file mode 100644 index a9c4d35c..00000000 --- a/src/3rdparty/libpng/scripts/makefile.hpux +++ /dev/null @@ -1,202 +0,0 @@ -# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product. -# Copyright (C) 1999-2002 Glenn Randers-Pehrson -# Copyright (C) 1995 Guy Eric Schalnat, Group 42 -# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard -# For conditions of distribution and use, see copyright notice in png.h - -# Where the zlib library and include files are located -ZLIBLIB=/opt/zlib/lib -ZLIBINC=/opt/zlib/include - -# Note that if you plan to build a libpng shared library, zlib must also -# be a shared library, which zlib's configure does not do. After running -# zlib's configure, edit the appropriate lines of makefile to read: -# CFLAGS=-O1 -DHAVE_UNISTD -DUSE_MAP -fPIC \ -# LDSHARED=ld -b -# SHAREDLIB=libz.sl - -CC=cc -CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 -# Caution: be sure you have built zlib with the same CFLAGS. -CCFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm - -RANLIB=ranlib - -PNGMAJ = 0 -PNGMIN = 1.2.5 -PNGVER = $(PNGMAJ).$(PNGMIN) -LIBNAME = libpng12 - -# where make install puts libpng.a, libpng12.sl, and png.h -prefix=/opt/libpng -INCPATH=$(prefix)/include -LIBPATH=$(prefix)/lib -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 = 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 - -OBJSDLL = $(OBJS:.o=.pic.o) - -.SUFFIXES: .c .o .pic.o - -.c.pic.o: - $(CC) -c $(CFLAGS) +z -o $@ $*.c - -all: libpng.a $(LIBNAME).sl pngtest libpng.pc libpng-config - -libpng.a: $(OBJS) - ar rc $@ $(OBJS) - $(RANLIB) $@ - -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=\"-Ae +DA1.1 +DS2.0\"; \ - echo L_opts=\"-L$(LIBPATH)\"; \ - echo libs=\"-lpng12 -lz -lm\"; \ - cat scripts/libpng-config-body.in ) > libpng-config - chmod +x libpng-config - -$(LIBNAME).sl: $(LIBNAME).sl.$(PNGMAJ) - ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl - -$(LIBNAME).sl.$(PNGMAJ): $(LIBNAME).sl.$(PNGVER) - ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ) - -$(LIBNAME).sl.$(PNGVER): $(OBJSDLL) - $(LD) -b +s \ - +h $(LIBNAME).sl.$(PNGMAJ) -o $(LIBNAME).sl.$(PNGVER) $(OBJSDLL) - -libpng.sl.3.$(PNGMIN): $(OBJSDLL) - $(LD) -b +s \ - +h libpng.sl.3 -o libpng.sl.3.$(PNGMIN) $(OBJSDLL) - -pngtest: pngtest.o libpng.a - $(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS) - -test: pngtest - ./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).sl.$(PNGVER) libpng.pc \ - libpng.sl.3.$(PNGMIN) - -@if [ ! -d $(DL) ]; then mkdir $(DL); fi - -@/bin/rm -f $(DL)/$(LIBNAME).sl.$(PNGVER)* $(DL)/$(LIBNAME).sl - -@/bin/rm -f $(DL)/libpng.sl - -@/bin/rm -f $(DL)/libpng.sl.3 - -@/bin/rm -f $(DL)/libpng.sl.3.$(PNGMIN)* - cp $(LIBNAME).sl.$(PNGVER) $(DL) - cp libpng.sl.3.$(PNGMIN) $(DL) - chmod 755 $(DL)/$(LIBNAME).sl.$(PNGVER) - chmod 755 $(DL)/libpng.sl.3.$(PNGMIN) - (cd $(DL); \ - ln -sf libpng.sl.3.$(PNGMIN) libpng.sl.3; \ - ln -sf libpng.sl.3 libpng.sl; \ - ln -sf $(LIBNAME).sl.$(PNGVER) $(LIBNAME).sl.$(PNGMAJ); \ - ln -sf $(LIBNAME).sl.$(PNGMAJ) $(LIBNAME).sl) - -@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) $(CCFLAGS) \ - `$(BINPATH)/libpng12-config --cflags` pngtest.c \ - -L$(ZLIBLIB) \ - -o pngtesti `$(BINPATH)/libpng12-config --ldflags` - ./pngtesti pngtest.png - -clean: - /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \ - libpng-config $(LIBNAME).sl $(LIBNAME).sl.$(PNGMAJ)* \ - libpng.sl.3.$(PNGMIN) \ - libpng.pc - -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 diff --git a/src/3rdparty/sqlite/os.h b/src/3rdparty/sqlite/os.h index d5541d46..f0342220 100644 --- a/src/3rdparty/sqlite/os.h +++ b/src/3rdparty/sqlite/os.h @@ -18,10 +18,6 @@ #define _SQLITE_OS_H_ #include "config.h" -/* -** Helpful hint: To get this to compile on HP/UX, add -D_INCLUDE_POSIX_SOURCE -** to the compiler command line. -*/ /* ** These #defines should enable >2GB file support on Posix if the diff --git a/src/3rdparty/sqlite/trolltech.patch b/src/3rdparty/sqlite/trolltech.patch index 6c9ca90b..fa87b817 100644 --- a/src/3rdparty/sqlite/trolltech.patch +++ b/src/3rdparty/sqlite/trolltech.patch @@ -34,6 +34,6 @@ diff -du ./os.h /home/harald/troll/qt-3.3/src/3rdparty/sqlite/os.h #define _SQLITE_OS_H_ +#include "config.h" + /* - ** Helpful hint: To get this to compile on HP/UX, add -D_INCLUDE_POSIX_SOURCE - ** to the compiler command line. + ** These #defines should enable >2GB file support on Posix if the diff --git a/src/3rdparty/zlib/README b/src/3rdparty/zlib/README index df95ae13..356f5aa1 100644 --- a/src/3rdparty/zlib/README +++ b/src/3rdparty/zlib/README @@ -72,7 +72,7 @@ Notes for some targets: - On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is necessary to get gzprintf working correctly. This is done by configure. -- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with +- zlib doesn't work on with some versions of /bin/cc. It works with other compilers. Use "make test" to check your compiler. - gzdopen is not supported on RISCOS, BEOS and by some Mac compilers. diff --git a/src/3rdparty/zlib/configure b/src/3rdparty/zlib/configure index 0b35bcb7..d36abb38 100755 --- a/src/3rdparty/zlib/configure +++ b/src/3rdparty/zlib/configure @@ -82,9 +82,6 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 # (alain.bonnefoy@icbt.com) LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};; - HP-UX*) LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} - shared_ext='.sl' - SHAREDLIB='libz.sl';; Darwin*) shared_ext='.dylib' SHAREDLIB=libz$shared_ext SHAREDLIBV=libz.$VER$shared_ext @@ -96,12 +93,6 @@ else # find system name and corresponding cc options CC=${CC-cc} case `(uname -sr || echo unknown) 2>/dev/null` in - HP-UX*) SFLAGS=${CFLAGS-"-O +z"} - CFLAGS=${CFLAGS-"-O"} -# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"} - LDSHARED=${LDSHARED-"ld -b"} - shared_ext='.sl' - SHAREDLIB='libz.sl';; IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} CFLAGS=${CFLAGS-"-ansi -O2"} LDSHARED=${LDSHARED-"cc -shared"};; diff --git a/src/dialogs/tqprintdialog.cpp b/src/dialogs/tqprintdialog.cpp index 4cd57a02..15272e8f 100644 --- a/src/dialogs/tqprintdialog.cpp +++ b/src/dialogs/tqprintdialog.cpp @@ -618,7 +618,6 @@ static char *parseNsswitchConf( TQListView * printers ) return defaultPrinter; } -// HP-UX static void parseEtcLpMember( TQListView * printers ) { TQDir lp( TQString::fromLatin1("/etc/lp/member") ); diff --git a/src/kernel/tqapplication_x11.cpp b/src/kernel/tqapplication_x11.cpp index e9877fe0..eeb5e0e3 100644 --- a/src/kernel/tqapplication_x11.cpp +++ b/src/kernel/tqapplication_x11.cpp @@ -341,7 +341,7 @@ static int xsync_errorbase; static long qt_alt_mask = 0; static long qt_meta_mask = 0; // modifier mask to remove mode switch from modifiers that have alt/meta set -// this problem manifests itself on HP/UX 10.20 at least, and without it +// this problem manifests itself on some systems, and without it // modifiers do not work at all... static long qt_mode_switch_remove_mask = 0; @@ -1972,33 +1972,7 @@ void tqt_init_internal( int *argcptr, char **argv, TQPaintDevice::x_appvisual_arr[ screen ]); int i, count; - TQPaintDevice::x_appcolormap_arr[ screen ] = 0; - - if ( ! serverVendor.contains( "Hewlett-Packard" ) ) { - // on HPUX 10.20 local displays, the RGB_DEFAULT_MAP colormap - // doesn't give us correct colors. Why this happens, I have - // no clue, so we disable this for HPUX - if (XGetRGBColormaps(appDpy, - TQPaintDevice::x11AppRootWindow( screen ), - &stdcmap, &count, XA_RGB_DEFAULT_MAP)) { - i = 0; - while (i < count && - TQPaintDevice::x_appcolormap_arr[ screen ] == 0) { - if (stdcmap[i].visualid == vid) { - TQPaintDevice::x_appcolormap_arr[ screen ] = - stdcmap[i].colormap; - } - i++; - } - - XFree( (char *)stdcmap ); - } - } - - if (TQPaintDevice::x_appcolormap_arr[ screen ] == 0) { - TQPaintDevice::x_appcolormap_arr[ screen ] = - DefaultColormap(appDpy, screen); - } + TQPaintDevice::x_appcolormap_arr[ screen ] = DefaultColormap(appDpy, screen); } else { // create a custom colormap TQPaintDevice::x_appcolormap_arr[ screen ] = @@ -5255,7 +5229,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count, // save the modifier state, we will use the keystate uint later by passing // it to qt_x11_translateButtonState uint keystate = event->xkey.state; - // remove the modifiers where mode_switch exists... HPUX machines seem + // remove the modifiers where mode_switch exists... some machines seem // to have alt *AND* mode_switch both in Mod1Mask, which causes // XLookupString to return things like '�' (aring) for ALT-A. This // completely breaks modifiers. If we remove the modifier for Mode_switch, diff --git a/src/kernel/tqcursor_x11.cpp b/src/kernel/tqcursor_x11.cpp index 2ff9bad0..d299bdd6 100644 --- a/src/kernel/tqcursor_x11.cpp +++ b/src/kernel/tqcursor_x11.cpp @@ -83,7 +83,7 @@ TQCursorData::~TQCursorData() { Display *dpy = TQPaintDevice::x11AppDisplay(); - // Add in checking for the display too as on HP-UX + // Add in checking for the display too as // we seem to get a core dump as the cursor data is // deleted again from main() on exit... if ( hcurs && dpy ) diff --git a/src/kernel/tqt_x11_p.h b/src/kernel/tqt_x11_p.h index b21fe373..aeb12020 100644 --- a/src/kernel/tqt_x11_p.h +++ b/src/kernel/tqt_x11_p.h @@ -194,9 +194,6 @@ typedef char *XPointer; // XmbLookupString broken on IRIX // XCreateIC broken when compiling -64 on IRIX 6.5.2 #define TQT_NO_XIM -#elif defined(Q_OS_HPUX) && defined(__LP64__) -// XCreateIC broken when compiling 64-bit ELF on HP-UX 11.0 -#define TQT_NO_XIM #endif // TQT_NO_XIM diff --git a/src/kernel/tqthread_unix.cpp b/src/kernel/tqthread_unix.cpp index 4f4ec8d7..ba744d01 100644 --- a/src/kernel/tqthread_unix.cpp +++ b/src/kernel/tqthread_unix.cpp @@ -410,12 +410,6 @@ void TQThread::start(Priority priority) d->args[0] = this; d->args[1] = d; ret = pthread_create( &d->thread_id, &attr, (TQtThreadCallback)TQThreadInstance::start, d->args ); -#if defined (Q_OS_HPUX) - if (ret == EPERM) { - pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); - ret = pthread_create(&d->thread_id, &attr, (TQtThreadCallback)TQThreadInstance::start, d->args); - } -#endif pthread_attr_destroy( &attr ); if ( ret ) { diff --git a/src/tools/tqdatastream.cpp b/src/tools/tqdatastream.cpp index 506e6dd0..30ee6e37 100644 --- a/src/tools/tqdatastream.cpp +++ b/src/tools/tqdatastream.cpp @@ -487,10 +487,6 @@ void TQDataStream::setByteOrder( int bo ) TQDataStream read functions *****************************************************************************/ -#if defined(Q_OS_HPUX) && !defined(__LP64__) -extern "C" long long __strtoll( const char *, char**, int ); -#endif - static TQ_INT64 read_int_ascii( TQDataStream *s ) { int n = 0; @@ -511,8 +507,6 @@ static TQ_INT64 read_int_ascii( TQDataStream *s ) return strtol( buf, (char**)0, 10 ); # elif defined(Q_OS_WIN) return _atoi64( buf ); -# elif defined(Q_OS_HPUX) - return __strtoll( buf, (char**)0, 10 ); # elif defined(Q_OS_MACX) && defined(QT_MACOSX_VERSION) && QT_MACOSX_VERSION < 0x1020 return strtoq( buf, (char**)0, 10 ); # else diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h index 8bac4e99..ff0d7d83 100644 --- a/src/tools/tqglobal.h +++ b/src/tools/tqglobal.h @@ -59,7 +59,6 @@ WIN32 - Win32 (Windows 95/98/ME and Windows NT/2000/XP) CYGWIN - Cygwin SOLARIS - Sun Solaris - HPUX - HP-UX ULTRIX - DEC Ultrix LINUX - Linux FREEBSD - FreeBSD @@ -103,8 +102,6 @@ # define Q_OS_WIN32 #elif defined(__sun) || defined(sun) # define Q_OS_SOLARIS -#elif defined(hpux) || defined(__hpux) -# define Q_OS_HPUX #elif defined(__ultrix) || defined(ultrix) # define Q_OS_ULTRIX #elif defined(__GNU__) @@ -191,8 +188,6 @@ SUN - Sun WorkShop, Forte Developer, or Sun ONE Studio C++ MIPS - MIPSpro C++ DEC - DEC C++ - HP - HPUX C++ - HPACC - HPUX ANSI C++ USLC - UDK, and UnixWare 2.X C++ KAI - KAI C++ INTEL - Intel C++ for Linux, Intel C++ for Windows @@ -241,10 +236,6 @@ # if __GNUC__ == 2 && __GNUC_MINOR__ <= 95 # define Q_NO_USING_KEYWORD # endif -/* GCC 3.1 and GCC 3.2 wrongly define _SB_CTYPE_MACROS on HP-UX */ -# if defined(Q_OS_HPUX) && __GNUC__ == 3 && __GNUC_MINOR__ >= 1 -# define Q_WRONG_SB_CTYPE_MACROS -# endif /* ARM gcc pads structs to 32 bits, even when they contain a single char, or short. We tell gcc to pack TQChars to 16 bits, to avoid @@ -377,15 +368,6 @@ # define Q_NO_USING_KEYWORD # endif -#elif defined(Q_OS_HPUX) -/* __HP_aCC was not defined in first aCC releases */ -# if defined(__HP_aCC) || __cplusplus >= 199707L -# define Q_CC_HPACC -# else -# define Q_CC_HP -# endif -# define Q_NO_USING_KEYWORD /* ### check "using" status */ - #else # error "TQt has not been tested with this compiler - talk to qt-bugs@trolltech.com" #endif diff --git a/src/tools/tqgpluginmanager.cpp b/src/tools/tqgpluginmanager.cpp index a1953213..e38e8e84 100644 --- a/src/tools/tqgpluginmanager.cpp +++ b/src/tools/tqgpluginmanager.cpp @@ -321,8 +321,6 @@ void TQGPluginManager::addLibraryPath( const TQString& path ) TQString filter = "*.dll"; #elif defined(Q_OS_MACX) TQString filter = "*.dylib; *.so; *.bundle"; -#elif defined(Q_OS_HPUX) - TQString filter = "*.sl"; #elif defined(Q_OS_OPENBSD) TQString filter = "*.so; *.so.*"; #elif defined(Q_OS_UNIX) diff --git a/src/tools/tqlibrary.cpp b/src/tools/tqlibrary.cpp index 947492f3..65e2f532 100644 --- a/src/tools/tqlibrary.cpp +++ b/src/tools/tqlibrary.cpp @@ -407,8 +407,6 @@ TQString TQLibrary::library() const filters << ".so"; filters << ".bundle"; filters << ".dylib"; //the last one is also the default one.. -#elif defined(Q_OS_HPUX) - filters << ".sl"; #else filters << ".so"; #endif diff --git a/src/tools/tqlibrary_unix.cpp b/src/tools/tqlibrary_unix.cpp index 7e299708..f7122d38 100644 --- a/src/tools/tqlibrary_unix.cpp +++ b/src/tools/tqlibrary_unix.cpp @@ -56,55 +56,6 @@ It's not too hard to guess what the functions do. */ -#if defined(QT_HPUX_LD) // for HP-UX < 11.x and 32 bit - -bool TQLibraryPrivate::loadLibrary() -{ - if ( pHnd ) - return true; - - TQString filename = library->library(); - - pHnd = (void*)shl_load( filename.latin1(), BIND_DEFERRED | BIND_NONFATAL | DYNAMIC_PATH, 0 ); -#if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) - if ( !pHnd ) - tqWarning( "%s: failed to load library!", filename.latin1() ); -#endif - return pHnd != 0; -} - -bool TQLibraryPrivate::freeLibrary() -{ - if ( !pHnd ) - return true; - - if ( shl_unload( (shl_t)pHnd ) ) { -#if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) - TQString filename = library->library(); - tqWarning( "%s: Failed to unload library!", filename.latin1() ); -#endif - return false; - } - pHnd = 0; - return true; -} - -void* TQLibraryPrivate::resolveSymbol( const char* symbol ) -{ - if ( !pHnd ) - return 0; - - void* address = 0; - if ( shl_findsym( (shl_t*)&pHnd, symbol, TYPE_UNDEFINED, &address ) < 0 ) { -#if defined(QT_DEBUG_COMPONENT) - TQString filename = library->library(); - tqWarning( "%s: couldn't resolve symbol \"%s\"", filename.latin1(), symbol ); -#endif - } - return address; -} - -#else // POSIX #include #ifndef DL_PREFIX //for mac dlcompat # define DL_PREFIX(x) x @@ -164,6 +115,4 @@ void* TQLibraryPrivate::resolveSymbol( const char* symbol ) return address; } -#endif // POSIX - #endif diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp index 625884c7..254c1ad0 100644 --- a/src/tools/tqstring.cpp +++ b/src/tools/tqstring.cpp @@ -702,7 +702,7 @@ TQStringData* TQString::makeSharedNull() } TQString::shared_null = new TQStringData; -#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX) +#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_AIX) TQString *that = const_cast(&TQString::null); that->d = TQString::shared_null; #endif diff --git a/tools/designer/designer/designer.pro b/tools/designer/designer/designer.pro index da8c8cf2..71beb9bb 100644 --- a/tools/designer/designer/designer.pro +++ b/tools/designer/designer/designer.pro @@ -416,15 +416,7 @@ table { } INCLUDEPATH += ../shared ../uilib -LIBS += -L$$QT_BUILD_TREE/lib -ltqui - -hpux-acc* { - LIBS += $$QT_BUILD_TREE/lib/libtqassistantclient.a -} - -!hpux-acc* { - LIBS += -ltqassistantclient -} +LIBS += -L$$QT_BUILD_TREE/lib -ltqui -ltqassistantclient TRANSLATIONS = designer_de.ts designer_fr.ts diff --git a/tools/designer/designer/orderindicator.cpp b/tools/designer/designer/orderindicator.cpp index d8c03e7f..5f28dea0 100644 --- a/tools/designer/designer/orderindicator.cpp +++ b/tools/designer/designer/orderindicator.cpp @@ -31,7 +31,7 @@ ** **********************************************************************/ -#include // HP-UX compiler need this here +#include #include "orderindicator.h" #include "formwindow.h" diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp index 0a6c135e..4cbbef67 100644 --- a/tools/designer/designer/pixmapchooser.cpp +++ b/tools/designer/designer/pixmapchooser.cpp @@ -31,7 +31,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include #include "pixmapchooser.h" #include "formwindow.h" diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp index a392ada9..24e06588 100644 --- a/tools/designer/designer/propertyeditor.cpp +++ b/tools/designer/designer/propertyeditor.cpp @@ -31,7 +31,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include #include "propertyeditor.h" #include "formwindow.h" diff --git a/tools/designer/designer/sizehandle.cpp b/tools/designer/designer/sizehandle.cpp index 4906eda6..c8a1edc3 100644 --- a/tools/designer/designer/sizehandle.cpp +++ b/tools/designer/designer/sizehandle.cpp @@ -31,7 +31,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include #include "sizehandle.h" #include "formwindow.h" diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp index 9518bbe8..53602cb3 100644 --- a/tools/designer/designer/styledbutton.cpp +++ b/tools/designer/designer/styledbutton.cpp @@ -31,7 +31,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include #include "styledbutton.h" #include "formwindow.h" #include "pixmapchooser.h" diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp index 0c8ced55..92f95e84 100644 --- a/tools/designer/designer/widgetfactory.cpp +++ b/tools/designer/designer/widgetfactory.cpp @@ -31,7 +31,7 @@ ** **********************************************************************/ -#include // HP-UX compiler need this here +#include #include "widgetfactory.h" #include #include "metadatabase.h" diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp index 33044081..2c3d8b93 100644 --- a/tools/designer/designer/workspace.cpp +++ b/tools/designer/designer/workspace.cpp @@ -31,7 +31,7 @@ ** **********************************************************************/ -#include // HP-UX compiler needs this here +#include #include "workspace.h" #include "formwindow.h" #include "mainwindow.h" diff --git a/tools/designer/plugins/cppeditor/cppeditor.pro b/tools/designer/plugins/cppeditor/cppeditor.pro index 6cfdf8f1..a6769031 100644 --- a/tools/designer/plugins/cppeditor/cppeditor.pro +++ b/tools/designer/plugins/cppeditor/cppeditor.pro @@ -11,11 +11,7 @@ VERSION = 1.0.0 INCLUDEPATH += ../../interfaces ../../editor $$QT_BUILD_TREE/tools/designer/editor -hpux-* { - LIBS += $$QT_BUILD_TREE/lib/libtqteditor.a -} else { - LIBS += -L$$QT_BUILD_TREE/lib -ltqteditor -} +LIBS += -L$$QT_BUILD_TREE/lib -ltqteditor target.path += $$plugins.path/designer INSTALLS += target diff --git a/tools/designer/tquic/form.cpp b/tools/designer/tquic/form.cpp index 1ada5a78..b9d8fd70 100644 --- a/tools/designer/tquic/form.cpp +++ b/tools/designer/tquic/form.cpp @@ -196,7 +196,7 @@ void TQUic::createFormDecl( const TQDomElement &e ) out << "#ifndef " << protector << endl; out << "#define " << protector << endl; out << endl; - out << "#include " << endl; // for broken HP-UX compilers + out << "#include " << endl; if ( !imageMembers.isEmpty() ) out << "#include " << endl; diff --git a/translations/qt_cs.ts b/translations/qt_cs.ts index fa466518..dc83cd32 100644 --- a/translations/qt_cs.ts +++ b/translations/qt_cs.ts @@ -1270,7 +1270,7 @@ na(new line) <p>Tento program používá knihovnu TQt verze %1.</p> <p>TQt je multiplatformní C++ knihovna pro návrh grafických aplikací. TQt umožňuje jednoduchou přenositelnost aplikací mezi -Windows 95/98/NT/2000, Linuxem, Solarisem, Mac OS X, HP-UX a mnoha +Windows 95/98/NT/2000, Linuxem, Solarisem, Mac OS X a mnoha dalšími verzemi Unixu s grafickým prostředím X11. <p>Více informací naleznete na <tt>https://trinitydesktop.org/docs/qt3/</tt>.</p> -- cgit v1.2.3