diff options
113 files changed, 257 insertions, 4477 deletions
diff --git a/config.tests/unix/largefile/largefiletest.cpp b/config.tests/unix/largefile/largefiletest.cpp index ed04e7a4a..b3626621a 100644 --- a/config.tests/unix/largefile/largefiletest.cpp +++ b/config.tests/unix/largefile/largefiletest.cpp @@ -18,7 +18,6 @@ int main( int, char **argv ) if (OFF_T_64 % 2147483647 != 1) return 1; - // stat breaks on SCO OpenServer struct stat buf; stat( argv[0], &buf ); if (!S_ISREG(buf.st_mode)) @@ -428,9 +428,6 @@ while [ "$#" -gt 0 ]; do irix-cc-n64) PLATFORM=irix-cc-64 ;; - reliant-64) - PLATFORM=reliant-cds-64 - ;; solaris-64) PLATFORM=solaris-cc-64 ;; @@ -1168,13 +1165,6 @@ if [ -z "$PLATFORM" ]; then - Also available for HP-UX: hpux-g++ hpux-acc-64 hpux-acc-o64 " ;; - OSF1:*) - #PLATFORM=tru64-g++ - PLATFORM=tru64-cxx - PLATFORM_NOTES=" - - Also available for Tru64: tru64-g++ - " - ;; Linux:*|GNU:*|GNU/*:*) PLATFORM=linux-g++ PLATFORM_NOTES=" @@ -1189,13 +1179,6 @@ if [ -z "$PLATFORM" ]; then - Also available for Solaris: solaris-g++ solaris-cc-64 " ;; - ReliantUNIX-*:*|SINIX-*:*) - PLATFORM=reliant-cds - #PLATFORM=reliant-cds-64 - PLATFORM_NOTES=" - - Also available for Reliant UNIX: reliant-cds-64 - " - ;; CYGWIN*:*) PLATFORM=cygwin-g++ ;; @@ -1216,13 +1199,6 @@ if [ -z "$PLATFORM" ]; then - Also available for UnixWare: unixware-g++ " ;; - SCO_SV:*) - #PLATFORM=sco-g++ - PLATFORM=sco-cc - PLATFORM_NOTES=" - - Also available for SCO OpenServer: sco-g++ - " - ;; UNIX_SV:*) PLATFORM=unixware-g++ ;; @@ -2125,9 +2101,6 @@ if true; then ###[ '!' -f "$outpath/bin/tqmake" ]; EXTRA_CFLAGS="$EXTRA_CFLAGS \$(CARBON_CFLAGS) -DQT_MACOSX_VERSION=$QT_MAC_VERSION" EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS) -DQT_MACOSX_VERSION=$QT_MAC_VERSION" EXTRA_SOURCES="tqurl.o tqsettings_mac.o" - elif [ "$PLATFORM" = "tru64-cxx" ]; then - echo "OSF_LFLAGS = -lm" >>$mkfile - EXTRA_LFLAGS="$EXTRA_LFLAGS \$(OSF_LFLAGS)" elif [ "$PLATFORM_QNX" = "yes" ]; then echo "QNX_LFLAGS += -fhonor-std -fno-builtins -pipe" >>$mkfile echo "QNX_CFLAGS += -lcpp" >>$mkfile diff --git a/doc/html/qmake-manual-2.html b/doc/html/qmake-manual-2.html index cb1126dba..ed82475eb 100644 --- a/doc/html/qmake-manual-2.html +++ b/doc/html/qmake-manual-2.html @@ -37,7 +37,7 @@ body { background: #ffffff; color: black; } <p>Before building TQt manually the following environment variables must be set:</p> <ul><li><p>QMAKESPEC <br> This must be set to the platform and compiler combination that you are using on your system. <br> For example, if you are using Windows and Microsoft Visual Studio, you would set this environment variable to <em>win32-msvc</em>. If you are using Solaris and g++, you would set this environment variable to <em>solaris-g++</em>.</p> <p>The following is a list of environment variables available to choose from when setting QMAKESPEC:</p> -<p>aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc dgux-g++ hurd-g++ linux-kcc reliant-64 tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder reliant-cds ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ sco-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p> +<p>aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc unixware7-g++ aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc dgux-g++ hurd-g++ linux-kcc tru64-g++ win32-watc freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-visa hpux-acc irix-g++ macx-g++ unixware-g hpux-acc irix-n32 solaris-64 unixware7-cc</p> <li><p>TQTDIR <br> This must be set to where TQt is (or will be) installed. For example, <em>c:\qt</em> and <em>\local\qt</em></p> </ul><p>Once the environment variables are set go into the qmake directory, <em>$TQTDIR/qmake</em>, e.g. <em>C:\qt\qmake</em>. Now run <em>make</em> or <em>nmake</em> depending on your compiler.</p> <p>When the make has completed, <em>qmake</em> is ready for use.</p> diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf index 856ee66c9..eda8cf1cc 100644 --- a/doc/html/qt.dcf +++ b/doc/html/qt.dcf @@ -7155,7 +7155,7 @@ <keyword ref="tqt.html#WidgetState">WidgetState</keyword> <keyword ref="tqt.html#WindowState">WindowState</keyword> <keyword ref="tqt.html#WindowsVersion">WindowsVersion</keyword> - <section ref="qt-members.html" title="List of All Member Functions"/> + <section ref="tqt-members.html" title="List of All Member Functions"/> <section ref="tqnamespace-h.html" title="Header File"/> </section> <section ref="tqtab.html" title="TQTab Class Reference"> diff --git a/doc/html/titleindex b/doc/html/titleindex index 42c5f2882..a8eec621b 100644 --- a/doc/html/titleindex +++ b/doc/html/titleindex @@ -915,42 +915,42 @@ TQXmlReader Class | tqxmlreader.html TQXmlReader Member List | tqxmlreader-members.html TQXmlSimpleReader Class | tqxmlsimplereader.html TQXmlSimpleReader Member List | tqxmlsimplereader-members.html -Qt Class | tqt.html -Qt Commercial Editions | commercialeditions.html -Qt Demo | demo-example.html -Qt Distribution Example | distributor-example.html -Qt Editions | editions.html -Qt Member List | qt-members.html -Qt Object Model | object.html -Qt Open Source Edition | opensourceedition.html -Qt Open Source Edition License Agreement | license.html -Qt OpenGL 3D Graphics | opengl.html -Qt Plugins HOWTO | plugins-howto.html -Qt Reference Documentation (Open Source Edition) | index.html -Qt SQL Examples | sql-examples.html -Qt Template Library | qt-template-lib.html -Qt Template Library Classes | tqtl.html -Qt Tutorial #1 - The 14 Steps | tutorial.html -Qt Tutorial - Chapter 10: Smooth as Silk | tutorial1-10.html -Qt Tutorial - Chapter 11: Giving It a Shot | tutorial1-11.html -Qt Tutorial - Chapter 12: Hanging in the Air the Way Bricks Don't | tutorial1-12.html -Qt Tutorial - Chapter 13: Game Over | tutorial1-13.html -Qt Tutorial - Chapter 14: Facing the Wall | tutorial1-14.html -Qt Tutorial - Chapter 1: Hello, World! | tutorial1-01.html -Qt Tutorial - Chapter 2: Calling it Quits | tutorial1-02.html -Qt Tutorial - Chapter 3: Family Values | tutorial1-03.html -Qt Tutorial - Chapter 4: Let There Be Widgets | tutorial1-04.html -Qt Tutorial - Chapter 5: Building Blocks | tutorial1-05.html -Qt Tutorial - Chapter 6: Building Blocks Galore! | tutorial1-06.html -Qt Tutorial - Chapter 7: One Thing Leads to Another | tutorial1-07.html -Qt Tutorial - Chapter 8: Preparing for Battle | tutorial1-08.html -Qt Tutorial - Chapter 9: With Cannon You Can | tutorial1-09.html -Qt XML Examples | xml-examples.html -Qt's Classes | classes.html -Qt's Main Classes | mainclasses.html -Qt's Tools | tools-list.html -Qt/Mac Issues | mac-differences.html -Qt/Mac is Mac OS X Native | qtmac-as-native.html +TQt Class | tqt.html +TQt Commercial Editions | commercialeditions.html +TQt Demo | demo-example.html +TQt Distribution Example | distributor-example.html +TQt Editions | editions.html +TQt Member List | tqt-members.html +TQt Object Model | object.html +TQt Open Source Edition | opensourceedition.html +TQt Open Source Edition License Agreement | license.html +TQt OpenGL 3D Graphics | opengl.html +TQt Plugins HOWTO | plugins-howto.html +TQt Reference Documentation (Open Source Edition) | index.html +TQt SQL Examples | sql-examples.html +TQt Template Library | qt-template-lib.html +TQt Template Library Classes | tqtl.html +TQt Tutorial #1 - The 14 Steps | tutorial.html +TQt Tutorial - Chapter 10: Smooth as Silk | tutorial1-10.html +TQt Tutorial - Chapter 11: Giving It a Shot | tutorial1-11.html +TQt Tutorial - Chapter 12: Hanging in the Air the Way Bricks Don't | tutorial1-12.html +TQt Tutorial - Chapter 13: Game Over | tutorial1-13.html +TQt Tutorial - Chapter 14: Facing the Wall | tutorial1-14.html +TQt Tutorial - Chapter 1: Hello, World! | tutorial1-01.html +TQt Tutorial - Chapter 2: Calling it Quits | tutorial1-02.html +TQt Tutorial - Chapter 3: Family Values | tutorial1-03.html +TQt Tutorial - Chapter 4: Let There Be Widgets | tutorial1-04.html +TQt Tutorial - Chapter 5: Building Blocks | tutorial1-05.html +TQt Tutorial - Chapter 6: Building Blocks Galore! | tutorial1-06.html +TQt Tutorial - Chapter 7: One Thing Leads to Another | tutorial1-07.html +TQt Tutorial - Chapter 8: Preparing for Battle | tutorial1-08.html +TQt Tutorial - Chapter 9: With Cannon You Can | tutorial1-09.html +TQt XML Examples | xml-examples.html +TQt's Classes | classes.html +TQt's Main Classes | mainclasses.html +TQt's Tools | tools-list.html +TQt/Mac Issues | mac-differences.html +TQt/Mac is Mac OS X Native | qtmac-as-native.html Range controls | rangecontrols-example.html Richtext | richtext-example.html Rot13 | rot-example.html diff --git a/doc/html/qbytearray-members.html b/doc/html/tqbytearray-members.html index 606581836..606581836 100644 --- a/doc/html/qbytearray-members.html +++ b/doc/html/tqbytearray-members.html diff --git a/doc/html/qbytearray.html b/doc/html/tqbytearray.html index bd5ca50b0..bd5ca50b0 100644 --- a/doc/html/qbytearray.html +++ b/doc/html/tqbytearray.html diff --git a/doc/html/tqcanvas-h.html b/doc/html/tqcanvas-h.html index b456dff40..62093fe1a 100644 --- a/doc/html/tqcanvas-h.html +++ b/doc/html/tqcanvas-h.html @@ -110,7 +110,7 @@ class TQCanvasItem; class TQCanvasView; class TQCanvasPixmap; -#if defined(Q_TEMPLATEDLL) && ( !defined(QT_MAKEDLL) || defined(Q_EXPORT_TEMPLATES) ) +#if defined(Q_TEMPLATEDLL) && ( !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) ) // MOC_SKIP_BEGIN TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueListIterator< TQCanvasItem* >; TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueList< TQCanvasItem* >; diff --git a/doc/html/tqcdestyle-h.html b/doc/html/tqcdestyle-h.html index 627435824..2ab53a700 100644 --- a/doc/html/tqcdestyle-h.html +++ b/doc/html/tqcdestyle-h.html @@ -84,12 +84,12 @@ body { background: #ffffff; color: black; } #if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_CDE +#define TQ_EXPORT_STYLE_CDE #else -#define Q_EXPORT_STYLE_CDE TQ_EXPORT +#define TQ_EXPORT_STYLE_CDE TQ_EXPORT #endif -class Q_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle +class TQ_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle { TQ_OBJECT public: diff --git a/doc/html/qdoublevalidator-members.html b/doc/html/tqdoublevalidator-members.html index b29cd1846..b29cd1846 100644 --- a/doc/html/qdoublevalidator-members.html +++ b/doc/html/tqdoublevalidator-members.html diff --git a/doc/html/qdoublevalidator.html b/doc/html/tqdoublevalidator.html index ceb2a5d86..ceb2a5d86 100644 --- a/doc/html/qdoublevalidator.html +++ b/doc/html/tqdoublevalidator.html diff --git a/doc/html/tqeucjpcodec-h.html b/doc/html/tqeucjpcodec-h.html index 1d4915b13..65c4b90d3 100644 --- a/doc/html/tqeucjpcodec-h.html +++ b/doc/html/tqeucjpcodec-h.html @@ -113,12 +113,12 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQEucJpCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQEucJpCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/doc/html/tqeuckrcodec-h.html b/doc/html/tqeuckrcodec-h.html index eb567a66f..10a838546 100644 --- a/doc/html/tqeuckrcodec-h.html +++ b/doc/html/tqeuckrcodec-h.html @@ -108,12 +108,12 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_KR +#define TQ_EXPORT_CODECS_KR #else -#define Q_EXPORT_CODECS_KR TQ_EXPORT +#define TQ_EXPORT_CODECS_KR TQ_EXPORT #endif -class Q_EXPORT_CODECS_KR TQEucKrCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_KR TQEucKrCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/doc/html/tqgb18030codec-h.html b/doc/html/tqgb18030codec-h.html index e0cfd49a0..f55c1e78c 100644 --- a/doc/html/tqgb18030codec-h.html +++ b/doc/html/tqgb18030codec-h.html @@ -84,12 +84,12 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_CN +#define TQ_EXPORT_CODECS_CN #else -#define Q_EXPORT_CODECS_CN TQ_EXPORT +#define TQ_EXPORT_CODECS_CN TQ_EXPORT #endif -class Q_EXPORT_CODECS_CN TQGb18030Codec : public TQTextCodec { +class TQ_EXPORT_CODECS_CN TQGb18030Codec : public TQTextCodec { public: TQGb18030Codec(); @@ -108,7 +108,7 @@ public: int heuristicNameMatch(const char* hint) const; }; -class Q_EXPORT_CODECS_CN TQGbkCodec : public TQGb18030Codec { +class TQ_EXPORT_CODECS_CN TQGbkCodec : public TQGb18030Codec { public: TQGbkCodec(); @@ -127,7 +127,7 @@ public: int heuristicNameMatch(const char* hint) const; }; -class Q_EXPORT_CODECS_CN TQGb2312Codec : public TQGb18030Codec { +class TQ_EXPORT_CODECS_CN TQGb2312Codec : public TQGb18030Codec { public: TQGb2312Codec(); diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html index 18cf07aa6..05f45cac4 100644 --- a/doc/html/tqglobal-h.html +++ b/doc/html/tqglobal-h.html @@ -102,13 +102,10 @@ body { background: #ffffff; color: black; } OPENBSD - OpenBSD BSDI - BSD/OS IRIX - SGI Irix - OSF - HP Tru64 UNIX - SCO - SCO OpenServer 5 UNIXWARE - UnixWare 7, Open UNIX 8 AIX - AIX HURD - GNU Hurd DGUX - DG/UX - RELIANT - Reliant UNIX DYNIX - DYNIX/ptx TQNX - TQNX TQNX6 - TQNX RTP 6.1 @@ -140,16 +137,12 @@ body { background: #ffffff; color: black; } # define Q_OS_WIN64 #elif !defined(SAG_COM) && (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)) # define Q_OS_WIN32 -#elif defined(__MWERKS__) && defined(__INTEL__) -# 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(sinix) -# define Q_OS_RELIANT #elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__) # define Q_OS_LINUX #elif defined(__FreeBSD__) || defined(__DragonFly__) @@ -166,8 +159,6 @@ body { background: #ffffff; color: black; } # define Q_OS_BSD4 #elif defined(__sgi) # define Q_OS_IRIX -#elif defined(__osf__) -# define Q_OS_OSF #elif defined(_AIX) # define Q_OS_AIX #elif defined(__Lynx__) @@ -180,9 +171,7 @@ body { background: #ffffff; color: black; } # define Q_OS_QNX #elif defined(_SEQUENT_) # define Q_OS_DYNIX -#elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */ -# define Q_OS_SCO -#elif defined(__USLC__) /* all SCO platforms + UDK or OUDK */ +#elif defined(__USLC__) /* UDK or OUDK */ # define Q_OS_UNIXWARE # define Q_OS_UNIXWARE7 #elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */ @@ -230,7 +219,6 @@ body { background: #ffffff; color: black; } SYM - Symantec C++ for both PC and Macintosh MPW - MPW C++ - MWERKS - Metrowerks CodeWarrior MSVC - Microsoft Visual C/C++, Intel C++ for Windows WAT - Watcom C++ GNU - GNU C++ @@ -242,8 +230,7 @@ body { background: #ffffff; color: black; } DEC - DEC C++ HP - HPUX C++ HPACC - HPUX ANSI C++ - USLC - SCO OUDK, UDK, and UnixWare 2.X C++ - CDS - Reliant C++ + USLC - UDK, and UnixWare 2.X C++ KAI - KAI C++ INTEL - Intel C++ for Linux, Intel C++ for Windows HIGHC - MetaWare High C/C++ @@ -271,11 +258,6 @@ body { background: #ffffff; color: black; } # define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD -#elif defined(__MWERKS__) -# define Q_CC_MWERKS -/* "explicit" recognized since 4.0d1 */ -# define TQMAC_PASCAL pascal - #elif defined(_MSC_VER) # define Q_CC_MSVC /* proper support of bool for _MSC_VER >= 1100 */ @@ -384,36 +366,6 @@ body { background: #ffffff; color: black; } # define Q_CANNOT_DELETE_CONSTANT # endif -/* Older versions of DEC C++ do not define __EDG__ or __EDG - observed - on DEC C++ V5.5-004. New versions do define __EDG__ - observed on - Compaq C++ V6.3-002. - This compiler is different enough from other EDG compilers to handle - it separately anyway. */ -#elif defined(__DECCXX) || defined(__DECC) -# define Q_CC_DEC -/* Compaq C++ V6 compilers are EDG-based but I'm not sure about older - DEC C++ V5 compilers. */ -# if defined(__EDG__) -# define Q_CC_EDG -# endif -/* Compaq have disabled EDG's _BOOL macro and use _BOOL_EXISTS instead - - observed on Compaq C++ V6.3-002. - In any case versions prior to Compaq C++ V6.0-005 do not have bool. */ -# if !defined(_BOOL_EXISTS) -# define Q_NO_BOOL_TYPE -# endif -/* Spurious (?) error messages observed on Compaq C++ V6.5-014. */ -# define Q_NO_USING_KEYWORD -/* Apply to all versions prior to Compaq C++ V6.0-000 - observed on - DEC C++ V5.5-004. */ -# if __DECCXX_VER < 60060000 -# define TQ_TYPENAME -# define Q_BROKEN_TEMPLATE_SPECIALIZATION -# define Q_CANNOT_DELETE_CONSTANT -# endif -/* avoid undefined symbol problems with out-of-line template members */ -# define TQ_INLINE_TEMPLATES inline - /* Compilers with EDG front end are similar. To detect them we test: __EDG documented by SGI, observed on MIPSpro 7.3.1.1 and KAI C++ 4.0b __EDG__ documented in EDG online docs, observed on Compaq C++ V6.3-002 */ @@ -478,15 +430,6 @@ body { background: #ffffff; color: black; } # define Q_CC_OC # define Q_NO_USING_KEYWORD -/* CDS++ defines __EDG__ although this is not documented in the Reliant - documentation. It also follows conventions like _BOOL and this documented */ -# elif defined(sinix) -# define Q_CC_CDS -# define Q_NO_USING_KEYWORD -# if defined(__cplusplus) && (__cplusplus < 2) /* Cfront C++ mode */ -# define Q_NO_EXCEPTIONS -# endif - /* The MIPSpro compiler in o32 mode is based on EDG but disables features such as template specialization nevertheless */ # elif defined(__sgi) @@ -540,16 +483,6 @@ body { background: #ffffff; color: black; } # define Q_NO_USING_KEYWORD # endif -/* CDS++ does not seem to define __EDG__ or __EDG according to Reliant - documentation but nevertheless uses EDG conventions like _BOOL */ -#elif defined(sinix) -# define Q_CC_EDG -# define Q_CC_CDS -# if !defined(_BOOL) -# define Q_NO_BOOL_TYPE -# endif -# define Q_BROKEN_TEMPLATE_SPECIALIZATION - #elif defined(Q_OS_HPUX) /* __HP_aCC was not defined in first aCC releases */ # if defined(__HP_aCC) || __cplusplus >= 199707L diff --git a/doc/html/tqjiscodec-h.html b/doc/html/tqjiscodec-h.html index d81c19889..664bcbaaf 100644 --- a/doc/html/tqjiscodec-h.html +++ b/doc/html/tqjiscodec-h.html @@ -113,12 +113,12 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQJisCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQJisCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/doc/html/tqmacstyle_mac-h.html b/doc/html/tqmacstyle_mac-h.html index b037eb027..7bc4ad6d5 100644 --- a/doc/html/tqmacstyle_mac-h.html +++ b/doc/html/tqmacstyle_mac-h.html @@ -85,14 +85,14 @@ body { background: #ffffff; color: black; } class TQPalette; #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_MAC +#define TQ_EXPORT_STYLE_MAC #else -#define Q_EXPORT_STYLE_MAC TQ_EXPORT +#define TQ_EXPORT_STYLE_MAC TQ_EXPORT #endif class TQMacStylePrivate; -class Q_EXPORT_STYLE_MAC TQMacStyle : public TQWindowsStyle +class TQ_EXPORT_STYLE_MAC TQMacStyle : public TQWindowsStyle { TQ_OBJECT public: diff --git a/doc/html/tqmotifplusstyle-h.html b/doc/html/tqmotifplusstyle-h.html index 5c41e0292..873463384 100644 --- a/doc/html/tqmotifplusstyle-h.html +++ b/doc/html/tqmotifplusstyle-h.html @@ -84,12 +84,12 @@ body { background: #ffffff; color: black; } #if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_MOTIFPLUS +#define TQ_EXPORT_STYLE_MOTIFPLUS #else -#define Q_EXPORT_STYLE_MOTIFPLUS TQ_EXPORT +#define TQ_EXPORT_STYLE_MOTIFPLUS TQ_EXPORT #endif -class Q_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle +class TQ_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle { TQ_OBJECT diff --git a/doc/html/tqmotifstyle-h.html b/doc/html/tqmotifstyle-h.html index b0640c58e..677c28e66 100644 --- a/doc/html/tqmotifstyle-h.html +++ b/doc/html/tqmotifstyle-h.html @@ -85,13 +85,13 @@ body { background: #ffffff; color: black; } class TQPalette; #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_MOTIF +#define TQ_EXPORT_STYLE_MOTIF #else -#define Q_EXPORT_STYLE_MOTIF TQ_EXPORT +#define TQ_EXPORT_STYLE_MOTIF TQ_EXPORT #endif -class Q_EXPORT_STYLE_MOTIF TQMotifStyle : public TQCommonStyle +class TQ_EXPORT_STYLE_MOTIF TQMotifStyle : public TQCommonStyle { TQ_OBJECT public: diff --git a/doc/html/tqplatinumstyle-h.html b/doc/html/tqplatinumstyle-h.html index 3b8f80bf1..8d9345d9b 100644 --- a/doc/html/tqplatinumstyle-h.html +++ b/doc/html/tqplatinumstyle-h.html @@ -85,12 +85,12 @@ body { background: #ffffff; color: black; } class TQPalette; #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_PLATINUM +#define TQ_EXPORT_STYLE_PLATINUM #else -#define Q_EXPORT_STYLE_PLATINUM TQ_EXPORT +#define TQ_EXPORT_STYLE_PLATINUM TQ_EXPORT #endif -class Q_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle +class TQ_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle { TQ_OBJECT public: diff --git a/doc/html/tqsgistyle-h.html b/doc/html/tqsgistyle-h.html index 69a32c59d..8ddd9beb5 100644 --- a/doc/html/tqsgistyle-h.html +++ b/doc/html/tqsgistyle-h.html @@ -85,14 +85,14 @@ body { background: #ffffff; color: black; } #if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_SGI +#define TQ_EXPORT_STYLE_SGI #else -#define Q_EXPORT_STYLE_SGI TQ_EXPORT +#define TQ_EXPORT_STYLE_SGI TQ_EXPORT #endif class TQSGIStylePrivate; -class Q_EXPORT_STYLE_SGI TQSGIStyle: public TQMotifStyle +class TQ_EXPORT_STYLE_SGI TQSGIStyle: public TQMotifStyle { TQ_OBJECT public: diff --git a/doc/html/tqsjiscodec-h.html b/doc/html/tqsjiscodec-h.html index 758e4a4c1..4e22cbc18 100644 --- a/doc/html/tqsjiscodec-h.html +++ b/doc/html/tqsjiscodec-h.html @@ -113,12 +113,12 @@ body { background: #ffffff; color: black; } #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQSjisCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQSjisCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/doc/html/tqstyle.html b/doc/html/tqstyle.html index be1169606..c539dfd9d 100644 --- a/doc/html/tqstyle.html +++ b/doc/html/tqstyle.html @@ -365,7 +365,7 @@ header <li><tt>TQStyle::PE_ScrollBarAddLine</tt> - scrollbar line increase indicator (i.e. scroll down); see also <a href="tqscrollbar.html">TQScrollBar</a>. <li><tt>TQStyle::PE_ScrollBarSubLine</tt> - scrollbar line decrease indicator (i.e. scroll up). -<li><tt>TQStyle::PE_ScrollBarAddPage</tt> - scolllbar page increase indicator (i.e. page down). +<li><tt>TQStyle::PE_ScrollBarAddPage</tt> - scrollbar page increase indicator (i.e. page down). <li><tt>TQStyle::PE_ScrollBarSubPage</tt> - scrollbar page decrease indicator (i.e. page up). <li><tt>TQStyle::PE_ScrollBarSlider</tt> - scrollbar slider <li><tt>TQStyle::PE_ScrollBarFirst</tt> - scrollbar first line indicator (i.e. home). @@ -433,7 +433,7 @@ behave as appropriate for each control. value. If TRUE, when clicking a scrollbar SubControl, holding the mouse button down and moving the pointer outside the SubControl, the scrollbar continues to scroll. If FALSE, the -scollbar stops scrolling when the pointer leaves the +scrollbar stops scrolling when the pointer leaves the SubControl. <li><tt>TQStyle::SH_TabBar_Alignment</tt> - the alignment for tabs in a <a href="tqtabwidget.html">TQTabWidget</a>. Possible values are <a href="tqt.html#AlignmentFlags-enum">TQt::AlignLeft</a>, <a href="tqt.html#AlignmentFlags-enum">TQt::AlignCenter</a> and <a href="tqt.html#AlignmentFlags-enum">TQt::AlignRight</a>. @@ -485,7 +485,7 @@ cause a tab to be selected. <li><tt>TQStyle::SH_ListViewExpand_SelectMouseType</tt> - which type of mouse event should cause a listview expansion to be selected. <li><tt>TQStyle::SH_TabBar_PreferNoArrows</tt> - whether a tabbar should suggest a size -to prevent scoll arrows. +to prevent scroll arrows. <li><tt>TQStyle::SH_ComboBox_Popup</tt> - allows popups as a combobox dropdown menu. <li><tt>TQStyle::SH_Workspace_FillSpaceOnMaximize</tt> - the workspace should diff --git a/doc/html/qt-members.html b/doc/html/tqt-members.html index 615272374..615272374 100644 --- a/doc/html/qt-members.html +++ b/doc/html/tqt-members.html diff --git a/doc/html/tqt.html b/doc/html/tqt.html index bad4533cd..1c71cbbf1 100644 --- a/doc/html/tqt.html +++ b/doc/html/tqt.html @@ -35,7 +35,7 @@ that need to be global-like. <a href="#details">More...</a> <p><tt>#include <<a href="tqnamespace-h.html">tqnamespace.h</a>></tt> <p>Inherited by <a href="tqobject.html">TQObject</a>, <a href="tqpixmap.html">TQPixmap</a>, <a href="tqbrush.html">TQBrush</a>, <a href="tqcanvasitem.html">TQCanvasItem</a>, <a href="tqcursor.html">TQCursor</a>, <a href="tqpainter.html">TQPainter</a>, <a href="tqevent.html">TQEvent</a>, <a href="tqiconviewitem.html">TQIconViewItem</a>, <a href="tqkeysequence.html">TQKeySequence</a>, <a href="tqlistviewitem.html">TQListViewItem</a>, <a href="tqcustommenuitem.html">TQCustomMenuItem</a>, <a href="tqpen.html">TQPen</a>, <a href="tqstylesheetitem.html">TQStyleSheetItem</a>, <a href="tqsyntaxhighlighter.html">TQSyntaxHighlighter</a>, <a href="tqtab.html">TQTab</a>, <a href="tqtableitem.html">TQTableItem</a>, <a href="tqthread.html">TQThread</a>, <a href="tqtooltip.html">TQToolTip</a>, and <a href="tqwhatsthis.html">TQWhatsThis</a>. -<p><a href="qt-members.html">List of all member functions.</a> +<p><a href="tqt-members.html">List of all member functions.</a> <h2>Public Members</h2> <ul> <li class=fn>enum <a href="#ButtonState-enum"><b>ButtonState</b></a> { NoButton = 0x0000, LeftButton = 0x0001, RightButton = 0x0002, MidButton = 0x0004, MouseButtonMask = 0x0007, ShiftButton = 0x0100, ControlButton = 0x0200, AltButton = 0x0400, MetaButton = 0x0800, KeyButtonMask = 0x0f00, Keypad = 0x4000 }</li> diff --git a/doc/html/tqwindowsstyle-h.html b/doc/html/tqwindowsstyle-h.html index 376c18139..f0f736adc 100644 --- a/doc/html/tqwindowsstyle-h.html +++ b/doc/html/tqwindowsstyle-h.html @@ -83,13 +83,13 @@ body { background: #ffffff; color: black; } #if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_WINDOWS +#define TQ_EXPORT_STYLE_WINDOWS #else -#define Q_EXPORT_STYLE_WINDOWS TQ_EXPORT +#define TQ_EXPORT_STYLE_WINDOWS TQ_EXPORT #endif -class Q_EXPORT_STYLE_WINDOWS TQWindowsStyle : public TQCommonStyle +class TQ_EXPORT_STYLE_WINDOWS TQWindowsStyle : public TQCommonStyle { TQ_OBJECT public: diff --git a/doc/man/man3/tqstyle.3qt b/doc/man/man3/tqstyle.3qt index 6d1d18a8b..194a2e6ac 100644 --- a/doc/man/man3/tqstyle.3qt +++ b/doc/man/man3/tqstyle.3qt @@ -454,7 +454,7 @@ This enum represents the PrimitiveElements of a style. A PrimitiveElement is a c .TP \fCTQStyle::PE_ScrollBarSubLine\fR - scrollbar line decrease indicator (i.e. scroll up). .TP -\fCTQStyle::PE_ScrollBarAddPage\fR - scolllbar page increase indicator (i.e. page down). +\fCTQStyle::PE_ScrollBarAddPage\fR - scrollbar page increase indicator (i.e. page down). .TP \fCTQStyle::PE_ScrollBarSubPage\fR - scrollbar page decrease indicator (i.e. page up). .TP @@ -582,7 +582,7 @@ This enum represents a StyleHint. A StyleHint is a general look and/or feel hint .TP \fCTQStyle::SH_ListViewExpand_SelectMouseType\fR - which type of mouse event should cause a listview expansion to be selected. .TP -\fCTQStyle::SH_TabBar_PreferNoArrows\fR - whether a tabbar should suggest a size to prevent scoll arrows. +\fCTQStyle::SH_TabBar_PreferNoArrows\fR - whether a tabbar should suggest a size to prevent scroll arrows. .TP \fCTQStyle::SH_ComboBox_Popup\fR - allows popups as a combobox dropdown menu. .TP diff --git a/mkspecs/macx-mwerks/README b/mkspecs/macx-mwerks/README deleted file mode 100644 index d17b9811a..000000000 --- a/mkspecs/macx-mwerks/README +++ /dev/null @@ -1,2 +0,0 @@ -This Metrowerks mkspecs is included for historical purposes. It is -UNSUPPORTED, untested, and not known to work. diff --git a/mkspecs/macx-mwerks/mwerkstmpl.xml b/mkspecs/macx-mwerks/mwerkstmpl.xml deleted file mode 100644 index b743a2952..000000000 --- a/mkspecs/macx-mwerks/mwerkstmpl.xml +++ /dev/null @@ -1,826 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<?codewarrior exportversion="1.0.1" ideversion="4.2" ?> - -<!DOCTYPE PROJECT [ -<!ELEMENT PROJECT (TARGETLIST, TARGETORDER, GROUPLIST, DESIGNLIST?)> -<!ELEMENT TARGETLIST (TARGET+)> -<!ELEMENT TARGET (NAME, SETTINGLIST, FILELIST?, LINKORDER?, SEGMENTLIST?, OVERLAYGROUPLIST?, SUBTARGETLIST?, SUBPROJECTLIST?, FRAMEWORKLIST)> -<!ELEMENT NAME (#PCDATA)> -<!ELEMENT USERSOURCETREETYPE (#PCDATA)> -<!ELEMENT PATH (#PCDATA)> -<!ELEMENT FILELIST (FILE*)> -<!ELEMENT FILE (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?, ROOTFILEREF?, FILEKIND?, FILEFLAGS?)> -<!ELEMENT PATHTYPE (#PCDATA)> -<!ELEMENT PATHROOT (#PCDATA)> -<!ELEMENT ACCESSPATH (#PCDATA)> -<!ELEMENT PATHFORMAT (#PCDATA)> -<!ELEMENT ROOTFILEREF (PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)> -<!ELEMENT FILEKIND (#PCDATA)> -<!ELEMENT FILEFLAGS (#PCDATA)> -<!ELEMENT FILEREF (TARGETNAME?, PATHTYPE, PATHROOT?, ACCESSPATH?, PATH, PATHFORMAT?)> -<!ELEMENT TARGETNAME (#PCDATA)> -<!ELEMENT SETTINGLIST ((SETTING|PANELDATA)+)> -<!ELEMENT SETTING (NAME?, (VALUE|(SETTING+)))> -<!ELEMENT PANELDATA (NAME, VALUE)> -<!ELEMENT VALUE (#PCDATA)> -<!ELEMENT LINKORDER (FILEREF*)> -<!ELEMENT SEGMENTLIST (SEGMENT+)> -<!ELEMENT SEGMENT (NAME, ATTRIBUTES?, FILEREF*)> -<!ELEMENT ATTRIBUTES (#PCDATA)> -<!ELEMENT OVERLAYGROUPLIST (OVERLAYGROUP+)> -<!ELEMENT OVERLAYGROUP (NAME, BASEADDRESS, OVERLAY*)> -<!ELEMENT BASEADDRESS (#PCDATA)> -<!ELEMENT OVERLAY (NAME, FILEREF*)> -<!ELEMENT SUBTARGETLIST (SUBTARGET+)> -<!ELEMENT SUBTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)> -<!ELEMENT SUBPROJECTLIST (SUBPROJECT+)> -<!ELEMENT SUBPROJECT (FILEREF, SUBPROJECTTARGETLIST)> -<!ELEMENT SUBPROJECTTARGETLIST (SUBPROJECTTARGET*)> -<!ELEMENT SUBPROJECTTARGET (TARGETNAME, ATTRIBUTES?, FILEREF?)> -<!ELEMENT FRAMEWORKLIST (FRAMEWORK+)> -<!ELEMENT FRAMEWORK (FILEREF, LIBRARYFILE?, VERSION?)> -<!ELEMENT LIBRARYFILE (FILEREF)> -<!ELEMENT VERSION (#PCDATA)> -<!ELEMENT TARGETORDER (ORDEREDTARGET|ORDEREDDESIGN)*> -<!ELEMENT ORDEREDTARGET (NAME)> -<!ELEMENT ORDEREDDESIGN (NAME, ORDEREDTARGET+)> -<!ELEMENT GROUPLIST (GROUP|FILEREF)*> -<!ELEMENT GROUP (NAME, (GROUP|FILEREF)*)> -<!ELEMENT DESIGNLIST (DESIGN+)> -<!ELEMENT DESIGN (NAME, DESIGNDATA)> -<!ELEMENT DESIGNDATA (#PCDATA)> -]> - -<PROJECT> - <TARGETLIST> - <TARGET> - <NAME>$$TARGET_STEM</NAME> - <SETTINGLIST> - - <!-- Settings for "Source Trees" panel --> - <SETTING><NAME>UserSourceTrees</NAME><VALUE></VALUE></SETTING> - - <!-- Settings for "Access Paths" panel --> - <SETTING><NAME>AlwaysSearchUserPaths</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>InterpretDOSAndUnixPaths</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>RequireFrameworkStyleIncludes</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>UserSearchPaths</NAME> - <SETTING> - <SETTING><NAME>SearchPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING> - </SETTING> - <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING> - </SETTING> - </SETTING> - <SETTING><NAME>SystemSearchPaths</NAME> - <SETTING> - <SETTING><NAME>SearchPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>:usr:include:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>OS X Volume</VALUE></SETTING> - </SETTING> - <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>SearchPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>:usr:include:sys:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>OS X Volume</VALUE></SETTING> - </SETTING> - <SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>SearchPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>:MSL:MSL_C:MSL_MacOS:Include:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING> - </SETTING> - <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>SearchPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>:MSL:MSL_C++:MSL_Common:Include:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING> - </SETTING> - <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>SearchPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>:MSL:MSL_C:MSL_Common:Include:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING> - </SETTING> - <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING> - </SETTING> -$$CODEWARRIOR_DEPENDPATH -$$CODEWARRIOR_INCLUDEPATH - <SETTING> - <SETTING><NAME>SearchPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>:usr:lib:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>OS X Volume</VALUE></SETTING> - </SETTING> - <SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>SearchPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>:MacOS X Support:Libraries:Runtime:Libs:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING> - </SETTING> - <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>SearchPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>:MSL:MSL_C++:MSL_MacOS:Lib:Mach-O:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING> - </SETTING> - <SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING> - </SETTING> -$$CODEWARRIOR_FRAMEWORKPATH - </SETTING> - - - <!-- Settings for "Debugger Runtime" panel --> - <SETTING><NAME>MWRuntimeSettings_WorkingDirectory</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWRuntimeSettings_CommandLine</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWRuntimeSettings_HostApplication</NAME> - <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING> - </SETTING> - <SETTING><NAME>MWRuntimeSettings_EnvVars</NAME> - <SETTING><VALUE>TQTDIR=$$CODEWARRIOR_TQTDIR</VALUE></SETTING> - </SETTING> - - <!-- Settings for "Target Settings" panel --> - <SETTING><NAME>Linker</NAME><VALUE>$$CODEWARRIOR_LINKER</VALUE></SETTING> - <SETTING><NAME>PreLinker</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>PostLinker</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Targetname</NAME><VALUE>$$TARGET_STEM</VALUE></SETTING> - <SETTING><NAME>OutputDirectory</NAME> -$$CODEWARRIOR_OUTPUT_DIR - </SETTING> - <SETTING><NAME>SaveEntriesUsingRelativePaths</NAME><VALUE>false</VALUE></SETTING> - - <!-- Settings for "File Mappings" panel --> - <SETTING><NAME>FileMappings</NAME> -<!-- - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.mocs</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>McMoc</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.uics</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>McMoc</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> ---> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>APPL</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>Appl</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>MDYL</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>Lib Import Mach-O</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>MLIB</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>Lib Import Mach-O</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>MMLB</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>Lib Import Mach-O</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>MPLF</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>Lib Import Mach-O</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>MWCD</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>RSRC</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.c</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ MachPPC</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.c++</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ MachPPC</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.cc</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ MachPPC</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.cp</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ MachPPC</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.cpp</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ MachPPC</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.exp</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.h</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ MachPPC</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.pch</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ MachPPC</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.pch++</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ MachPPC</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.r</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE>Rez</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>docu</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>rsrc</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>Rez</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.doc</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.lib</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>Lib Import Mach-O</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>shlb</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>PEF Import PPC</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.dylib</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>Lib Import Mach-O</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>false</VALUE></SETTING> - </SETTING> - <SETTING> - <SETTING><NAME>FileType</NAME><VALUE>TEXT</VALUE></SETTING> - <SETTING><NAME>FileExtension</NAME><VALUE>.moc</VALUE></SETTING> - <SETTING><NAME>Compiler</NAME><VALUE>MW C/C++ MachPPC</VALUE></SETTING> - <SETTING><NAME>EditLanguage</NAME><VALUE>C/C++</VALUE></SETTING> - <SETTING><NAME>Precompile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Launchable</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourceFile</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>IgnoredByMake</NAME><VALUE>true</VALUE></SETTING> - </SETTING> - </SETTING> - - <!-- Settings for "Build Extras" panel --> - <SETTING><NAME>CacheModDates</NAME><VALUE>$$CODEWARRIOR_CACHEMODDATES</VALUE></SETTING> - <SETTING><NAME>ActivateBrowser</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>DumpBrowserInfo</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>CacheSubprojects</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>UseThirdPartyDebugger</NAME><VALUE>false</VALUE></SETTING> - - <!-- Settings for "Debugger Target" panel --> - <SETTING><NAME>LogSystemMessages</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>AutoTargetDLLs</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>StopAtWatchpoints</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>PauseWhileRunning</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>PauseInterval</NAME><VALUE>5</VALUE></SETTING> - <SETTING><NAME>PauseUIFlags</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>AltExePath</NAME> - <SETTING><NAME>Path</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>Generic</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>Absolute</VALUE></SETTING> - </SETTING> - <SETTING><NAME>StopAtTempBPOnLaunch</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>CacheSymbolics</NAME><VALUE>true</VALUE></SETTING> - <SETTING><NAME>TempBPFunctionName</NAME><VALUE>main</VALUE></SETTING> - <SETTING><NAME>TempBPType</NAME><VALUE>false</VALUE></SETTING> - - <!-- Settings for "Remote Debug" panel --> - <SETTING><NAME>Enabled</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ConnectionName</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>DownloadPath</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>LaunchRemoteApp</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>RemoteAppPath</NAME><VALUE></VALUE></SETTING> - - <!-- Settings for "Custom Keywords" panel --> - <SETTING><NAME>CustomColor1</NAME> - <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING> - <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING> - </SETTING> - <SETTING><NAME>CustomColor2</NAME> - <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING> - <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING> - </SETTING> - <SETTING><NAME>CustomColor3</NAME> - <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING> - <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING> - </SETTING> - <SETTING><NAME>CustomColor4</NAME> - <SETTING><NAME>Red</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>Green</NAME><VALUE>32767</VALUE></SETTING> - <SETTING><NAME>Blue</NAME><VALUE>0</VALUE></SETTING> - </SETTING> - - <!-- Settings for "PPC CodeGen Mach-O" panel --> - <SETTING><NAME>MWCodeGen_MachO_structalignment</NAME><VALUE>PPC</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_tracebacktables</NAME><VALUE>Inline</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_processor</NAME><VALUE>Generic</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_readonlystrings</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_profiler</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_fpcontract</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_schedule</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_peephole</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_processorspecific</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_altivec</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_vrsave</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_common</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_implicit_templates</NAME><VALUE>1</VALUE></SETTING> - - <!-- Settings for "C/C++ Compiler" panel --> - <SETTING><NAME>MWFrontEnd_C_cplusplus</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_checkprotos</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_arm</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_trigraphs</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>$$CODEWARRIOR_PREFIX_HEADER</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_enableexceptions</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_dontreusestrings</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_poolstrings</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_dontinline</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_useRTTI</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_multibyteaware</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_unsignedchars</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_autoinline</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_booltruefalse</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_direct_to_som</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_som_env_check</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_alwaysinline</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_inlinelevel</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_ecplusplus</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_objective_c</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFrontEnd_C_defer_codegen</NAME><VALUE>0</VALUE></SETTING> - - <!-- Settings for "C/C++ Warnings" panel --> - <SETTING><NAME>MWWarning_C_warn_illpragma</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_warn_emptydecl</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_warn_possunwant</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_warn_unusedvar</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_warn_unusedarg</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_warn_extracomma</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_pedantic</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_warningerrors</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_warn_hidevirtual</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_warn_implicitconv</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_warn_notinlined</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWWarning_C_warn_structclass</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - - <!-- Settings for "FTP Panel" panel --> - <SETTING><NAME>MWFTP_Post_hostName</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_username</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_password</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_remoteDir</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_ftp_PathVersion</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_ftp_PathType</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_ftp_PathFormat</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_ftp_tree</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_uploadDir</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_ftp_port</NAME><VALUE>21</VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_SendBin</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWFTP_Post_ShouldLog</NAME><VALUE>1</VALUE></SETTING> - - <!-- Settings for "MacOS Merge Panel" panel --> - <SETTING><NAME>MWMerge_MacOS_projectType</NAME><VALUE>$$CODEWARRIOR_TEMPLATE</VALUE></SETTING> - <SETTING><NAME>MWMerge_MacOS_outputName</NAME><VALUE>Merge Out</VALUE></SETTING> - <SETTING><NAME>MWMerge_MacOS_outputCreator</NAME><VALUE>CUTE</VALUE></SETTING> - <SETTING><NAME>MWMerge_MacOS_outputType</NAME><VALUE>$$CODEWARRIOR_FILETYPE</VALUE></SETTING> - <SETTING><NAME>MWMerge_MacOS_suppressWarning</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWMerge_MacOS_copyFragments</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWMerge_MacOS_copyResources</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWMerge_MacOS_flattenResource</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWMerge_MacOS_flatFileName</NAME><VALUE>$$TARGET_STEM.rsrc</VALUE></SETTING> - <SETTING><NAME>MWMerge_MacOS_flatFileOutputPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING> - </SETTING> - <SETTING><NAME>MWMerge_MacOS_skipResources</NAME> - <SETTING><VALUE>DLGX</VALUE></SETTING> - <SETTING><VALUE>ckid</VALUE></SETTING> - <SETTING><VALUE>Proj</VALUE></SETTING> - <SETTING><VALUE>WSPC</VALUE></SETTING> - </SETTING> - - <!-- Settings for "Output Flags" panel --> - <SETTING><NAME>FileLocked</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>ResourcesMapIsReadOnly</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>PrinterDriverIsMultiFinderCompatible</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Invisible</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>HasBundle</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>NameLocked</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Stationery</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>HasCustomIcon</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Shared</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>HasBeenInited</NAME><VALUE>false</VALUE></SETTING> - <SETTING><NAME>Label</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>Comments</NAME><VALUE></VALUE></SETTING> - -$$CODEWARRIOR_PACKAGER_PANEL - - <!-- Settings for "PPC CodeGen" panel --> - <SETTING><NAME>MWCodeGen_PPC_structalignment</NAME><VALUE>PPC</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_tracebacktables</NAME><VALUE>None</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_processor</NAME><VALUE>Generic</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_readonlystrings</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_tocdata</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_profiler</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_fpcontract</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_schedule</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_peephole</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_processorspecific</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_altivec</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_vectortocdata</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_PPC_vrsave</NAME><VALUE>1</VALUE></SETTING> - - <!-- Settings for "PPC CodeGen Mach-O" panel --> - <SETTING><NAME>MWCodeGen_MachO_structalignment</NAME><VALUE>PPC</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_tracebacktables</NAME><VALUE>None</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_processor</NAME><VALUE>Generic</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_readonlystrings</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_profiler</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_fpcontract</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_schedule</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_peephole</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_processorspecific</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_altivec</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_vrsave</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_common</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWCodeGen_MachO_implicit_templates</NAME><VALUE>1</VALUE></SETTING> - - <!-- Settings for "PPC Disassembler" panel --> - <SETTING><NAME>MWDisassembler_PPC_showcode</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWDisassembler_PPC_extended</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWDisassembler_PPC_mix</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWDisassembler_PPC_nohex</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWDisassembler_PPC_showdata</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWDisassembler_PPC_showexceptions</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWDisassembler_PPC_showsym</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWDisassembler_PPC_shownames</NAME><VALUE>1</VALUE></SETTING> - - <!-- Settings for "PPC Global Optimizer" panel --> - <SETTING><NAME>GlobalOptimizer_PPC_optimizationlevel</NAME><VALUE>Level0</VALUE></SETTING> - <SETTING><NAME>GlobalOptimizer_PPC_optfor</NAME><VALUE>Speed</VALUE></SETTING> - - <!-- Settings for "PPC Linker" panel --> - <SETTING><NAME>MWLinker_PPC_linksym</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_PPC_symfullpath</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWLinker_PPC_linkmap</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_PPC_nolinkwarnings</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_PPC_dontdeadstripinitcode</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_PPC_permitmultdefs</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_PPC_linkmode</NAME><VALUE>Fast</VALUE></SETTING> - <SETTING><NAME>MWLinker_PPC_initname</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWLinker_PPC_mainname</NAME><VALUE>$$CODEWARRIOR_ENTRYPOINT</VALUE></SETTING> - <SETTING><NAME>MWLinker_PPC_termname</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_twolevelnamespace</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_stripdebugsymbols</NAME><VALUE>0</VALUE></SETTING> - - <!-- Settings for "PPC Mach-O Linker" panel --> - <SETTING><NAME>MWLinker_MachO_exports</NAME><VALUE>All</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_mainname</NAME><VALUE>$$CODEWARRIOR_ENTRYPOINT</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_currentversion</NAME><VALUE>$$CODEWARRIOR_VERSION</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_compatibleversion</NAME><VALUE>$$CODEWARRIOR_VERSION</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_symfullpath</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_supresswarnings</NAME><VALUE>$$!CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_multisymerror</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_prebind</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_objectivecsemantics</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_whichfileloaded</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_whyfileloaded</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_readonlyrelocs</NAME><VALUE>Errors</VALUE></SETTING> - <SETTING><NAME>MWLinker_MachO_undefinedsymbols</NAME><VALUE>Errors</VALUE></SETTING> - - <!-- Settings for "PPC Mach-O Target" panel --> - <SETTING><NAME>MWProject_MachO_type</NAME><VALUE>$$CODEWARRIOR_TEMPLATE</VALUE></SETTING> - <SETTING><NAME>MWProject_MachO_outfile</NAME><VALUE>$$TARGET</VALUE></SETTING> - <SETTING><NAME>MWProject_MachO_filecreator</NAME><VALUE>CUTE</VALUE></SETTING> - <SETTING><NAME>MWProject_MachO_filetype</NAME><VALUE>$$CODEWARRIOR_FILETYPE</VALUE></SETTING> - <SETTING><NAME>MWProject_MachO_stacksize</NAME><VALUE>64</VALUE></SETTING> - <SETTING><NAME>MWProject_MachO_stackaddress</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWProject_MachO_flatrsrc</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWProject_MachO_flatrsrcfilename</NAME><VALUE>$$TARGET_STEM.rsrc</VALUE></SETTING> - <SETTING><NAME>MWProject_MachO_flatrsrcoutputdir</NAME> - <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING> - </SETTING> - - <!-- Settings for "PPC PEF" panel --> - <SETTING><NAME>MWPEF_exports</NAME><VALUE>None</VALUE></SETTING> - <SETTING><NAME>MWPEF_libfolder</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWPEF_sortcode</NAME><VALUE>None</VALUE></SETTING> - <SETTING><NAME>MWPEF_expandbss</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWPEF_sharedata</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWPEF_olddefversion</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWPEF_oldimpversion</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWPEF_currentversion</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWPEF_fragmentname</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWPEF_collapsereloads</NAME><VALUE>1</VALUE></SETTING> - - <!-- Settings for "PPC Project" panel --> - <SETTING><NAME>MWProject_PPC_type</NAME><VALUE>$$CODEWARRIOR_TEMPLATE</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_outfile</NAME><VALUE>$$TARGET</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_filecreator</NAME><VALUE>CUTE</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_filetype</NAME><VALUE>$$FILTYPE</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_size</NAME><VALUE>800</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_minsize</NAME><VALUE>600</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_stacksize</NAME><VALUE>64</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_flags</NAME><VALUE>22720</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_symfilename</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_rsrcname</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_rsrcheader</NAME><VALUE>Native</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_rsrctype</NAME><VALUE>????</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_rsrcid</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_rsrcflags</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_rsrcstore</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_rsrcmerge</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_flatrsrc</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWProject_PPC_flatrsrcoutputdir</NAME> - <SETTING><NAME>Path</NAME><VALUE>:</VALUE></SETTING> - <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> - <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING> - </SETTING> - <SETTING><NAME>MWProject_PPC_flatrsrcfilename</NAME><VALUE></VALUE></SETTING> - - <!-- Settings for "PPCAsm Panel" panel --> - <SETTING><NAME>MWAssembler_PPC_auxheader</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWAssembler_PPC_symmode</NAME><VALUE>Mac</VALUE></SETTING> - <SETTING><NAME>MWAssembler_PPC_dialect</NAME><VALUE>PPC</VALUE></SETTING> - <SETTING><NAME>MWAssembler_PPC_prefixfile</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWAssembler_PPC_typecheck</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWAssembler_PPC_warnings</NAME><VALUE>0</VALUE></SETTING> - <SETTING><NAME>MWAssembler_PPC_casesensitive</NAME><VALUE>0</VALUE></SETTING> - - <!-- Settings for "Rez Compiler" panel --> - <SETTING><NAME>MWRez_Language_maxwidth</NAME><VALUE>80</VALUE></SETTING> - <SETTING><NAME>MWRez_Language_script</NAME><VALUE>Roman</VALUE></SETTING> - <SETTING><NAME>MWRez_Language_alignment</NAME><VALUE>Align1</VALUE></SETTING> - <SETTING><NAME>MWRez_Language_filtermode</NAME><VALUE>FilterSkip</VALUE></SETTING> - <SETTING><NAME>MWRez_Language_suppresswarnings</NAME><VALUE>$$CODEWARRIOR_WARNING</VALUE></SETTING> - <SETTING><NAME>MWRez_Language_escapecontrolchars</NAME><VALUE>1</VALUE></SETTING> - <SETTING><NAME>MWRez_Language_prefixname</NAME><VALUE></VALUE></SETTING> - <SETTING><NAME>MWRez_Language_filteredtypes</NAME><VALUE>'CODE' 'DATA' 'PICT'</VALUE></SETTING> - </SETTINGLIST> - <FILELIST> -$$CODEWARRIOR_QPREPROCESS -$$CODEWARRIOR_QPREPROCESSOUT -$$CODEWARRIOR_LIBRARIES -$$CODEWARRIOR_SOURCES -$$CODEWARRIOR_HEADERS - <FILE> - <PATHTYPE>Name</PATHTYPE> - <PATH>MSL_C++_Mach-O.a</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Library</FILEKIND> - <FILEFLAGS>Debug</FILEFLAGS> - </FILE> - <FILE> - <PATHTYPE>Name</PATHTYPE> - <PATH>MSL_Runtime_Mach-O.a</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Library</FILEKIND> - <FILEFLAGS>Debug</FILEFLAGS> - </FILE> - </FILELIST> - <LINKORDER> -$$CODEWARRIOR_QPREPROCESS_LINKORDER -$$CODEWARRIOR_SOURCES_LINKORDER -$$CODEWARRIOR_HEADERS_LINKORDER -$$CODEWARRIOR_LIBRARIES_LINKORDER -$$CODEWARRIOR_QPREPROCESSOUT_LINKORDER - <FILEREF> - <PATHTYPE>Name</PATHTYPE> - <PATH>MSL_C++_Mach-O.a</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <PATHTYPE>Name</PATHTYPE> - <PATH>MSL_Runtime_Mach-O.a</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - </LINKORDER> - <FRAMEWORKLIST> -$$CODEWARRIOR_FRAMEWORKS - </FRAMEWORKLIST> - </TARGET> - </TARGETLIST> - - <TARGETORDER> - <ORDEREDTARGET><NAME>$$TARGET_STEM</NAME></ORDEREDTARGET> - </TARGETORDER> - - <GROUPLIST> - <GROUP><NAME>Sources</NAME> -$$CODEWARRIOR_HEADERS_GROUP -$$CODEWARRIOR_SOURCES_GROUP - </GROUP> - <GROUP><NAME>Libraries</NAME> -$$CODEWARRIOR_LIBRARIES_GROUP - <FILEREF> - <TARGETNAME>$$TARGET_STEM</TARGETNAME> - <PATHTYPE>Name</PATHTYPE> - <PATH>MSL_C++_Mach-O.a</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <TARGETNAME>$$TARGET_STEM</TARGETNAME> - <PATHTYPE>Name</PATHTYPE> - <PATH>MSL_Runtime_Mach-O.a</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - </GROUP> - <GROUP><Name>QtGenerated</NAME> -$$CODEWARRIOR_QPREPROCESS_GROUP -$$CODEWARRIOR_QPREPROCESSOUT_GROUP - </GROUP> - </GROUPLIST> -</PROJECT> - diff --git a/mkspecs/macx-mwerks/qmake.conf b/mkspecs/macx-mwerks/qmake.conf deleted file mode 100644 index ca68c1b08..000000000 --- a/mkspecs/macx-mwerks/qmake.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# -# qmake configuration for macx-mwerks (Mac OS X + Metrowerks compiler) -# - -MAKEFILE_GENERATOR = METROWERKS -TEMPLATE = app -CONFIG += qt release warn_off separate_volume link_prl - -DEFINES += TQT_NO_STL __MACOSX__ __CF_USE_FRAMEWORK_INCLUDES__ - -CODEWARRIOR_LINKER = Mach-O PPC Linker -QMAKE_EXTENSION_SHLIB = dylib -QMAKE_VOLUMENAME = OS X Volume -FRAMEWORKPATH = {System}/Library/Frameworks/ -QMAKE_CRT_OBJECTS = crt1.o -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBS = -framework System -QMAKE_LIBS_QT = -L$(TQTDIR)/lib/ -lqt -QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ - /System/Library/Frameworks/AGL.framework/Headers/ -QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL -QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL diff --git a/mkspecs/macx-mwerks/qplatformdefs.h b/mkspecs/macx-mwerks/qplatformdefs.h deleted file mode 100644 index 1b961b8f7..000000000 --- a/mkspecs/macx-mwerks/qplatformdefs.h +++ /dev/null @@ -1,51 +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 <unistd.h> - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include <pthread.h> -#endif - -#include <dirent.h> -#include <fcntl.h> -#include <grp.h> -#include <pwd.h> -#include <stat.h> -#include <socket.h> -#include <ioctl.h> -#include <wait.h> -#include <signal.h> -#define TQT_NO_LIBRARY_UNLOAD - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not -// included by <resolv.h>. Note that <arpa/nameser.h> must be included -// before <resolv.h>. -#include <nameser.h> -#include <netinet/in.h> -#include <resolv.h> - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE (QT_SIGNAL_RETTYPE (*)(QT_SIGNAL_ARGS))1 - -#define QT_SOCKLEN_T int - -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/reliant-cds-64/qmake.conf b/mkspecs/reliant-cds-64/qmake.conf deleted file mode 100644 index 00b9d870c..000000000 --- a/mkspecs/reliant-cds-64/qmake.conf +++ /dev/null @@ -1,84 +0,0 @@ -# -# -# qmake configuration for reliant-cds-64 -# -# Written for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C. -# - -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 = -Klp64 -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -v -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -KPIC -QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_THREAD = -K pthread - -QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /opt/X/include/X11 -QMAKE_LIBDIR_X11 = /opt/X/lib -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = CC -QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -Klp64 -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -G -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE -QMAKE_LFLAGS_THREAD = -K pthread -QMAKE_RPATH = -Wl,-Brpath= - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -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 = - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = CC -xar -o -QMAKE_RANLIB = - -QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB - -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/reliant-cds-64/qplatformdefs.h b/mkspecs/reliant-cds-64/qplatformdefs.h deleted file mode 100644 index 99fca770b..000000000 --- a/mkspecs/reliant-cds-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 <unistd.h> - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include <pthread.h> -#endif - -#include <dirent.h> -#include <fcntl.h> -#include <grp.h> -#include <pwd.h> -#include <signal.h> -#include <dlfcn.h> - -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/filio.h> -#include <sys/ipc.h> -#include <sys/time.h> -#include <sys/shm.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <sys/wait.h> - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -#include <resolv.h> - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -// on Reliant 5.45 and if __LP64__ *is* defined: -// - socket functions use 'int' -// - if _SOCKLEN_T is defined 'socklen_t' is typedef'ed to 'unsigned int' -// which seems to be wrong so let's always use 'int' instead! -#define QT_SOCKLEN_T int - -#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE-0 >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf deleted file mode 100644 index fd29194ea..000000000 --- a/mkspecs/reliant-cds/qmake.conf +++ /dev/null @@ -1,84 +0,0 @@ -# -# -# qmake configuration for reliant-cds -# -# Written for Reliant UNIX 5.45 using the CDS++ C/C++ compiler V2.0C. -# - -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 = -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -v -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -KPIC -QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_THREAD = -K pthread - -QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /opt/X/include/X11 -QMAKE_LIBDIR_X11 = /opt/X/lib -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = CC -QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -G -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE -QMAKE_LFLAGS_THREAD = -K pthread -QMAKE_RPATH = -Wl,-Brpath= - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -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 = - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = CC -xar -o -QMAKE_RANLIB = - -QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB - -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/reliant-cds/qplatformdefs.h b/mkspecs/reliant-cds/qplatformdefs.h deleted file mode 100644 index 718c7f4b8..000000000 --- a/mkspecs/reliant-cds/qplatformdefs.h +++ /dev/null @@ -1,62 +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 <unistd.h> - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include <pthread.h> -#endif - -#include <dirent.h> -#include <fcntl.h> -#include <grp.h> -#include <pwd.h> -#include <signal.h> -#include <dlfcn.h> - -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/filio.h> -#include <sys/ipc.h> -#include <sys/time.h> -#include <sys/shm.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <sys/wait.h> - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -#include <resolv.h> - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -// on Reliant 5.45 and if __LP64__ is *not* defined: -// - socket functions use 'size_t' -// - if _SOCKLEN_T is defined 'socklen_t' is typedef'ed to 'size_t' -// note that 'size_t' would always be a good choice in this context -#if defined(_SOCKLEN_T) -# define QT_SOCKLEN_T socklen_t -#else -# define QT_SOCKLEN_T size_t -#endif - -#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE-0 >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf deleted file mode 100644 index 479b7e440..000000000 --- a/mkspecs/sco-cc/qmake.conf +++ /dev/null @@ -1,78 +0,0 @@ -# -# -# qmake configuration for sco-cc -# -# Written for SCO OpenServer with UDK. -# -# -Wf,--diag_suppress,838 -# turns off warning about missing return types in X headers -# - -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 = -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -KPIC -QMAKE_CFLAGS_YACC = -Wf,--diag_suppress,111 -Wf,--diag_suppress,177 - -QMAKE_CXX = CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -Wf,--display_error_number -Wf,--diag_suppress,838 -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -Tused -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 = -QMAKE_LIBDIR_X11 = /usr/X/lib -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = CC -QMAKE_LINK_SHLIB = CC -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -G -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_QT = -lqt - -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar cq -QMAKE_RANLIB = - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h deleted file mode 100644 index 0f0fd0c5c..000000000 --- a/mkspecs/sco-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 <unistd.h> - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include <pthread.h> -#endif - -#include <dirent.h> -#include <fcntl.h> -#include <grp.h> -#include <pwd.h> -#include <signal.h> -#include <dlfcn.h> - -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/filio.h> -#include <sys/ipc.h> -#include <sys/time.h> -#include <sys/shm.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <sys/wait.h> - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// On Unixware header files <netinet/in.h> and <arpa/nameser.h> are not -// included by <resolv.h>. Note that <arpa/nameser.h> must be included -// before <resolv.h>. -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h> - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T size_t - -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf deleted file mode 100644 index 0bc7616a1..000000000 --- a/mkspecs/sco-g++/qmake.conf +++ /dev/null @@ -1,75 +0,0 @@ -# -# -# qmake configuration for sco-g++ -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl - -QMAKE_CC = gcc -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -W -QMAKE_CFLAGS_WARN_OFF = -w -QMAKE_CFLAGS_RELEASE = -O2 -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -fPIC -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - -QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -G -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME = -h$$LITERAL_WHITESPACE -QMAKE_RPATH = - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lm -QMAKE_LIBS_QT = -lqt - -QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -QMAKE_LIBS_OPENGL_QT = -lGL -lXmu - -QMAKE_MOC = $(TQTDIR)/bin/tqmoc -QMAKE_UIC = $(TQTDIR)/bin/tquic - -QMAKE_AR = ar 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/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h deleted file mode 100644 index 12d956f4b..000000000 --- a/mkspecs/sco-g++/qplatformdefs.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef TQPLATFORMDEFS_H -#define TQPLATFORMDEFS_H - -// Get TQt defines/settings - -#include "tqglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -// This is to have PATH_MAX defined in <limits.h> -#ifndef _IBCS2 -# define _IBCS2 -#endif - -#include <unistd.h> - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include <pthread.h> -#endif - -#include <dirent.h> -#include <fcntl.h> -#include <grp.h> -#include <pwd.h> -#include <signal.h> -#include <dlfcn.h> - -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/ipc.h> -#include <sys/time.h> -#include <sys/shm.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <sys/wait.h> - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -// On Unixware header files <netinet/in.h> and <arpa/nameser.h> are not -// included by <resolv.h>. Note that <arpa/nameser.h> must be included -// before <resolv.h>. -#include <netinet/in.h> -#define class r_class // SCO OpenServer 5.0.6 -#include <arpa/nameser.h> -#undef class -#include <resolv.h> - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#define QT_SOCKLEN_T int - -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf - -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf deleted file mode 100644 index 2f8b8f54d..000000000 --- a/mkspecs/tru64-cxx/qmake.conf +++ /dev/null @@ -1,80 +0,0 @@ -# -# -# tmake configuration for tru64-cxx -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release link_prl plugin_no_soname - -QMAKE_CC = cxx -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = -O2 -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -QMAKE_CFLAGS_YACC = -Olimit 1000 -QMAKE_CFLAGS_THREAD = -pthread - -QMAKE_CXX = cxx -QMAKE_CXXFLAGS = -x cxx $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = cxx -QMAKE_LINK_SHLIB = cxx -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_THREAD = -pthread -QMAKE_LFLAGS_SONAME = -soname$$LITERAL_WHITESPACE -QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE - -QMAKE_LIBS = -lm -QMAKE_LIBS_DYNLOAD = -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 = -lrt - -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/tru64-cxx/qplatformdefs.h b/mkspecs/tru64-cxx/qplatformdefs.h deleted file mode 100644 index 0a7f6673f..000000000 --- a/mkspecs/tru64-cxx/qplatformdefs.h +++ /dev/null @@ -1,67 +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 <unistd.h> - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include <pthread.h> -#endif - -#include <dirent.h> -#include <fcntl.h> -#include <grp.h> -#include <pwd.h> -#include <signal.h> -#include <dlfcn.h> - -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/ipc.h> -#include <sys/time.h> -#include <sys/select.h> -#include <sys/shm.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <sys/wait.h> - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -#include <resolv.h> - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#if defined(_XOPEN_SOURCE) && defined(_OSF_SOURCE) -// Not available in the <unistd.h> header file of Tru64 4.0F. -// Fixed in the <unistd.h> header of Tru64 5.0A so we copy/paste from there... -extern "C" int usleep(useconds_t); -#endif - -#if defined(_POSIX_PII_SOCKET) -#define QT_SOCKLEN_T socklen_t -#elif defined(_XOPEN_SOURCE_EXTENDED) -#define QT_SOCKLEN_T size_t -#else -#define QT_SOCKLEN_T int -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 400) -// trying to detect Tru64 5.0 and better... -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - - -#endif // TQPLATFORMDEFS_H diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf deleted file mode 100644 index f92e1aec0..000000000 --- a/mkspecs/tru64-g++/qmake.conf +++ /dev/null @@ -1,80 +0,0 @@ -# -# -# qmake configuration for tru64-g++ -# - -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_REENTRANT - -QMAKE_CXX = g++ -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_TQT = $(TQTDIR)/include -QMAKE_LIBDIR_TQT = $(TQTDIR)/lib -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS = -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -shared -QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_THREAD = -QMAKE_LFLAGS_SONAME = -Wl,-soname, -QMAKE_RPATH = -Wl,-rpath, - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -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 -lexc -lrt - -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/tru64-g++/qplatformdefs.h b/mkspecs/tru64-g++/qplatformdefs.h deleted file mode 100644 index 6e91b1e20..000000000 --- a/mkspecs/tru64-g++/qplatformdefs.h +++ /dev/null @@ -1,67 +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 <unistd.h> - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#ifdef TQT_THREAD_SUPPORT -#include <pthread.h> -#endif - -#include <dirent.h> -#include <fcntl.h> -#include <grp.h> -#include <pwd.h> -#include <signal.h> -#include <dlfcn.h> - -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/ipc.h> -#include <sys/time.h> -#include <sys/select.h> -#include <sys/shm.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <sys/wait.h> - -// DNS header files are not fully covered by X/Open specifications. -// In particular nothing is said about res_* :/ -#include <resolv.h> - - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#if defined(_XOPEN_SOURCE) && defined(_OSF_SOURCE) -// Not available in the <unistd.h> header file of Tru64 4.0F. -// Fixed in the <unistd.h> header of Tru64 5.0A so we copy/paste from there... -extern "C" int usleep(useconds_t); -#endif - -#if defined(_POSIX_PII_SOCKET) -# define QT_SOCKLEN_T socklen_t -#elif defined(_XOPEN_SOURCE_EXTENDED) -# define QT_SOCKLEN_T size_t -#else -# define QT_SOCKLEN_T int -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE-0 >= 400) -// trying to detect Tru64 5.0 and better... -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - - -#endif // TQPLATFORMDEFS_H diff --git a/plugins/src/accessible/widgets/main.cpp b/plugins/src/accessible/widgets/main.cpp index 4895a4036..184e2acb2 100644 --- a/plugins/src/accessible/widgets/main.cpp +++ b/plugins/src/accessible/widgets/main.cpp @@ -220,7 +220,7 @@ bool AccessibleFactory::canUnload() const return (TQAccessibleWidget::objects == 0); } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( AccessibleFactory ) } diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 175c7cf9c..0eb2661da 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -1,7 +1,7 @@ #tqmake code OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \ mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \ - winmakefile.o projectgenerator.o metrowerks_xml.o pbuilder_pbx.o \ + winmakefile.o projectgenerator.o pbuilder_pbx.o \ msvc_objectmodel.o meta.o qtmd5.o #qt code @@ -14,7 +14,7 @@ QOBJS=tqstring.o tqtextstream.o tqiodevice.o tqglobal.o tqgdict.o tqcstring.o \ #all sources, used for the depend target DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \ generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp \ - generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \ + generators/win32/winmakefile.cpp generators/projectgenerator.cpp \ generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \ @SOURCE_PATH@/src/tools/tqstring.cpp @SOURCE_PATH@/src/tools/tqtextstream.cpp \ @SOURCE_PATH@/src/tools/tqiodevice.cpp @SOURCE_PATH@/src/tools/tqglobal.cpp \ @@ -195,9 +195,6 @@ msvc_vcproj.o: generators/win32/msvc_vcproj.cpp msvc_nmake.o: generators/win32/msvc_nmake.cpp $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_nmake.cpp -metrowerks_xml.o: generators/mac/metrowerks_xml.cpp - $(CXX) -c -o $@ $(CXXFLAGS) generators/mac/metrowerks_xml.cpp - pbuilder_pbx.o: generators/mac/pbuilder_pbx.cpp $(CXX) -c -o $@ $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 7dff21a06..515cfc458 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -16,7 +16,7 @@ ADDCLEAN = #tqmake code OBJS=project.o main.o makefile.o unixmake.o unixmake2.o mingw_make.o \ msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o projectgenerator.o \ - metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o + pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o #qt code QTOBJS=tqstring.o tquuid.o tqtextstream.o tqiodevice.o tqglobal.o tqgdict.o tqcstring.o tqdatastream.o \ @@ -190,8 +190,5 @@ option.o: option.cpp option.h projectgenerator.o: generators/projectgenerator.cpp $(CXX) $(CXXFLAGS) generators/projectgenerator.cpp -metrowerks_xml.o: generators/mac/metrowerks_xml.cpp - $(CXX) $(CXXFLAGS) generators/mac/metrowerks_xml.cpp - pbuilder_pbx.o: generators/mac/pbuilder_pbx.cpp $(CXX) $(CXXFLAGS) generators/mac/pbuilder_pbx.cpp diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf index 5182be521..e8199f97f 100644 --- a/qmake/book/qmake-install.leaf +++ b/qmake/book/qmake-install.leaf @@ -22,14 +22,14 @@ 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 unixware7-g++ -aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ -aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ win32-g++ -bsdi-g++ hpux-o64 linux-icc qnx-g++ tru64-cxx win32-msvc -dgux-g++ hurd-g++ linux-kcc reliant-64 tru64-g++ win32-watc -freebsd-g++ irix-64 macx-pbuilder reliant-cds ultrix-g++ win32-visa -hpux-acc irix-g++ macx-g++ sco-g++ unixware-g -hpux-acc irix-n32 solaris-64 unixware7-cc +aix-64 hpux-cc irix-032 netbsd-g++ solaris-cc +aix-g++ hpux-g++ linux-cxx openbsd-g++ solaris-g++ +aix-xlc hpux-n64 linux-g++ openunix-cc sunos-g++ +bsdi-g++ hpux-o64 linux-icc qnx-g++ win32-msvc +dgux-g++ hurd-g++ linux-kcc unixware7-g++ win32-visa +freebsd-g++ irix-64 macx-pbuilder ultrix-g++ win32-g++ +hpux-acc irix-g++ macx-g++ unixware-g win32-watc +hpux-acc irix-n32 solaris-64 unixware7-cc \i TQTDIR \BR This must be set to where TQt is (or will be) installed. For example, \e {c:\\qt} and \e {\\local\\qt} diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp deleted file mode 100644 index 83e917bdf..000000000 --- a/qmake/generators/mac/metrowerks_xml.cpp +++ /dev/null @@ -1,822 +0,0 @@ -/**************************************************************************** -** -** Implementation of MetrowerksMakefileGenerator class. -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of qmake. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.TQPL -** included in the packaging of this file. Licensees holding valid TQt -** Commercial licenses may use this file in accordance with the TQt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#include "metrowerks_xml.h" -#include "option.h" -#include <tqdir.h> -#include <tqdict.h> -#include <tqregexp.h> -#include <stdlib.h> -#include <time.h> -#if defined(Q_OS_MAC) -#include <Carbon/Carbon.h> -#include <sys/types.h> -#include <sys/stat.h> -#endif - -MetrowerksMakefileGenerator::MetrowerksMakefileGenerator(TQMakeProject *p) : MakefileGenerator(p), init_flag(FALSE) -{ - -} - -bool -MetrowerksMakefileGenerator::writeMakefile(TQTextStream &t) -{ - if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { - /* for now just dump, I need to generated an empty xml or something.. */ - fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", - var("QMAKE_FAILED_REQUIREMENTS").latin1()); - return TRUE; - } - - if(project->first("TEMPLATE") == "app" || - project->first("TEMPLATE") == "lib") { - return writeMakeParts(t); - } - else if(project->first("TEMPLATE") == "subdirs") { - writeHeader(t); - tqDebug("Not supported!"); - return TRUE; - } - return FALSE; -} - -bool -MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) -{ - //..grrr.. libs! - TQStringList extra_objs; - bool do_libs = TRUE; - if(project->first("TEMPLATE") == "app") - extra_objs += project->variables()["QMAKE_CRT_OBJECTS"]; - else if(project->first("TEMPLATE") == "lib" && project->isActiveConfig("staticlib")) - do_libs = FALSE; - if(do_libs) - extra_objs += project->variables()["QMAKE_LIBS"]; - for(TQStringList::Iterator val_it = extra_objs.begin(); - val_it != extra_objs.end(); ++val_it) { - if((*val_it).startsWith("-L")) { - TQString dir((*val_it).right((*val_it).length() - 2)); - fixEnvVariables(dir); - if(project->variables()["DEPENDPATH"].findIndex(dir) == -1 && - project->variables()["INCLUDEPATH"].findIndex(dir) == -1) - project->variables()["INCLUDEPATH"].append(dir); - } else if((*val_it).startsWith("-l")) { - TQString lib("lib" + (*val_it).right((*val_it).length() - 2) + "." + - project->first("QMAKE_EXTENSION_SHLIB")); - if(project->variables()["LIBRARIES"].findIndex(lib) == -1) - project->variables()["LIBRARIES"].append(lib); - } else - if((*val_it) == "-framework") { - ++val_it; - if(val_it == extra_objs.end()) - break; - TQString frmwrk = (*val_it) + ".framework"; - if(project->variables()["FRAMEWORKS"].findIndex(frmwrk) == -1) - project->variables()["FRAMEWORKS"].append(frmwrk); - } else if((*val_it).left(1) != "-") { - TQString lib=(*val_it); - int s = lib.findRev('/'); - if(s != -1) { - TQString dir = lib.left(s); - lib = lib.right(lib.length() - s - 1); - fixEnvVariables(dir); - if(project->variables()["DEPENDPATH"].findIndex(dir) == -1 && - project->variables()["INCLUDEPATH"].findIndex(dir) == -1) - project->variables()["INCLUDEPATH"].append(dir); - } - project->variables()["LIBRARIES"].append(lib); - } - } - //let metrowerks find the files & set the files to the type I expect - TQDict<void> seen(293); - TQString paths[] = { TQString("SRCMOC"), TQString("FORMS"), TQString("UICDECLS"), - TQString("UICIMPLS"), TQString("SOURCES"),TQString("HEADERS"), - TQString::null }; - for(int y = 0; paths[y] != TQString::null; y++) { - TQStringList &l = project->variables()[paths[y]]; - for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) { - //establish file types - seen.insert((*val_it), (void *)1); - createFork((*val_it)); //the file itself - TQStringList &d = findDependencies((*val_it)); //depends - for(TQStringList::Iterator dep_it = d.begin(); dep_it != d.end(); ++dep_it) { - if(!seen.find((*dep_it))) { - seen.insert((*dep_it), (void *)1); - createFork((*dep_it)); - } - } - //now chop it - int s = (*val_it).findRev('/'); - if(s != -1) { - TQString dir = (*val_it).left(s); - (*val_it) = (*val_it).right((*val_it).length() - s - 1); - TQString tmpd=dir, tmpv; - if(fixifyToMacPath(tmpd, tmpv)) { - bool add_in = TRUE; - TQString deps[] = { TQString("DEPENDPATH"), - TQString("INCLUDEPATH"), TQString::null }, - dd, dv; - for(int yy = 0; deps[yy] != TQString::null; yy++) { - TQStringList &l2 = project->variables()[deps[yy]]; - for(TQStringList::Iterator val_it2 = l2.begin(); - val_it2 != l2.end(); ++val_it2) { - TQString dd= (*val_it2), dv; - if(!fixifyToMacPath(dd, dv)) - continue; - if(dd == tmpd && tmpv == dv) { - add_in = FALSE; - break; - } - } - } - if(add_in) - project->variables()["INCLUDEPATH"].append(dir); - } - } - } - } - //need a defines file - if(!project->isEmpty("DEFINES")) { - TQString pre_pref = project->first("TARGET_STEM"); - if(project->first("TEMPLATE") == "lib") - pre_pref += project->isActiveConfig("staticlib") ? "_static" : "_shared"; - project->variables()["CODEWARRIOR_PREFIX_HEADER"].append(pre_pref + "_prefix.h"); - } - - TQString xmlfile = findTemplate(project->first("QMAKE_XML_TEMPLATE")); - TQFile file(xmlfile); - if(!file.open(IO_ReadOnly )) { - fprintf(stderr, "Cannot open XML file: %s\n", - project->first("QMAKE_XML_TEMPLATE").latin1()); - return FALSE; - } - TQTextStream xml(&file); - createFork(Option::output.name()); - - int rep; - TQString line; - while ( !xml.eof() ) { - line = xml.readLine(); - while((rep = line.find(TQRegExp("\\$\\$[!a-zA-Z0-9_-]*"))) != -1) { - TQString torep = line.mid(rep, line.find(TQRegExp("[^\\$!a-zA-Z0-9_-]"), rep) - rep); - TQString variable = torep.right(torep.length()-2); - - t << line.left(rep); //output the left side - line = line.right(line.length() - (rep + torep.length())); //now past the variable - if(variable == "CODEWARRIOR_HEADERS" || variable == "CODEWARRIOR_SOURCES" || - variable == "CODEWARRIOR_LIBRARIES" || variable == "CODEWARRIOR_QPREPROCESS" || - variable == "CODEWARRIOR_QPREPROCESSOUT") { - TQString outcmd=variable.right(variable.length() - variable.findRev('_') - 1); - TQStringList args; - if(outcmd == "TQPREPROCESS") - args << "UICS" << "MOCS"; - else if(outcmd == "TQPREPROCESSOUT") - args << "SRCMOC" << "UICIMPLS" << "UICDELCS"; - else - args << outcmd; - for(TQStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) { - TQString arg = (*arit); - TQString kind = "Text"; - if(arg == "LIBRARIES") - kind = "Library"; - if(!project->variables()[arg].isEmpty()) { - TQStringList &list = project->variables()[arg]; - for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - TQString flag; - if(project->isActiveConfig("debug")) { - bool debug = TRUE; - if(outcmd == "TQPREPROCESS") { - debug = FALSE; - } else { - for(TQStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) { - if((*it).endsWith((*hit))) { - debug = FALSE; - break; - } - } - } - if(debug) - flag = "Debug"; - } - t << "\t\t\t\t<FILE>" << endl - << "\t\t\t\t\t<PATHTYPE>Name</PATHTYPE>" << endl - << "\t\t\t\t\t<PATH>" << (*it) << "</PATH>" << endl - << "\t\t\t\t\t<PATHFORMAT>MacOS</PATHFORMAT>" << endl - << "\t\t\t\t\t<FILEKIND>" << kind << "</FILEKIND>" << endl - << "\t\t\t\t\t<FILEFLAGS>" << flag << "</FILEFLAGS>" << endl - << "\t\t\t\t</FILE>" << endl; - } - } - } - } else if(variable == "CODEWARRIOR_SOURCES_LINKORDER" || - variable == "CODEWARRIOR_HEADERS_LINKORDER" || - variable == "CODEWARRIOR_LIBRARIES_LINKORDER" || - variable == "CODEWARRIOR_QPREPROCESS_LINKORDER" || - variable == "CODEWARRIOR_QPREPROCESSOUT_LINKORDER") { - TQString outcmd=variable.mid(variable.find('_')+1, - variable.findRev('_')-(variable.find('_')+1)); - TQStringList args; - if(outcmd == "TQPREPROCESS") - args << "UICS" << "MOCS"; - else if(outcmd == "TQPREPROCESSOUT") - args << "SRCMOC" << "UICIMPLS" << "UICDELCS"; - else - args << outcmd; - for(TQStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) { - TQString arg = (*arit); - if(!project->variables()[arg].isEmpty()) { - TQStringList &list = project->variables()[arg]; - for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - t << "\t\t\t\t<FILEREF>" << endl - << "\t\t\t\t\t<PATHTYPE>Name</PATHTYPE>" << endl - << "\t\t\t\t\t<PATH>" << (*it) << "</PATH>" << endl - << "\t\t\t\t\t<PATHFORMAT>MacOS</PATHFORMAT>" << endl - << "\t\t\t\t</FILEREF>" << endl; - } - } - } - } else if(variable == "CODEWARRIOR_HEADERS_GROUP" || - variable == "CODEWARRIOR_SOURCES_GROUP" || - variable == "CODEWARRIOR_LIBRARIES_GROUP" || - variable == "CODEWARRIOR_QPREPROCESS_GROUP" || - variable == "CODEWARRIOR_QPREPROCESSOUT_GROUP") { - TQString outcmd = variable.mid(variable.find('_')+1, - variable.findRev('_')-(variable.find('_')+1)); - TQStringList args; - if(outcmd == "TQPREPROCESS") - args << "UICS" << "MOCS"; - else if(outcmd == "TQPREPROCESSOUT") - args << "SRCMOC" << "UICIMPLS" << "UICDELCS"; - else - args << outcmd; - for(TQStringList::Iterator arit = args.begin(); arit != args.end(); ++arit) { - TQString arg = (*arit); - if(!project->variables()[arg].isEmpty()) { - TQStringList &list = project->variables()[arg]; - for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - t << "\t\t\t\t<FILEREF>" << endl - << "\t\t\t\t\t<TARGETNAME>" << var("TARGET_STEM") << "</TARGETNAME>" - << endl - << "\t\t\t\t\t<PATHTYPE>Name</PATHTYPE>" << endl - << "\t\t\t\t\t<PATH>" << (*it) << "</PATH>" << endl - << "\t\t\t\t\t<PATHFORMAT>MacOS</PATHFORMAT>" << endl - << "\t\t\t\t</FILEREF>" << endl; - } - } - } - } else if(variable == "CODEWARRIOR_FRAMEWORKS") { - if(!project->isEmpty("FRAMEWORKS")) { - TQStringList &list = project->variables()["FRAMEWORKS"]; - for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - t << "\t\t\t\t<FRAMEWORK>" << endl - << "\t\t\t\t\t<FILEREF>" << endl - << "\t\t\t\t\t\t<PATHTYPE>Name</PATHTYPE>" << endl - << "\t\t\t\t\t\t<PATH>" << (*it) << "</PATH>" << endl - << "\t\t\t\t\t\t<PATHFORMAT>MacOS</PATHFORMAT>" << endl - << "\t\t\t\t\t</FILEREF>" << endl - << "\t\t\t\t</FRAMEWORK>" << endl; - } - } - } else if(variable == "CODEWARRIOR_DEPENDPATH" || variable == "CODEWARRIOR_INCLUDEPATH" || - variable == "CODEWARRIOR_FRAMEWORKPATH") { - TQString arg=variable.right(variable.length()-variable.find('_')-1); - TQStringList list; - if(arg == "INCLUDEPATH") { - list = project->variables()[arg]; - list << Option::mkfile::qmakespec; - list << TQDir::current().currentDirPath(); - - TQStringList &l = project->variables()["QMAKE_LIBS_PATH"]; - for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) { - TQString p = (*val_it), v; - if(!fixifyToMacPath(p, v)) - continue; - - t << "\t\t\t\t\t<SETTING>" << endl - << "\t\t\t\t\t\t<SETTING><NAME>SearchPath</NAME>" << endl - << "\t\t\t\t\t\t\t<SETTING><NAME>Path</NAME>" - << "<VALUE>" << p << "</VALUE></SETTING>" << endl - << "\t\t\t\t\t\t\t<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>" << endl - << "\t\t\t\t\t\t\t<SETTING><NAME>PathRoot</NAME><VALUE>CodeWarrior</VALUE></SETTING>" << endl - << "\t\t\t\t\t\t</SETTING>" << endl - << "\t\t\t\t\t\t<SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>" << endl - << "\t\t\t\t\t\t<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>" << endl - << "\t\t\t\t\t</SETTING>" << endl; - } - } else if(variable == "DEPENDPATH") { - TQStringList &l = project->variables()[arg]; - for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) - { - //apparently tmake used colon separation... - TQStringList damn = TQStringList::split(':', (*val_it)); - if(!damn.isEmpty()) - list += damn; - else - list.append((*val_it)); - } - } else { - list = project->variables()[arg]; - } - for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - TQString p = (*it), v, recursive = "false", framework = "false"; - if(p.startsWith("recursive--")) { - p = p.right(p.length() - 11); - recursive = "true"; - } - if(!fixifyToMacPath(p, v)) - continue; - if(arg == "FRAMEWORKPATH") - framework = "true"; - - t << "\t\t\t\t\t<SETTING>" << endl - << "\t\t\t\t\t\t<SETTING><NAME>SearchPath</NAME>" << endl - << "\t\t\t\t\t\t\t<SETTING><NAME>Path</NAME>" - << "<VALUE>" << p << "</VALUE></SETTING>" << endl - << "\t\t\t\t\t\t\t<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>" << endl - << "\t\t\t\t\t\t\t<SETTING><NAME>PathRoot</NAME><VALUE>" << v << "</VALUE></SETTING>" << endl - << "\t\t\t\t\t\t</SETTING>" << endl - << "\t\t\t\t\t\t<SETTING><NAME>Recursive</NAME><VALUE>" << recursive << "</VALUE></SETTING>" << endl - << "\t\t\t\t\t\t<SETTING><NAME>FrameworkPath</NAME><VALUE>" << framework << "</VALUE></SETTING>" << endl - << "\t\t\t\t\t\t<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>" << endl - << "\t\t\t\t\t</SETTING>" << endl; - } - } else if(variable == "CODEWARRIOR_WARNING" || variable == "!CODEWARRIOR_WARNING") { - bool b = ((!project->isActiveConfig("warn_off")) && - project->isActiveConfig("warn_on")); - if(variable.startsWith("!")) - b = !b; - t << (int)b; - } else if(variable == "CODEWARRIOR_TEMPLATE") { - if(project->first("TEMPLATE") == "app" ) { - t << "Executable"; - } else if(project->first("TEMPLATE") == "lib") { - if(project->isActiveConfig("staticlib")) - t << "Library"; - else - t << "SharedLibrary"; - } - } else if(variable == "CODEWARRIOR_OUTPUT_DIR") { - TQString outdir = "{Project}/", volume; - if(!project->isEmpty("DESTDIR")) - outdir = project->first("DESTDIR"); - if(project->first("TEMPLATE") == "app" && !project->isActiveConfig("console")) - outdir += var("TARGET") + ".app/Contents/MacOS/"; - if(fixifyToMacPath(outdir, volume, FALSE)) { - t << "\t\t\t<SETTING><NAME>Path</NAME><VALUE>" << outdir << "</VALUE></SETTING>" - << endl - << "\t\t\t<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>" << endl - << "\t\t\t<SETTING><NAME>PathRoot</NAME><VALUE>" << volume << "</VALUE></SETTING>" - << endl; - } - } else if(variable == "CODEWARRIOR_PACKAGER_PANEL") { - if(project->first("TEMPLATE") == "app" && !project->isActiveConfig("console")) { - TQString outdir = "{Project}/", volume; - if(!project->isEmpty("DESTDIR")) - outdir = project->first("DESTDIR"); - outdir += var("TARGET") + ".app"; - if(fixifyToMacPath(outdir, volume, FALSE)) { - t << "\t\t<SETTING><NAME>MWMacOSPackager_UsePackager</NAME>" - << "<VALUE>1</VALUE></SETTING>" << "\n" - << "\t\t<SETTING><NAME>MWMacOSPackager_FolderToPackage</NAME>" << "\n" - << "\t\t\t<SETTING><NAME>Path</NAME><VALUE>" << outdir - << "</VALUE></SETTING>" << "\n" - << "\t\t\t<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>" - << "\n" - << "\t\t\t<SETTING><NAME>PathRoot</NAME><VALUE>" << volume - << "</VALUE></SETTING>" << "\n" - << "\t\t</SETTING>" << "\n" - << "\t\t<SETTING><NAME>MWMacOSPackager_CreateClassicAlias</NAME>" - << "<VALUE>0</VALUE></SETTING>" << "\n" - << "\t\t<SETTING><NAME>MWMacOSPackager_ClassicAliasMethod</NAME>" - << "<VALUE>UseTargetOutput</VALUE></SETTING>" << "\n" - << "\t\t<SETTING><NAME>MWMacOSPackager_ClassicAliasPath</NAME>" - << "<VALUE></VALUE></SETTING>" << "\n" - << "\t\t<SETTING><NAME>MWMacOSPackager_CreatePkgInfo</NAME>" - << "<VALUE>1</VALUE></SETTING>" << "\n" - << "\t\t<SETTING><NAME>MWMacOSPackager_PkgCreatorType</NAME>" - << "<VALUE>CUTE</VALUE></SETTING>" << "\n" - << "\t\t<SETTING><NAME>MWMacOSPackager_PkgFileType</NAME>" - << "<VALUE>APPL</VALUE></SETTING>" << endl; - } - } - } else if(variable == "CODEWARRIOR_FILETYPE") { - if(project->first("TEMPLATE") == "lib") - t << "MYDL"; - else - t << "MEXE"; - } else if(variable == "CODEWARRIOR_TQTDIR") { - t << getenv("TQTDIR"); - } else if(variable == "CODEWARRIOR_CACHEMODDATES") { - t << "true"; - } else { - t << var(variable); - } - } - t << line << endl; - } - t << endl; - file.close(); - - if(tqmocAware()) { - TQString mocs = project->first("MOCS"); - TQFile mocfile(mocs); - if(!mocfile.open(IO_WriteOnly)) { - fprintf(stderr, "Cannot open MOCS file: %s\n", mocs.latin1()); - } else { - createFork(mocs); - TQTextStream mocs(&mocfile); - TQStringList &list = project->variables()["SRCMOC"]; - for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - TQString src = findMocSource((*it)); - if(src.findRev('/') != -1) - src = src.right(src.length() - src.findRev('/') - 1); - mocs << src << endl; - } - mocfile.close(); - } - } - - if(!project->isEmpty("FORMS")) { - TQString uics = project->first("UICS"); - TQFile uicfile(uics); - if(!uicfile.open(IO_WriteOnly)) { - fprintf(stderr, "Cannot open UICS file: %s\n", uics.latin1()); - } else { - createFork(uics); - TQTextStream uics(&uicfile); - TQStringList &list = project->variables()["FORMS"]; - for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - TQString ui = (*it); - if(ui.findRev('/') != -1) - ui = ui.right(ui.length() - ui.findRev('/') - 1); - uics << ui << endl; - } - uicfile.close(); - } - } - - if(!project->isEmpty("CODEWARRIOR_PREFIX_HEADER")) { - TQFile prefixfile(project->first("CODEWARRIOR_PREFIX_HEADER")); - if(!prefixfile.open(IO_WriteOnly)) { - fprintf(stderr, "Cannot open PREFIX file: %s\n", prefixfile.name().latin1()); - } else { - createFork(project->first("CODEWARRIOR_PREFIX_HEADER")); - TQTextStream prefix(&prefixfile); - TQStringList &list = project->variables()["DEFINES"]; - for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - if((*it).find('=') != -1) { - int x = (*it).find('='); - prefix << "#define " << (*it).left(x) << " " << (*it).right((*it).length() - x - 1) << endl; - } else { - prefix << "#define " << (*it) << endl; - } - } - prefixfile.close(); - } - } - return TRUE; -} - - - -void -MetrowerksMakefileGenerator::init() -{ - if(init_flag) - return; - init_flag = TRUE; - - if ( project->isEmpty("QMAKE_XML_TEMPLATE") ) - project->variables()["QMAKE_XML_TEMPLATE"].append("mwerkstmpl.xml"); - - TQStringList &configs = project->variables()["CONFIG"]; - if(project->isActiveConfig("qt")) { - if(configs.findIndex("moc")) configs.append("moc"); - if ( !( (project->first("TARGET") == "qt") || (project->first("TARGET") == "qte") || - (project->first("TARGET") == "tqt-mt") ) ) - project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; - if(configs.findIndex("moc")) - configs.append("moc"); - if ( !project->isActiveConfig("debug") ) - project->variables()["DEFINES"].append("TQT_NO_DEBUG"); - } - - //version handling - if(project->variables()["VERSION"].isEmpty()) - project->variables()["VERSION"].append("1.0." + - (project->isEmpty("VER_PAT") ? TQString("0") : - project->first("VER_PAT")) ); - TQStringList ver = TQStringList::split('.', project->first("VERSION")); - ver << "0" << "0"; //make sure there are three - project->variables()["VER_MAJ"].append(ver[0]); - project->variables()["VER_MIN"].append(ver[1]); - project->variables()["VER_PAT"].append(ver[2]); - - if( !project->isEmpty("LIBS") ) - project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"]; - if( project->variables()["QMAKE_EXTENSION_SHLIB"].isEmpty() ) - project->variables()["QMAKE_EXTENSION_SHLIB"].append( "dylib" ); - - if ( project->isActiveConfig("moc") ) { - TQString mocfile = project->first("TARGET"); - if(project->first("TEMPLATE") == "lib") - mocfile += project->isActiveConfig("staticlib") ? "_static" : "_shared"; - project->variables()["MOCS"].append(mocfile + ".mocs"); - setTQMocAware(TRUE); - } - if(!project->isEmpty("FORMS")) { - TQString uicfile = project->first("TARGET"); - if(project->first("TEMPLATE") == "lib") - uicfile += project->isActiveConfig("staticlib") ? "_static" : "_shared"; - project->variables()["UICS"].append(uicfile + ".uics"); - } - if(project->isEmpty("DESTDIR")) - project->variables()["DESTDIR"].append(TQDir::currentDirPath()); - MakefileGenerator::init(); - - if ( project->isActiveConfig("opengl") ) { - project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_OPENGL"]; - if ( (project->first("TARGET") == "qt") || (project->first("TARGET") == "qte") || - (project->first("TARGET") == "tqt-mt") ) - project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL_QT"]; - else - project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"]; - } - - if(project->isActiveConfig("qt")) - project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"]; - if(project->isEmpty("FRAMEWORKPATH")) - project->variables()["FRAMEWORKPATH"].append("/System/Library/Frameworks/"); - - //set the target up - project->variables()["TARGET_STEM"] = project->variables()["TARGET"]; - if(project->first("TEMPLATE") == "lib") { - if(project->isActiveConfig("staticlib")) - project->variables()["TARGET"].first() = "lib" + project->first("TARGET") + ".lib"; - else - project->variables()["TARGET"].first() = "lib" + project->first("TARGET") + "." + - project->first("QMAKE_EXTENSION_SHLIB"); - - project->variables()["CODEWARRIOR_VERSION"].append(project->first("VER_MAJ") + - project->first("VER_MIN") + - project->first("VER_PAT")); - } else { - project->variables()["CODEWARRIOR_VERSION"].append("0"); - if(project->isEmpty("QMAKE_ENTRYPOINT")) - project->variables()["QMAKE_ENTRYPOINT"].append("start"); - project->variables()["CODEWARRIOR_ENTRYPOINT"].append( - project->first("QMAKE_ENTRYPOINT")); - } -} - - -TQString -MetrowerksMakefileGenerator::findTemplate(const TQString &file) -{ - TQString ret; - if(!TQFile::exists(ret = file) && - !TQFile::exists((ret = Option::mkfile::qmakespec + TQDir::separator() + file)) && - !TQFile::exists((ret = TQString(getenv("TQTDIR")) + "/mkspecs/mac-mwerks/" + file)) && - !TQFile::exists((ret = (TQString(getenv("HOME")) + "/.tmake/" + file)))) - return ""; - return ret; -} - -bool -MetrowerksMakefileGenerator::createFork(const TQString &f) -{ -#if defined(Q_OS_MACX) - FSRef fref; - FSSpec fileSpec; - if(TQFile::exists(f)) { - mode_t perms = 0; - { - struct stat s; - stat(f.latin1(), &s); - if(!(s.st_mode & S_IWUSR)) { - perms = s.st_mode; - chmod(f.latin1(), perms | S_IWUSR); - } - } - FILE *o = fopen(f.latin1(), "a"); - if(!o) - return FALSE; - if(FSPathMakeRef((const UInt8 *)f.latin1(), &fref, NULL) == noErr) { - if(FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &fileSpec, NULL) == noErr) - FSpCreateResFile(&fileSpec, 'CUTE', 'TEXT', smSystemScript); - else - tqDebug("bogus %d", __LINE__); - } else - tqDebug("bogus %d", __LINE__); - fclose(o); - if(perms) - chmod(f.latin1(), perms); - } -#else - Q_UNUSED(f) -#endif - return TRUE; -} - -bool -MetrowerksMakefileGenerator::fixifyToMacPath(TQString &p, TQString &v, bool ) -{ - v = "Absolute"; - if(p.find(':') != -1) //guess its macish already - return TRUE; - - static TQString st_volume; - if(st_volume.isEmpty()) { - st_volume = var("QMAKE_VOLUMENAME"); -#if defined(Q_OS_MACX) - if(st_volume.isEmpty()) { - uchar foo[512]; - HVolumeParam pb; - memset(&pb, '\0', sizeof(pb)); - pb.ioVRefNum = 0; - pb.ioNamePtr = foo; - if(PBHGetVInfoSync((HParmBlkPtr)&pb) == noErr) { - int len = foo[0]; - memcpy(foo,foo+1, len); - foo[len] = '\0'; - st_volume = (char *)foo; - } - } -#endif - } - TQString volume = st_volume; - - fixEnvVariables(p); - if(p.startsWith("\"") && p.endsWith("\"")) - p = p.mid(1, p.length() - 2); - if(p.isEmpty()) - return FALSE; - if(!p.endsWith("/")) - p += "/"; - if(TQDir::isRelativePath(p)) { - if(p.startsWith("{")) { - int eoc = p.find('}'); - if(eoc == -1) - return FALSE; - volume = p.mid(1, eoc - 1); - p = p.right(p.length() - eoc - 1); - } else { - TQFileInfo fi(p); - if(fi.convertToAbs()) //strange - return FALSE; - p = fi.filePath(); - } - } - p = TQDir::cleanDirPath(p); - if(!volume.isEmpty()) - v = volume; - p.replace("/", ":"); - if(p.right(1) != ":") - p += ':'; - return TRUE; -} - -void -MetrowerksMakefileGenerator::processPrlFiles() -{ - TQPtrList<MakefileDependDir> libdirs; - libdirs.setAutoDelete(TRUE); - const TQString lflags[] = { "QMAKE_LIBS", TQString::null }; - for(int i = 0; !lflags[i].isNull(); i++) { - for(bool ret = FALSE; TRUE; ret = FALSE) { - TQStringList l_out; - TQStringList &l = project->variables()[lflags[i]]; - for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { - TQString opt = (*it); - if(opt.startsWith("-")) { - if(opt.startsWith("-L")) { - TQString r = opt.right(opt.length() - 2), l = r; - fixEnvVariables(l); - libdirs.append(new MakefileDependDir(r.replace( "\"", ""), - l.replace( "\"", ""))); - } else if(opt.left(2) == "-l") { - TQString lib = opt.right(opt.length() - 2), prl; - for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) { - prl = mdd->local_dir + Option::dir_sep + "lib" + lib; - if(processPrlFile(prl)) { - if(prl.startsWith(mdd->local_dir)) - prl.replace(0, mdd->local_dir.length(), mdd->real_dir); - TQRegExp reg("^.*lib(" + lib + "[^.]*)\\." + - project->first("QMAKE_EXTENSION_SHLIB") + "$"); - if(reg.exactMatch(prl)) - prl = "-l" + reg.cap(1); - opt = prl; - ret = TRUE; - break; - } - } - } else if(opt == "-framework") { - l_out.append(opt); - ++it; - opt = (*it); - TQString prl = "/System/Library/Frameworks/" + opt + - ".framework/" + opt; - if(processPrlFile(prl)) - ret = TRUE; - } - if(!opt.isEmpty()) - l_out.append(opt); - } else { - if(processPrlFile(opt)) - ret = TRUE; - if(!opt.isEmpty()) - l_out.append(opt); - } - } - if(ret) - l = l_out; - else - break; - } - } -} - -void -MetrowerksMakefileGenerator::processPrlVariable(const TQString &var, const TQStringList &l) -{ - if(var == "QMAKE_PRL_LIBS") { - TQStringList &out = project->variables()["QMAKE_LIBS"]; - for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { - bool append = TRUE; - if((*it).startsWith("-")) { - if((*it).startsWith("-l") || (*it).startsWith("-L")) { - append = out.findIndex((*it)) == -1; - } else if((*it).startsWith("-framework")) { - ++it; - for(TQStringList::ConstIterator outit = out.begin(); - outit != out.end(); ++it) { - if((*outit) == "-framework") { - ++outit; - if((*outit) == (*it)) { - append = FALSE; - break; - } - } - } - } - } else if(TQFile::exists((*it))) { - append = out.findIndex((*it)); - } - if(append) - out.append((*it)); - } - } else { - MakefileGenerator::processPrlVariable(var, l); - } -} - - -bool -MetrowerksMakefileGenerator::openOutput(TQFile &file) const -{ - TQString outdir; - if(!file.name().isEmpty()) { - TQFileInfo fi(file); - if(fi.isDir()) - outdir = file.name() + TQDir::separator(); - } - if(!outdir.isEmpty() || file.name().isEmpty()) - file.setName(outdir + project->first("TARGET") + ".xml"); - return MakefileGenerator::openOutput(file); -} diff --git a/qmake/generators/mac/metrowerks_xml.h b/qmake/generators/mac/metrowerks_xml.h deleted file mode 100644 index 60c0321ae..000000000 --- a/qmake/generators/mac/metrowerks_xml.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Definition of MetrowerksMakefileGenerator class. -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of qmake. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.TQPL -** included in the packaging of this file. Licensees holding valid TQt -** Commercial licenses may use this file in accordance with the TQt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef __METROWERKS_XML_H__ -#define __METROWERKS_XML_H__ - -#include "makefile.h" - -class MetrowerksMakefileGenerator : public MakefileGenerator -{ - bool createFork(const TQString &f); - bool fixifyToMacPath(TQString &c, TQString &v, bool exists=TRUE); - - bool init_flag; - - bool writeMakeParts(TQTextStream &); - bool writeSubDirs(TQTextStream &); - - bool writeMakefile(TQTextStream &); - TQString findTemplate(const TQString &file); - void init(); -public: - MetrowerksMakefileGenerator(TQMakeProject *p); - ~MetrowerksMakefileGenerator(); - - bool openOutput(TQFile &file) const; -protected: - virtual void processPrlFiles(); - virtual void processPrlVariable(const TQString &var, const TQStringList &l); - virtual bool doDepends() const { return FALSE; } //never necesary -}; - -inline MetrowerksMakefileGenerator::~MetrowerksMakefileGenerator() -{ } - -#endif /* __METROWERKS_XML_H__ */ diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 9bef5e05d..cf76fef63 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2446,7 +2446,6 @@ MakefileGenerator::openOutput(TQFile &file) const #include "mingw_make.h" #include "msvc_dsp.h" #include "msvc_vcproj.h" -#include "metrowerks_xml.h" #include "pbuilder_pbx.h" #include "projectgenerator.h" @@ -2477,8 +2476,6 @@ MakefileGenerator::create(TQMakeProject *proj) mkfile = new NmakeMakefileGenerator(proj); } else if(gen == "MINGW") { mkfile = new MingwMakefileGenerator(proj); - } else if(gen == "METROWERKS") { - mkfile = new MetrowerksMakefileGenerator(proj); } else if(gen == "PROJECTBUILDER") { mkfile = new ProjectBuilderMakefileGenerator(proj); } else { diff --git a/src/3rdparty/libmng/aclocal.m4 b/src/3rdparty/libmng/aclocal.m4 index e94a29abf..4283bf097 100644 --- a/src/3rdparty/libmng/aclocal.m4 +++ b/src/3rdparty/libmng/aclocal.m4 @@ -259,7 +259,6 @@ ac_save_CC="$CC" # Don't try gcc -ansi; that turns off useful extensions and # breaks some systems' header files. # AIX -qlanglvl=ansi -# Ultrix and OSF/1 -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__" @@ -390,21 +389,6 @@ case $host in rm -rf conftest* ;; -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_SAVE - AC_LANG_C - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_RESTORE]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; - ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -1151,7 +1135,7 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) @@ -1211,18 +1195,6 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic, lt_cv_prog_cc_static='-Bstatic' ;; - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - ;; - - sco3.2v5*) - lt_cv_prog_cc_pic='-Kpic' - lt_cv_prog_cc_static='-dn' - lt_cv_prog_cc_shlib='-belf' - ;; - solaris*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' @@ -1957,43 +1929,6 @@ else old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - #Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - export_dynamic_flag_spec='${wl}-Bexport' - ;; - solaris*) # gcc --version < 3.0 without binutils cannot create self contained # shared libraries reliably, requiring libgcc.a to resolve some of @@ -2477,23 +2412,6 @@ os2*) shlibpath_var=LIBPATH ;; -osf3* | osf4* | osf5*) - version_type=osf - need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -3637,17 +3555,6 @@ openbsd*) fi ;; -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - solaris*) lt_cv_deplibs_check_method=pass_all lt_cv_file_magic_test_file=/lib/libc.so diff --git a/src/3rdparty/libmng/config.guess b/src/3rdparty/libmng/config.guess index 11d85db25..f75adf068 100755 --- a/src/3rdparty/libmng/config.guess +++ b/src/3rdparty/libmng/config.guess @@ -172,75 +172,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; - alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - cat <<EOF >$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - eval $set_cc_for_build - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit 0 ;; @@ -648,19 +579,6 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; @@ -932,9 +850,6 @@ EOF Intel:Mach:3*:*) echo i386-pc-mach3 exit 0 ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 @@ -980,20 +895,6 @@ EOF SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit 0 ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> echo i586-unisys-sysv4 diff --git a/src/3rdparty/libmng/config.sub b/src/3rdparty/libmng/config.sub index 34efd933f..4d87ba463 100755 --- a/src/3rdparty/libmng/config.sub +++ b/src/3rdparty/libmng/config.sub @@ -168,26 +168,6 @@ case $os in -hiux*) os=-hiuxwe2 ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -526,10 +506,6 @@ case $basic_machine in hppa-next) os=-nextstep3 ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; hppro) basic_machine=hppa1.1-hp os=-proelf @@ -711,10 +687,6 @@ case $basic_machine in basic_machine=hppa1.1-hitachi os=-hiuxwe2 ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; pbd) basic_machine=sparc-tti ;; @@ -1052,8 +1024,8 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -luna* | -dgux* | -solaris* | -sym* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1105,12 +1077,6 @@ case $os in -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1132,13 +1098,6 @@ case $os in -nsk*) os=-nsk ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; -triton*) os=-sysv3 ;; diff --git a/src/3rdparty/libmng/configure b/src/3rdparty/libmng/configure index b204ca02e..8bd536d25 100755 --- a/src/3rdparty/libmng/configure +++ b/src/3rdparty/libmng/configure @@ -627,7 +627,7 @@ done # NLS nuisances. # Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). +# because not all systems understand e.g. LANG=C. # Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! # Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi @@ -1247,7 +1247,7 @@ ac_save_CC="$CC" # Don't try gcc -ansi; that turns off useful extensions and # breaks some systems' header files. # AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 +# 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__" @@ -2047,17 +2047,6 @@ openbsd*) fi ;; -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - solaris*) lt_cv_deplibs_check_method=pass_all lt_cv_file_magic_test_file=/lib/libc.so @@ -2688,59 +2677,6 @@ case $host in fi rm -rf conftest* ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2698: checking whether the C compiler needs -belf" >&5 -if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext <<EOF -#line 2711 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_cc_needs_belf=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_cc_needs_belf=no -fi -rm -f conftest* - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -fi - -echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; - - esac # Sed substitution that helps us do robust quoting. It backslashifies @@ -2892,7 +2828,7 @@ else # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | irix5* | irix6* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) @@ -2952,18 +2888,6 @@ else lt_cv_prog_cc_static='-Bstatic' ;; - osf3* | osf4* | osf5*) - # All OSF/1 code is PIC. - lt_cv_prog_cc_wl='-Wl,' - lt_cv_prog_cc_static='-non_shared' - ;; - - sco3.2v5*) - lt_cv_prog_cc_pic='-Kpic' - lt_cv_prog_cc_static='-dn' - lt_cv_prog_cc_shlib='-belf' - ;; - solaris*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' @@ -3783,43 +3707,6 @@ else old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - #Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - - sco3.2v5*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - export_dynamic_flag_spec='${wl}-Bexport' - ;; - solaris*) # gcc --version < 3.0 without binutils cannot create self contained # shared libraries reliably, requiring libgcc.a to resolve some of @@ -4306,23 +4193,6 @@ os2*) shlibpath_var=LIBPATH ;; -osf3* | osf4* | osf5*) - version_type=osf - need_version=no - soname_spec='${libname}${release}.so' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -sco3.2v5*) - version_type=osf - soname_spec='${libname}${release}.so$major' - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' - shlibpath_var=LD_LIBRARY_PATH - ;; - solaris*) version_type=linux need_lib_prefix=no @@ -6053,7 +5923,7 @@ ccp = &g + (g ? g-g : 0); ++ccp; p = (char**) ccp; ccp = (char const *const *) p; -{ /* SCO 3.2v4 cc rejects this. */ +{ char *t; char const *s = 0 ? (char *) 0 : (char const *) 0; @@ -6794,7 +6664,7 @@ EOF cat >> $CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. +# small command number limits, like on HP-UX. 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/doc/rpm/libmng-1.0.4-rhconf.patch b/src/3rdparty/libmng/doc/rpm/libmng-1.0.4-rhconf.patch deleted file mode 100644 index a73b79dbe..000000000 --- a/src/3rdparty/libmng/doc/rpm/libmng-1.0.4-rhconf.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- libmng/makefiles/makefile.linux.orig Sat Jul 1 15:10:35 2000 -+++ libmng/makefiles/makefile.linux Sat Jul 1 15:14:52 2000 -@@ -13,19 +13,19 @@ - OPTIONS = -DMNG_BUILD_SO - - # where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h --prefix=/usr/local -+prefix=/usr - - # Where the zlib library and include files are located --ZLIBLIB=../zlib --ZLIBINC=../zlib -+ZLIBLIB=/usr/lib -+ZLIBINC=/usr/include - - # Where the jpeg library and include files are located --JPEGLIB=../jpgsrc --JPEGINC=../jpgsrc -+JPEGLIB=/usr/lib -+JPEGINC=/usr/include - - # Where the lcms library and include files are located --LCMSLIB=../lcms/lib --LCMSINC=../lcms/source -+LCMSLIB=/usr/lib -+LCMSINC=/usr/include - - ALIGN= - # for i386: -@@ -37,7 +37,7 @@ - - # for pgcc version 2.95.1, -O3 is buggy; don't use it. - --CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -funroll-loops \ -+CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall $(RPM_OPT_FLAGS) \ - $(OPTIONS) $(ALIGN) # $(WARNMORE) -g - LDFLAGS=-L. -Wl,-rpath,. \ - -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ diff --git a/src/3rdparty/libmng/doc/rpm/libmng.spec b/src/3rdparty/libmng/doc/rpm/libmng.spec deleted file mode 100644 index 57580cd7c..000000000 --- a/src/3rdparty/libmng/doc/rpm/libmng.spec +++ /dev/null @@ -1,97 +0,0 @@ -Summary: A library of functions for manipulating MNG format files. -Name: libmng -Version: 1.0.4 -Release: 2.1 -Copyright: AS IS -Group: System Environment/Libraries -Source0: libmng-%{PACKAGE_VERSION}.tar.gz -Patch: libmng-%{PACKAGE_VERSION}-rhconf.patch -URL: http://www.libmng.com/ -BuildRoot: /var/tmp/libmng-root -BuildPrereq: libjpeg-devel, zlib-devel, lcms-devel - -%description -libmng - library for reading, writing, displaying and examing -Multiple-Image Network Graphics. MNG is the animation extension to the -popular PNG image-format. - -%package devel -Summary: Development tools for programs to manipulate MNG format files. -Group: Development/Libraries -Requires: libmng = %{PACKAGE_VERSION} -%description devel -The libmng-devel package contains the header files and static -libraries necessary for developing programs using the MNG -(Multiple-Image Network Graphics) library. - -If you want to develop programs which will manipulate MNG image format -files, you should install libmng-devel. You'll also need to install -the libmng package. - -%changelog -* Sun Jun 23 2002 Gerard Juyn <gerard@libmng.com> -- updated to 1.0.4 - -* Mon Sep 18 2001 Gerard Juyn <gerard@libmng.com> -- updated to 1.0.3 - -* Sat Jul 7 2001 Gerard Juyn <gerard@libmng.com> -- updated to 1.0.2 - -* Wed May 2 2001 Gerard Juyn <gerard@libmng.com> -- updated to 1.0.1 - -* Mon Feb 5 2001 Gerard Juyn <gerard@libmng.com> -- updated to 1.0.0 - -* Fri Jan 19 2001 Gerard Juyn <gerard@libmng.com> -- updated to 0.9.4 - -* Sat Oct 28 2000 Gerard Juyn <gerard@libmng.com> -- updated to 0.9.3 - -* Tue Aug 15 2000 MATSUURA Takanori <t-matsuu@protein.osaka-u.ac.jp> -- based on libmng-0.9.2/doc/rpm/libmng.spec -- use %%configure and %%makeinstall - -* Sat Aug 5 2000 Gerard Juyn <gerard@libmng.com> -- updated to 0.9.2 - -* Wed Jul 26 2000 Gerard Juyn <gerard@libmng.com> -- updated to 0.9.1 - -* Sat Jul 1 2000 MATSUURA Takanori <t-matsuu@protein.osaka-u.ac.jp> -- updated to 0.9.0 - -* Sat Jun 24 2000 MATSUURA Takanori <t-matsuu@protein.osaka-u.ac.jp> -- 1st release for RPM - -%prep -%setup -%configure - -%build -make - -%install -rm -rf $RPM_BUILD_ROOT -%makeinstall - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root) -%doc CHANGES LICENSE README doc -/usr/lib/libmng.so.* - -%files devel -%defattr(-,root,root) -/usr/include/* -/usr/lib/libmng.a -/usr/lib/libmng.so - diff --git a/src/3rdparty/libmng/ltmain.sh b/src/3rdparty/libmng/ltmain.sh index 0ba6bdfe7..3b0d7b2bf 100644 --- a/src/3rdparty/libmng/ltmain.sh +++ b/src/3rdparty/libmng/ltmain.sh @@ -75,7 +75,7 @@ NL2SP='tr \015\012 \040\040' # NLS nuisances. # Only set LANG and LC_ALL to C if already set. # These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). +# e.g. LANG=C. # We save the old values to restore during execute mode. if test "${LC_ALL+set}" = set; then save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL @@ -2295,23 +2295,6 @@ compiler." versuffix="$major.$age.$revision" ;; - osf) - major=`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - sunos) major=".$current" versuffix=".$current.$revision" @@ -2471,9 +2454,7 @@ compiler." pass_all) # Don't check for shared/static. Everything works. # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behaviour. + # whether the library exists or not. newdeplibs=$deplibs ;; test_compile) diff --git a/src/3rdparty/libpng/README b/src/3rdparty/libpng/README index a939432ae..f1589fa77 100644 --- a/src/3rdparty/libpng/README +++ b/src/3rdparty/libpng/README @@ -216,7 +216,7 @@ Files in this distribution: (gcc, creates libpng12.so.0.1.2.5) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile - makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc + makefile.sco => For Unixware 7 with Native cc makefile.mips => MIPS makefile makefile.acorn => Acorn makefile makefile.amiga => Amiga makefile diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h index 6c07bceab..313e4557d 100644 --- a/src/3rdparty/libpng/pngconf.h +++ b/src/3rdparty/libpng/pngconf.h @@ -225,13 +225,9 @@ #endif /* PNGARG */ -/* Try to determine if we are compiling on a Mac. Note that testing for - * just __MWERKS__ is not good enough, because the Codewarrior is now used - * on non-Mac platforms. - */ +/* Try to determine if we are compiling on a Mac. */ #ifndef MACOS -# if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \ - defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC) +# if defined(applec) || defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC) # define MACOS # endif #endif @@ -294,8 +290,7 @@ # endif #endif -/* Codewarrior on NT has linking problems without this. */ -#if (defined(__MWERKS__) && defined(WIN32)) || defined(__STDC__) +#if defined(__STDC__) # define PNG_ALWAYS_EXTERN #endif diff --git a/src/3rdparty/libpng/scripts/makefile.sco b/src/3rdparty/libpng/scripts/makefile.sco index 74068a2cc..2f3b47938 100644 --- a/src/3rdparty/libpng/scripts/makefile.sco +++ b/src/3rdparty/libpng/scripts/makefile.sco @@ -1,4 +1,4 @@ -# makefile for SCO OSr5 ELF and Unixware 7 with Native cc +# makefile for Unixware 7 with Native cc # Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx # force ELF build dynamic linking, SONAME setting in lib and RPATH in app # Copyright (C) 2002 Glenn Randers-Pehrson diff --git a/src/3rdparty/sqlite/os.c b/src/3rdparty/sqlite/os.c index b4ae7a107..89f6c967a 100644 --- a/src/3rdparty/sqlite/os.c +++ b/src/3rdparty/sqlite/os.c @@ -41,16 +41,6 @@ # include <winbase.h> #endif -#if OS_MAC -# include <extras.h> -# include <path2fss.h> -# include <TextUtils.h> -# include <FinderRegistry.h> -# include <Folders.h> -# include <Timer.h> -# include <OSUtils.h> -#endif - /* ** The DJGPP compiler environment looks mostly like Unix, but it ** lacks the fcntl() system call. So redefine fcntl() to be something @@ -74,10 +64,6 @@ #if OS_WIN && defined(THREADSAFE) && THREADSAFE # define SQLITE_W32_THREADS 1 #endif -#if OS_MAC && defined(THREADSAFE) && THREADSAFE -# include <Multiprocessing.h> -# define SQLITE_MACOS_MULTITASKING 1 -#endif /* ** Macros for performance tracing. Normally turned off @@ -394,9 +380,6 @@ int sqliteOsDelete(const char *zFilename){ #if OS_WIN DeleteFile(zFilename); #endif -#if OS_MAC - unlink(zFilename); -#endif return SQLITE_OK; } @@ -410,9 +393,6 @@ int sqliteOsFileExists(const char *zFilename){ #if OS_WIN return GetFileAttributes(zFilename) != 0xffffffff; #endif -#if OS_MAC - return access(zFilename, 0)==0; -#endif } @@ -434,10 +414,6 @@ int sqliteOsFileRename(const char *zOldName, const char *zNewName){ } return SQLITE_OK; #endif -#if OS_MAC - /**** FIX ME ***/ - return SQLITE_ERROR; -#endif } #endif /* NOT USED */ @@ -514,56 +490,6 @@ int sqliteOsOpenReadWrite( OpenCounter(+1); return SQLITE_OK; #endif -#if OS_MAC - FSSpec fsSpec; -# ifdef _LARGE_FILE - HFSUniStr255 dfName; - FSRef fsRef; - if( __path2fss(zFilename, &fsSpec) != noErr ){ - if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) - return SQLITE_CANTOPEN; - } - if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) - return SQLITE_CANTOPEN; - FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, - fsRdWrShPerm, &(id->refNum)) != noErr ){ - if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, - fsRdWrPerm, &(id->refNum)) != noErr ){ - if (FSOpenFork(&fsRef, dfName.length, dfName.unicode, - fsRdPerm, &(id->refNum)) != noErr ) - return SQLITE_CANTOPEN; - else - *pReadonly = 1; - } else - *pReadonly = 0; - } else - *pReadonly = 0; -# else - __path2fss(zFilename, &fsSpec); - if( !sqliteOsFileExists(zFilename) ){ - if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) - return SQLITE_CANTOPEN; - } - if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNum)) != noErr ){ - if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrPerm, &(id->refNum)) != noErr ){ - if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdPerm, &(id->refNum)) != noErr ) - return SQLITE_CANTOPEN; - else - *pReadonly = 1; - } else - *pReadonly = 0; - } else - *pReadonly = 0; -# endif - if( HOpenRF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNumRF)) != noErr){ - id->refNumRF = -1; - } - id->locked = 0; - id->delOnClose = 0; - OpenCounter(+1); - return SQLITE_OK; -#endif } @@ -634,35 +560,6 @@ int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){ OpenCounter(+1); return SQLITE_OK; #endif -#if OS_MAC - FSSpec fsSpec; -# ifdef _LARGE_FILE - HFSUniStr255 dfName; - FSRef fsRef; - __path2fss(zFilename, &fsSpec); - if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) - return SQLITE_CANTOPEN; - if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) - return SQLITE_CANTOPEN; - FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, - fsRdWrPerm, &(id->refNum)) != noErr ) - return SQLITE_CANTOPEN; -# else - __path2fss(zFilename, &fsSpec); - if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr ) - return SQLITE_CANTOPEN; - if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrPerm, &(id->refNum)) != noErr ) - return SQLITE_CANTOPEN; -# endif - id->refNumRF = -1; - id->locked = 0; - id->delOnClose = delFlag; - if (delFlag) - id->pathToDel = sqliteOsFullPathname(zFilename); - OpenCounter(+1); - return SQLITE_OK; -#endif } /* @@ -709,32 +606,6 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){ OpenCounter(+1); return SQLITE_OK; #endif -#if OS_MAC - FSSpec fsSpec; -# ifdef _LARGE_FILE - HFSUniStr255 dfName; - FSRef fsRef; - if( __path2fss(zFilename, &fsSpec) != noErr ) - return SQLITE_CANTOPEN; - if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr ) - return SQLITE_CANTOPEN; - FSGetDataForkName(&dfName); - if( FSOpenFork(&fsRef, dfName.length, dfName.unicode, - fsRdPerm, &(id->refNum)) != noErr ) - return SQLITE_CANTOPEN; -# else - __path2fss(zFilename, &fsSpec); - if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdPerm, &(id->refNum)) != noErr ) - return SQLITE_CANTOPEN; -# endif - if( HOpenRF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNumRF)) != noErr){ - id->refNumRF = -1; - } - id->locked = 0; - id->delOnClose = 0; - OpenCounter(+1); - return SQLITE_OK; -#endif } /* @@ -830,49 +701,6 @@ int sqliteOsTempFileName(char *zBuf){ if( !sqliteOsFileExists(zBuf) ) break; } #endif -#if OS_MAC - static char zChars[] = - "abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789"; - int i, j; - char zTempPath[SQLITE_TEMPNAME_SIZE]; - char zdirName[32]; - CInfoPBRec infoRec; - Str31 dirName; - memset(&infoRec, 0, sizeof(infoRec)); - memset(zTempPath, 0, SQLITE_TEMPNAME_SIZE); - if( FindFolder(kOnSystemDisk, kTemporaryFolderType, kCreateFolder, - &(infoRec.dirInfo.ioVRefNum), &(infoRec.dirInfo.ioDrParID)) == noErr ){ - infoRec.dirInfo.ioNamePtr = dirName; - do{ - infoRec.dirInfo.ioFDirIndex = -1; - infoRec.dirInfo.ioDrDirID = infoRec.dirInfo.ioDrParID; - if( PBGetCatInfoSync(&infoRec) == noErr ){ - CopyPascalStringToC(dirName, zdirName); - i = strlen(zdirName); - memmove(&(zTempPath[i+1]), zTempPath, strlen(zTempPath)); - strcpy(zTempPath, zdirName); - zTempPath[i] = ':'; - }else{ - *zTempPath = 0; - break; - } - } while( infoRec.dirInfo.ioDrDirID != fsRtDirID ); - } - if( *zTempPath == 0 ) - getcwd(zTempPath, SQLITE_TEMPNAME_SIZE-24); - for(;;){ - sprintf(zBuf, "%s"TEMP_FILE_PREFIX, zTempPath); - j = strlen(zBuf); - sqliteRandomness(15, &zBuf[j]); - for(i=0; i<15; i++, j++){ - zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ]; - } - zBuf[j] = 0; - if( !sqliteOsFileExists(zBuf) ) break; - } -#endif return SQLITE_OK; } @@ -917,21 +745,6 @@ int sqliteOsClose(OsFile *id){ OpenCounter(-1); return SQLITE_OK; #endif -#if OS_MAC - if( id->refNumRF!=-1 ) - FSClose(id->refNumRF); -# ifdef _LARGE_FILE - FSCloseFork(id->refNum); -# else - FSClose(id->refNum); -# endif - if( id->delOnClose ){ - unlink(id->pathToDel); - sqliteFree(id->pathToDel); - } - OpenCounter(-1); - return SQLITE_OK; -#endif } /* @@ -968,22 +781,6 @@ int sqliteOsRead(OsFile *id, void *pBuf, int amt){ return SQLITE_IOERR; } #endif -#if OS_MAC - int got; - SimulateIOError(SQLITE_IOERR); - TRACE2("READ %d\n", last_page); -# ifdef _LARGE_FILE - FSReadFork(id->refNum, fsAtMark, 0, (ByteCount)amt, pBuf, (ByteCount*)&got); -# else - got = amt; - FSRead(id->refNum, &got, pBuf); -# endif - if( got==amt ){ - return SQLITE_OK; - }else{ - return SQLITE_IOERR; - } -#endif } /* @@ -1021,29 +818,6 @@ int sqliteOsWrite(OsFile *id, const void *pBuf, int amt){ } return SQLITE_OK; #endif -#if OS_MAC - OSErr oserr; - int wrote = 0; - SimulateIOError(SQLITE_IOERR); - TRACE2("WRITE %d\n", last_page); - while( amt>0 ){ -# ifdef _LARGE_FILE - oserr = FSWriteFork(id->refNum, fsAtMark, 0, - (ByteCount)amt, pBuf, (ByteCount*)&wrote); -# else - wrote = amt; - oserr = FSWrite(id->refNum, &wrote, pBuf); -# endif - if( wrote == 0 || oserr != noErr) - break; - amt -= wrote; - pBuf = &((char*)pBuf)[wrote]; - } - if( oserr != noErr || amt>wrote ){ - return SQLITE_FULL; - } - return SQLITE_OK; -#endif } /* @@ -1065,28 +839,6 @@ int sqliteOsSeek(OsFile *id, off_t offset){ } return SQLITE_OK; #endif -#if OS_MAC - { - off_t curSize; - if( sqliteOsFileSize(id, &curSize) != SQLITE_OK ){ - return SQLITE_IOERR; - } - if( offset >= curSize ){ - if( sqliteOsTruncate(id, offset+1) != SQLITE_OK ){ - return SQLITE_IOERR; - } - } -# ifdef _LARGE_FILE - if( FSSetForkPosition(id->refNum, fsFromStart, offset) != noErr ){ -# else - if( SetFPos(id->refNum, fsFromStart, offset) != noErr ){ -# endif - return SQLITE_IOERR; - }else{ - return SQLITE_OK; - } - } -#endif } /* @@ -1123,20 +875,6 @@ int sqliteOsSync(OsFile *id){ return SQLITE_IOERR; } #endif -#if OS_MAC -# ifdef _LARGE_FILE - if( FSFlushFork(id->refNum) != noErr ){ -# else - ParamBlockRec params; - memset(¶ms, 0, sizeof(ParamBlockRec)); - params.ioParam.ioRefNum = id->refNum; - if( PBFlushFileSync(¶ms) != noErr ){ -# endif - return SQLITE_IOERR; - }else{ - return SQLITE_OK; - } -#endif } /* @@ -1155,17 +893,6 @@ int sqliteOsTruncate(OsFile *id, off_t nByte){ } return SQLITE_OK; #endif -#if OS_MAC -# ifdef _LARGE_FILE - if( FSSetForkSize(id->refNum, fsFromStart, nByte) != noErr){ -# else - if( SetEOF(id->refNum, nByte) != noErr ){ -# endif - return SQLITE_IOERR; - }else{ - return SQLITE_OK; - } -#endif } /* @@ -1188,17 +915,6 @@ int sqliteOsFileSize(OsFile *id, off_t *pSize){ *pSize = (((off_t)upperBits)<<32) + lowerBits; return SQLITE_OK; #endif -#if OS_MAC -# ifdef _LARGE_FILE - if( FSGetForkSize(id->refNum, pSize) != noErr){ -# else - if( GetEOF(id->refNum, pSize) != noErr ){ -# endif - return SQLITE_IOERR; - }else{ - return SQLITE_OK; - } -#endif } #if OS_WIN @@ -1271,11 +987,7 @@ int isNT(void){ ** the first byte in the range of bytes used for locking. */ #define N_LOCKBYTE 10239 -#if OS_MAC -# define FIRST_LOCKBYTE (0x000fffff - N_LOCKBYTE) -#else -# define FIRST_LOCKBYTE (0xffffffff - N_LOCKBYTE) -#endif +#define FIRST_LOCKBYTE (0xffffffff - N_LOCKBYTE) /* ** Change the status of the lock on the file "id" to be a readlock. @@ -1356,46 +1068,6 @@ int sqliteOsReadLock(OsFile *id){ } return rc; #endif -#if OS_MAC - int rc; - if( id->locked>0 || id->refNumRF == -1 ){ - rc = SQLITE_OK; - }else{ - int lk; - OSErr res; - int cnt = 5; - ParamBlockRec params; - sqliteRandomness(sizeof(lk), &lk); - lk = (lk & 0x7fffffff)%N_LOCKBYTE + 1; - memset(¶ms, 0, sizeof(params)); - params.ioParam.ioRefNum = id->refNumRF; - params.ioParam.ioPosMode = fsFromStart; - params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioReqCount = 1; - while( cnt-->0 && (res = PBLockRangeSync(¶ms))!=noErr ){ - UInt32 finalTicks; - Delay(1, &finalTicks); /* 1/60 sec */ - } - if( res == noErr ){ - params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; - params.ioParam.ioReqCount = N_LOCKBYTE; - PBUnlockRangeSync(¶ms); - params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk; - params.ioParam.ioReqCount = 1; - res = PBLockRangeSync(¶ms); - params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioReqCount = 1; - PBUnlockRangeSync(¶ms); - } - if( res == noErr ){ - id->locked = lk; - rc = SQLITE_OK; - }else{ - rc = SQLITE_BUSY; - } - } - return rc; -#endif } /* @@ -1465,47 +1137,6 @@ int sqliteOsWriteLock(OsFile *id){ } return rc; #endif -#if OS_MAC - int rc; - if( id->locked<0 || id->refNumRF == -1 ){ - rc = SQLITE_OK; - }else{ - OSErr res; - int cnt = 5; - ParamBlockRec params; - memset(¶ms, 0, sizeof(params)); - params.ioParam.ioRefNum = id->refNumRF; - params.ioParam.ioPosMode = fsFromStart; - params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioReqCount = 1; - while( cnt-->0 && (res = PBLockRangeSync(¶ms))!=noErr ){ - UInt32 finalTicks; - Delay(1, &finalTicks); /* 1/60 sec */ - } - if( res == noErr ){ - params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked; - params.ioParam.ioReqCount = 1; - if( id->locked==0 - || PBUnlockRangeSync(¶ms)==noErr ){ - params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; - params.ioParam.ioReqCount = N_LOCKBYTE; - res = PBLockRangeSync(¶ms); - }else{ - res = afpRangeNotLocked; - } - params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioReqCount = 1; - PBUnlockRangeSync(¶ms); - } - if( res == noErr ){ - id->locked = -1; - rc = SQLITE_OK; - }else{ - rc = SQLITE_BUSY; - } - } - return rc; -#endif } /* @@ -1574,29 +1205,6 @@ int sqliteOsUnlock(OsFile *id){ } return rc; #endif -#if OS_MAC - int rc; - ParamBlockRec params; - memset(¶ms, 0, sizeof(params)); - params.ioParam.ioRefNum = id->refNumRF; - params.ioParam.ioPosMode = fsFromStart; - if( id->locked==0 || id->refNumRF == -1 ){ - rc = SQLITE_OK; - }else if( id->locked<0 ){ - params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; - params.ioParam.ioReqCount = N_LOCKBYTE; - PBUnlockRangeSync(¶ms); - rc = SQLITE_OK; - id->locked = 0; - }else{ - params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked; - params.ioParam.ioReqCount = 1; - PBUnlockRangeSync(¶ms); - rc = SQLITE_OK; - id->locked = 0; - } - return rc; -#endif } /* @@ -1629,14 +1237,6 @@ int sqliteOsRandomSeed(char *zBuf){ #if OS_WIN && !defined(SQLITE_TEST) GetSystemTime((LPSYSTEMTIME)zBuf); #endif -#if OS_MAC - { - int pid; - Microseconds((UnsignedWide*)zBuf); - pid = getpid(); - memcpy(&zBuf[sizeof(UnsignedWide)], &pid, sizeof(pid)); - } -#endif return SQLITE_OK; } @@ -1657,12 +1257,6 @@ int sqliteOsSleep(int ms){ Sleep(ms); return ms; #endif -#if OS_MAC - UInt32 finalTicks; - UInt32 ticks = (((UInt32)ms+16)*3)/50; /* 1/60 sec per tick */ - Delay(ticks, &finalTicks); - return (int)((ticks*50)/3); -#endif } /* @@ -1762,26 +1356,10 @@ char *sqliteOsFullPathname(const char *zRelative){ GetFullPathName(zRelative, nByte, zFull, &zNotUsed); return zFull; #endif -#if OS_MAC - char *zFull = 0; - if( zRelative[0]==':' ){ - char zBuf[_MAX_PATH+1]; - sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), &(zRelative[1]), - (char*)0); - }else{ - if( strchr(zRelative, ':') ){ - sqliteSetString(&zFull, zRelative, (char*)0); - }else{ - char zBuf[_MAX_PATH+1]; - sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), zRelative, (char*)0); - } - } - return zFull; -#endif } /* -** The following variable, if set to a now-zero value, become the result +** The following variable, if set to a non-zero value, becomes the result ** returned from sqliteOsCurrentTime(). This is used for testing. */ #ifdef SQLITE_TEST diff --git a/src/3rdparty/sqlite/os.h b/src/3rdparty/sqlite/os.h index 5b12c21cd..d5541d469 100644 --- a/src/3rdparty/sqlite/os.h +++ b/src/3rdparty/sqlite/os.h @@ -63,37 +63,21 @@ ** Figure out if we are dealing with Unix, Windows or MacOS. ** ** N.B. MacOS means Mac Classic (or Carbon). Treat Darwin (OS X) as Unix. -** The MacOS build is designed to use CodeWarrior (tested with v8) */ #ifndef OS_UNIX # ifndef OS_WIN -# ifndef OS_MAC -# if defined(__MACOS__) -# define OS_MAC 1 -# define OS_WIN 0 -# define OS_UNIX 0 -# elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) -# define OS_MAC 0 -# define OS_WIN 1 -# define OS_UNIX 0 -# else -# define OS_MAC 0 -# define OS_WIN 0 -# define OS_UNIX 1 -# endif +# if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) +# define OS_WIN 1 +# define OS_UNIX 0 # else # define OS_WIN 0 -# define OS_UNIX 0 +# define OS_UNIX 1 # endif # else -# define OS_MAC 0 # define OS_UNIX 0 # endif #else -# define OS_MAC 0 -# ifndef OS_WIN -# define OS_WIN 0 -# endif +# define OS_WIN 0 #endif /* @@ -142,26 +126,6 @@ # define SQLITE_MIN_SLEEP_MS 1 #endif -#if OS_MAC -# include <unistd.h> -# include <Files.h> - typedef struct OsFile OsFile; - struct OsFile { - SInt16 refNum; /* Data fork/file reference number */ - SInt16 refNumRF; /* Resource fork reference number (for locking) */ - int locked; /* 0: unlocked, <0: write lock, >0: read lock */ - int delOnClose; /* True if file is to be deleted on close */ - char *pathToDel; /* Name of file to delete on close */ - }; -# ifdef _LARGE_FILE - typedef SInt64 off_t; -# else - typedef SInt32 off_t; -# endif -# define SQLITE_TEMPNAME_SIZE _MAX_PATH -# define SQLITE_MIN_SLEEP_MS 17 -#endif - int sqliteOsDelete(const char*); int sqliteOsFileExists(const char*); int sqliteOsFileRename(const char*, const char*); diff --git a/src/3rdparty/zlib/configure b/src/3rdparty/zlib/configure index 6e138594e..0b35bcb71 100755 --- a/src/3rdparty/zlib/configure +++ b/src/3rdparty/zlib/configure @@ -105,20 +105,11 @@ else IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} CFLAGS=${CFLAGS-"-ansi -O2"} LDSHARED=${LDSHARED-"cc -shared"};; - OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"} - CFLAGS=${CFLAGS-"-O -std1"} - LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"};; - OSF1*) SFLAGS=${CFLAGS-"-O -std1"} - CFLAGS=${CFLAGS-"-O -std1"} - LDSHARED=${LDSHARED-"cc -shared"};; QNX*) SFLAGS=${CFLAGS-"-4 -O"} CFLAGS=${CFLAGS-"-4 -O"} LDSHARED=${LDSHARED-"cc"} RANLIB=${RANLIB-"true"} AR="cc -A";; - SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} - CFLAGS=${CFLAGS-"-O3"} - LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} CFLAGS=${CFLAGS-"-fast -xcg89"} LDSHARED=${LDSHARED-"cc -G"};; diff --git a/src/3rdparty/zlib/minigzip.c b/src/3rdparty/zlib/minigzip.c index 6de35dde9..ed1d1486d 100644 --- a/src/3rdparty/zlib/minigzip.c +++ b/src/3rdparty/zlib/minigzip.c @@ -48,9 +48,6 @@ # define GZ_SUFFIX "-gz" # define fileno(file) file->__file #endif -#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os -# include <unix.h> /* for fileno */ -#endif #ifndef WIN32 /* unlink already in stdio.h for WIN32 */ extern int unlink OF((const char *)); diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h index af321ab6f..7b4d7a0d5 100644 --- a/src/3rdparty/zlib/zconf.h +++ b/src/3rdparty/zlib/zconf.h @@ -120,7 +120,7 @@ #endif /* Some Mac compilers merge all .h files incorrectly: */ -#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +#if defined(applec)||defined(THINK_C)||defined(__SC__) # define NO_DUMMY_DECL #endif diff --git a/src/3rdparty/zlib/zconf.in.h b/src/3rdparty/zlib/zconf.in.h index af321ab6f..7b4d7a0d5 100644 --- a/src/3rdparty/zlib/zconf.in.h +++ b/src/3rdparty/zlib/zconf.in.h @@ -120,7 +120,7 @@ #endif /* Some Mac compilers merge all .h files incorrectly: */ -#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) +#if defined(applec)||defined(THINK_C)||defined(__SC__) # define NO_DUMMY_DECL #endif diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h index 50bcbbf6e..e673e7244 100644 --- a/src/3rdparty/zlib/zutil.h +++ b/src/3rdparty/zlib/zutil.h @@ -99,12 +99,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #if defined(MACOS) || defined(TARGET_OS_MAC) # define OS_CODE 0x07 -# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os -# include <unix.h> /* for fdopen */ -# else -# ifndef fdopen -# define fdopen(fd,mode) NULL /* No fdopen() */ -# endif +# ifndef fdopen +# define fdopen(fd,mode) NULL /* No fdopen() */ # endif #endif diff --git a/src/canvas/tqcanvas.h b/src/canvas/tqcanvas.h index 5f0b9013b..8d5e0fd45 100644 --- a/src/canvas/tqcanvas.h +++ b/src/canvas/tqcanvas.h @@ -75,7 +75,7 @@ class TQCanvasItem; class TQCanvasView; class TQCanvasPixmap; -#if defined(Q_TEMPLATEDLL) && ( !defined(QT_MAKEDLL) || defined(Q_EXPORT_TEMPLATES) ) +#if defined(Q_TEMPLATEDLL) && ( !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) ) // MOC_SKIP_BEGIN TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueListIterator< TQCanvasItem* >; TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQValueList< TQCanvasItem* >; diff --git a/src/codecs/tqeucjpcodec.h b/src/codecs/tqeucjpcodec.h index c232390fe..50fc56bce 100644 --- a/src/codecs/tqeucjpcodec.h +++ b/src/codecs/tqeucjpcodec.h @@ -78,12 +78,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQEucJpCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQEucJpCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/codecs/tqeuckrcodec.h b/src/codecs/tqeuckrcodec.h index 513c85f0b..440a92e4b 100644 --- a/src/codecs/tqeuckrcodec.h +++ b/src/codecs/tqeuckrcodec.h @@ -73,12 +73,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_KR +#define TQ_EXPORT_CODECS_KR #else -#define Q_EXPORT_CODECS_KR TQ_EXPORT +#define TQ_EXPORT_CODECS_KR TQ_EXPORT #endif -class Q_EXPORT_CODECS_KR TQEucKrCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_KR TQEucKrCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/codecs/tqgb18030codec.h b/src/codecs/tqgb18030codec.h index c28c6222d..46832d3a7 100644 --- a/src/codecs/tqgb18030codec.h +++ b/src/codecs/tqgb18030codec.h @@ -49,12 +49,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_CN +#define TQ_EXPORT_CODECS_CN #else -#define Q_EXPORT_CODECS_CN TQ_EXPORT +#define TQ_EXPORT_CODECS_CN TQ_EXPORT #endif -class Q_EXPORT_CODECS_CN TQGb18030Codec : public TQTextCodec { +class TQ_EXPORT_CODECS_CN TQGb18030Codec : public TQTextCodec { public: TQGb18030Codec(); @@ -73,7 +73,7 @@ public: int heuristicNameMatch(const char* hint) const; }; -class Q_EXPORT_CODECS_CN TQGbkCodec : public TQGb18030Codec { +class TQ_EXPORT_CODECS_CN TQGbkCodec : public TQGb18030Codec { public: TQGbkCodec(); @@ -92,7 +92,7 @@ public: int heuristicNameMatch(const char* hint) const; }; -class Q_EXPORT_CODECS_CN TQGb2312Codec : public TQGb18030Codec { +class TQ_EXPORT_CODECS_CN TQGb2312Codec : public TQGb18030Codec { public: TQGb2312Codec(); diff --git a/src/codecs/tqjiscodec.h b/src/codecs/tqjiscodec.h index 001554ce9..f9760841e 100644 --- a/src/codecs/tqjiscodec.h +++ b/src/codecs/tqjiscodec.h @@ -78,12 +78,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQJisCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQJisCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/codecs/tqjpunicode.h b/src/codecs/tqjpunicode.h index fc04af2b9..faadb210a 100644 --- a/src/codecs/tqjpunicode.h +++ b/src/codecs/tqjpunicode.h @@ -77,12 +77,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQJpUnicodeConv { +class TQ_EXPORT_CODECS_JP TQJpUnicodeConv { public: virtual ~TQJpUnicodeConv() {} diff --git a/src/codecs/tqsjiscodec.h b/src/codecs/tqsjiscodec.h index ae9315973..7cce488f4 100644 --- a/src/codecs/tqsjiscodec.h +++ b/src/codecs/tqsjiscodec.h @@ -78,12 +78,12 @@ #ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) -#define Q_EXPORT_CODECS_JP +#define TQ_EXPORT_CODECS_JP #else -#define Q_EXPORT_CODECS_JP TQ_EXPORT +#define TQ_EXPORT_CODECS_JP TQ_EXPORT #endif -class Q_EXPORT_CODECS_JP TQSjisCodec : public TQTextCodec { +class TQ_EXPORT_CODECS_JP TQSjisCodec : public TQTextCodec { public: virtual int mibEnum() const; const char* name() const; diff --git a/src/codecs/tqtextcodec.cpp b/src/codecs/tqtextcodec.cpp index 6c495df8f..7082c43b0 100644 --- a/src/codecs/tqtextcodec.cpp +++ b/src/codecs/tqtextcodec.cpp @@ -2745,7 +2745,7 @@ static void setupLocaleMapper() localeMapper = TQTextCodec::codecForName( "System" ); #else -#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) && !defined(Q_OS_MAC) +#if defined (_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_MAC) char *charset = nl_langinfo (CODESET); if ( charset ) localeMapper = TQTextCodec::codecForName( charset ); diff --git a/src/kernel/tqeventloop_glib_p.h b/src/kernel/tqeventloop_glib_p.h index 45c6a1bfc..9fb8ab507 100644 --- a/src/kernel/tqeventloop_glib_p.h +++ b/src/kernel/tqeventloop_glib_p.h @@ -49,11 +49,6 @@ #include "qplatformdefs.h" #endif // QT_H -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - #include "tqeventloop.h" #include "tqwindowdefs.h" diff --git a/src/kernel/tqeventloop_p.h b/src/kernel/tqeventloop_p.h index 46e5fae9e..395d90a85 100644 --- a/src/kernel/tqeventloop_p.h +++ b/src/kernel/tqeventloop_p.h @@ -57,11 +57,6 @@ #include "qplatformdefs.h" #endif // QT_H -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - #include "tqwindowdefs.h" class TQSocketNotifier; diff --git a/src/kernel/tqprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp index e53dc5ff6..e5bacff9c 100644 --- a/src/kernel/tqprinter_unix.cpp +++ b/src/kernel/tqprinter_unix.cpp @@ -412,7 +412,6 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) uint i; for (i = 0; i < lphack.size(); ++i) lpargs[i+1] = (char *)lphack[i].ascii(); -#ifndef Q_OS_OSF if (psToStr[page_size]) { lpargs[++i] = (char *)"-o"; lpargs[++i] = (char *)psToStr[page_size]; @@ -421,7 +420,6 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) media += psToStr[page_size]; lpargs[++i] = (char *)media.ascii(); } -#endif lpargs[++i] = 0; char **lprargs = new char *[lprhack.size()+1]; lprargs[0] = (char *)"lpr"; diff --git a/src/kernel/tqsignalslotimp.h b/src/kernel/tqsignalslotimp.h index 7b170fd18..3b8080766 100644 --- a/src/kernel/tqsignalslotimp.h +++ b/src/kernel/tqsignalslotimp.h @@ -68,7 +68,7 @@ public: #if defined(Q_TEMPLATEDLL) && defined(Q_CC_INTEL) // MOC_SKIP_BEGIN Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQConnectionList>; -#define Q_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES +#define TQ_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES // MOC_SKIP_END #endif diff --git a/src/kernel/tqstyle.cpp b/src/kernel/tqstyle.cpp index 27a4ce33c..7b21783b0 100644 --- a/src/kernel/tqstyle.cpp +++ b/src/kernel/tqstyle.cpp @@ -1033,7 +1033,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, \value PE_ScrollBarAddLine scrollbar line increase indicator (i.e. scroll down); see also TQScrollBar. \value PE_ScrollBarSubLine scrollbar line decrease indicator (i.e. scroll up). - \value PE_ScrollBarAddPage scolllbar page increase indicator (i.e. page down). + \value PE_ScrollBarAddPage scrollbar page increase indicator (i.e. page down). \value PE_ScrollBarSubPage scrollbar page decrease indicator (i.e. page up). \value PE_ScrollBarSlider scrollbar slider \value PE_ScrollBarFirst scrollbar first line indicator (i.e. home). @@ -1986,7 +1986,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, value. If TRUE, when clicking a scrollbar SubControl, holding the mouse button down and moving the pointer outside the SubControl, the scrollbar continues to scroll. If FALSE, the - scollbar stops scrolling when the pointer leaves the + scrollbar stops scrolling when the pointer leaves the SubControl. \value SH_TabBar_Alignment the alignment for tabs in a @@ -2063,7 +2063,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, cause a listview expansion to be selected. \value SH_TabBar_PreferNoArrows whether a tabbar should suggest a size - to prevent scoll arrows. + to prevent scroll arrows. \value SH_ComboBox_Popup allows popups as a combobox dropdown menu. diff --git a/src/kernel/tqt_x11_p.h b/src/kernel/tqt_x11_p.h index 5d807238a..05bbf80b5 100644 --- a/src/kernel/tqt_x11_p.h +++ b/src/kernel/tqt_x11_p.h @@ -198,9 +198,6 @@ typedef char *XPointer; #if defined(X11R4) // X11R4 does not have XIM #define TQT_NO_XIM -#elif defined(Q_OS_OSF) && (XlibSpecificationRelease < 6) -// broken in Xlib up to OSF/1 3.2 -#define TQT_NO_XIM #elif defined(Q_OS_AIX) // broken in Xlib up to what version of AIX? #define TQT_NO_XIM @@ -211,9 +208,6 @@ typedef char *XPointer; #elif defined(Q_OS_HPUX) && defined(__LP64__) // XCreateIC broken when compiling 64-bit ELF on HP-UX 11.0 #define TQT_NO_XIM -#elif defined(Q_OS_SCO) -// ### suggested by user... -// ### #define TQT_NO_XIM #endif // TQT_NO_XIM diff --git a/src/sql/drivers/mysql/tqsql_mysql.h b/src/sql/drivers/mysql/tqsql_mysql.h index a0d3ca93b..09211c9aa 100644 --- a/src/sql/drivers/mysql/tqsql_mysql.h +++ b/src/sql/drivers/mysql/tqsql_mysql.h @@ -53,9 +53,9 @@ #include <mysql.h> #ifdef QT_PLUGIN -#define Q_EXPORT_SQLDRIVER_MYSQL +#define TQ_EXPORT_SQLDRIVER_MYSQL #else -#define Q_EXPORT_SQLDRIVER_MYSQL TQ_EXPORT +#define TQ_EXPORT_SQLDRIVER_MYSQL TQ_EXPORT #endif class TQMYSQLDriverPrivate; @@ -86,7 +86,7 @@ private: TQMYSQLResultPrivate* d; }; -class Q_EXPORT_SQLDRIVER_MYSQL TQMYSQLDriver : public TQSqlDriver +class TQ_EXPORT_SQLDRIVER_MYSQL TQMYSQLDriver : public TQSqlDriver { friend class TQMYSQLResult; public: diff --git a/src/sql/drivers/odbc/tqsql_odbc.h b/src/sql/drivers/odbc/tqsql_odbc.h index 7debb2f85..ff6e33341 100644 --- a/src/sql/drivers/odbc/tqsql_odbc.h +++ b/src/sql/drivers/odbc/tqsql_odbc.h @@ -60,9 +60,9 @@ #endif #ifdef QT_PLUGIN -#define Q_EXPORT_SQLDRIVER_ODBC +#define TQ_EXPORT_SQLDRIVER_ODBC #else -#define Q_EXPORT_SQLDRIVER_ODBC TQ_EXPORT +#define TQ_EXPORT_SQLDRIVER_ODBC TQ_EXPORT #endif #ifdef Q_OS_UNIX @@ -107,7 +107,7 @@ private: NullCache nullCache; }; -class Q_EXPORT_SQLDRIVER_ODBC TQODBCDriver : public TQSqlDriver +class TQ_EXPORT_SQLDRIVER_ODBC TQODBCDriver : public TQSqlDriver { public: TQODBCDriver( TQObject * parent=0, const char * name=0 ); diff --git a/src/sql/drivers/psql/tqsql_psql.h b/src/sql/drivers/psql/tqsql_psql.h index 61f30a581..b2326d312 100644 --- a/src/sql/drivers/psql/tqsql_psql.h +++ b/src/sql/drivers/psql/tqsql_psql.h @@ -47,9 +47,9 @@ #include <libpq-fe.h> #ifdef QT_PLUGIN -#define Q_EXPORT_SQLDRIVER_PSQL +#define TQ_EXPORT_SQLDRIVER_PSQL #else -#define Q_EXPORT_SQLDRIVER_PSQL TQ_EXPORT +#define TQ_EXPORT_SQLDRIVER_PSQL TQ_EXPORT #endif class TQPSQLPrivate; @@ -78,7 +78,7 @@ private: TQPSQLPrivate* d; }; -class Q_EXPORT_SQLDRIVER_PSQL TQPSQLDriver : public TQSqlDriver +class TQ_EXPORT_SQLDRIVER_PSQL TQPSQLDriver : public TQSqlDriver { public: enum Protocol { diff --git a/src/styles/tqcdestyle.h b/src/styles/tqcdestyle.h index 4b526c8ea..200360bd5 100644 --- a/src/styles/tqcdestyle.h +++ b/src/styles/tqcdestyle.h @@ -49,12 +49,12 @@ #if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_CDE +#define TQ_EXPORT_STYLE_CDE #else -#define Q_EXPORT_STYLE_CDE TQ_EXPORT +#define TQ_EXPORT_STYLE_CDE TQ_EXPORT #endif -class Q_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle +class TQ_EXPORT_STYLE_CDE TQCDEStyle : public TQMotifStyle { TQ_OBJECT public: diff --git a/src/styles/tqcompactstyle.h b/src/styles/tqcompactstyle.h index a8b93f092..e0b2337e3 100644 --- a/src/styles/tqcompactstyle.h +++ b/src/styles/tqcompactstyle.h @@ -48,12 +48,12 @@ #if !defined(TQT_NO_STYLE_COMPACT) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_COMPACT +#define TQ_EXPORT_STYLE_COMPACT #else -#define Q_EXPORT_STYLE_COMPACT TQ_EXPORT +#define TQ_EXPORT_STYLE_COMPACT TQ_EXPORT #endif -class Q_EXPORT_STYLE_COMPACT TQCompactStyle : public TQWindowsStyle +class TQ_EXPORT_STYLE_COMPACT TQCompactStyle : public TQWindowsStyle { public: TQCompactStyle(); diff --git a/src/styles/tqmotifplusstyle.h b/src/styles/tqmotifplusstyle.h index 049609e9a..3cfca0677 100644 --- a/src/styles/tqmotifplusstyle.h +++ b/src/styles/tqmotifplusstyle.h @@ -49,12 +49,12 @@ #if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_MOTIFPLUS +#define TQ_EXPORT_STYLE_MOTIFPLUS #else -#define Q_EXPORT_STYLE_MOTIFPLUS TQ_EXPORT +#define TQ_EXPORT_STYLE_MOTIFPLUS TQ_EXPORT #endif -class Q_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle +class TQ_EXPORT_STYLE_MOTIFPLUS TQMotifPlusStyle : public TQMotifStyle { TQ_OBJECT diff --git a/src/styles/tqmotifstyle.h b/src/styles/tqmotifstyle.h index 3b8aac02f..e840de446 100644 --- a/src/styles/tqmotifstyle.h +++ b/src/styles/tqmotifstyle.h @@ -50,13 +50,13 @@ class TQPalette; #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_MOTIF +#define TQ_EXPORT_STYLE_MOTIF #else -#define Q_EXPORT_STYLE_MOTIF TQ_EXPORT +#define TQ_EXPORT_STYLE_MOTIF TQ_EXPORT #endif -class Q_EXPORT_STYLE_MOTIF TQMotifStyle : public TQCommonStyle +class TQ_EXPORT_STYLE_MOTIF TQMotifStyle : public TQCommonStyle { TQ_OBJECT public: diff --git a/src/styles/tqplatinumstyle.h b/src/styles/tqplatinumstyle.h index 74e319f9f..a2028d7c9 100644 --- a/src/styles/tqplatinumstyle.h +++ b/src/styles/tqplatinumstyle.h @@ -50,12 +50,12 @@ class TQPalette; #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_PLATINUM +#define TQ_EXPORT_STYLE_PLATINUM #else -#define Q_EXPORT_STYLE_PLATINUM TQ_EXPORT +#define TQ_EXPORT_STYLE_PLATINUM TQ_EXPORT #endif -class Q_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle +class TQ_EXPORT_STYLE_PLATINUM TQPlatinumStyle : public TQWindowsStyle { TQ_OBJECT public: diff --git a/src/styles/tqsgistyle.h b/src/styles/tqsgistyle.h index 9a28713f1..bd129ac53 100644 --- a/src/styles/tqsgistyle.h +++ b/src/styles/tqsgistyle.h @@ -50,14 +50,14 @@ #if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_SGI +#define TQ_EXPORT_STYLE_SGI #else -#define Q_EXPORT_STYLE_SGI TQ_EXPORT +#define TQ_EXPORT_STYLE_SGI TQ_EXPORT #endif class TQSGIStylePrivate; -class Q_EXPORT_STYLE_SGI TQSGIStyle: public TQMotifStyle +class TQ_EXPORT_STYLE_SGI TQSGIStyle: public TQMotifStyle { TQ_OBJECT public: diff --git a/src/styles/tqwindowsstyle.h b/src/styles/tqwindowsstyle.h index 268ae7850..1258a9ee5 100644 --- a/src/styles/tqwindowsstyle.h +++ b/src/styles/tqwindowsstyle.h @@ -48,13 +48,13 @@ #if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) -#define Q_EXPORT_STYLE_WINDOWS +#define TQ_EXPORT_STYLE_WINDOWS #else -#define Q_EXPORT_STYLE_WINDOWS TQ_EXPORT +#define TQ_EXPORT_STYLE_WINDOWS TQ_EXPORT #endif -class Q_EXPORT_STYLE_WINDOWS TQWindowsStyle : public TQCommonStyle +class TQ_EXPORT_STYLE_WINDOWS TQWindowsStyle : public TQCommonStyle { TQ_OBJECT public: diff --git a/src/tools/tqcom_p.h b/src/tools/tqcom_p.h index 1c8319610..f1e8e99a7 100644 --- a/src/tools/tqcom_p.h +++ b/src/tools/tqcom_p.h @@ -272,7 +272,7 @@ public: \ ulong addRef() {return qtrefcount++;} \ ulong release() {if(!--qtrefcount){delete this;return 0;}return qtrefcount;} -#ifndef Q_EXPORT_COMPONENT +#ifndef TQ_EXPORT_COMPONENT #if defined(TQT_THREAD_SUPPORT) #define QT_THREADED_BUILD 1 #define Q_UCM_FLAGS_STRING "11" @@ -312,21 +312,21 @@ public: \ #endif // Q_CREATE_INSTANCE # ifdef TQ_WS_WIN -# define Q_EXPORT_COMPONENT() \ +# define TQ_EXPORT_COMPONENT() \ Q_UCM_VERIFICATION_DATA \ TQ_EXTERN_C __declspec(dllexport) \ const char *qt_ucm_query_verification_data() \ { return qt_ucm_verification_data; } \ TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* ucm_instantiate() # else -# define Q_EXPORT_COMPONENT() \ +# define TQ_EXPORT_COMPONENT() \ Q_UCM_VERIFICATION_DATA \ TQ_EXTERN_C \ const char *qt_ucm_query_verification_data() \ { return qt_ucm_verification_data; } \ TQ_EXTERN_C TQ_EXPORT TQUnknownInterface* ucm_instantiate() # endif -# define Q_EXPORT_INTERFACE() Q_EXPORT_COMPONENT() +# define TQ_EXPORT_INTERFACE() TQ_EXPORT_COMPONENT() #endif #endif //TQT_NO_COMPONENT diff --git a/src/tools/tqdatastream.cpp b/src/tools/tqdatastream.cpp index f2980a4e1..dd4114bcb 100644 --- a/src/tools/tqdatastream.cpp +++ b/src/tools/tqdatastream.cpp @@ -503,7 +503,7 @@ static TQ_INT64 read_int_ascii( TQDataStream *s ) } buf[n] = '\0'; -#if defined(__LP64__) || defined(Q_OS_OSF) +#if defined(__LP64__) // sizeof(long) == 8 return strtol(buf, (char **)0, 10); #else diff --git a/src/tools/tqglobal.cpp b/src/tools/tqglobal.cpp index d77e284ea..038e1225c 100644 --- a/src/tools/tqglobal.cpp +++ b/src/tools/tqglobal.cpp @@ -447,34 +447,12 @@ static TQtMsgHandler handler = 0; // pointer to debug handler static const int QT_BUFFER_LENGTH = 8196; // internal buffer length -#ifdef Q_CC_MWERKS - -#include "qt_mac.h" - -extern bool tqt_is_gui_used; -static void mac_default_handler( const char *msg ) -{ - if ( tqt_is_gui_used ) { - const unsigned char *p = p_str(msg); - DebugStr(p); - free((void*)p); - } else { - fprintf( stderr, msg ); - } -} - -#endif - void handle_buffer(const char *buf, TQtMsgType msgType) { if ( handler ) { (*handler)( msgType, buf ); } else if (msgType == TQtFatalMsg) { -#if defined(Q_CC_MWERKS) - mac_default_handler(buf); -#else fprintf( stderr, "%s\n", buf ); // add newline -#endif #if defined(Q_OS_UNIX) && defined(QT_DEBUG) abort(); // trap; generates core dump #elif defined(Q_OS_TEMP) && defined(QT_DEBUG) @@ -487,9 +465,7 @@ void handle_buffer(const char *buf, TQtMsgType msgType) exit( 1 ); // goodbye cruel world #endif } else { -#if defined(Q_CC_MWERKS) - mac_default_handler(buf); -#elif defined(Q_OS_TEMP) +#if defined(Q_OS_TEMP) TQString fstr( buf ); OutputDebugString( (fstr + "\n").ucs2() ); #else diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h index 3de27202c..b49fdc242 100644 --- a/src/tools/tqglobal.h +++ b/src/tools/tqglobal.h @@ -67,13 +67,10 @@ OPENBSD - OpenBSD BSDI - BSD/OS IRIX - SGI Irix - OSF - HP Tru64 UNIX - SCO - SCO OpenServer 5 UNIXWARE - UnixWare 7, Open UNIX 8 AIX - AIX HURD - GNU Hurd DGUX - DG/UX - RELIANT - Reliant UNIX DYNIX - DYNIX/ptx TQNX - TQNX TQNX6 - TQNX RTP 6.1 @@ -105,16 +102,12 @@ # define Q_OS_WIN64 #elif !defined(SAG_COM) && (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)) # define Q_OS_WIN32 -#elif defined(__MWERKS__) && defined(__INTEL__) -# 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(sinix) -# define Q_OS_RELIANT #elif defined(__GNU__) # define Q_OS_HURD #elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__) @@ -133,8 +126,6 @@ # define Q_OS_BSD4 #elif defined(__sgi) # define Q_OS_IRIX -#elif defined(__osf__) -# define Q_OS_OSF #elif defined(_AIX) # define Q_OS_AIX #elif defined(__Lynx__) @@ -147,9 +138,7 @@ # define Q_OS_QNX #elif defined(_SEQUENT_) # define Q_OS_DYNIX -#elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */ -# define Q_OS_SCO -#elif defined(__USLC__) /* all SCO platforms + UDK or OUDK */ +#elif defined(__USLC__) /* all UDK or OUDK */ # define Q_OS_UNIXWARE # define Q_OS_UNIXWARE7 #elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */ @@ -197,7 +186,6 @@ SYM - Symantec C++ for both PC and Macintosh MPW - MPW C++ - MWERKS - Metrowerks CodeWarrior MSVC - Microsoft Visual C/C++, Intel C++ for Windows WAT - Watcom C++ GNU - GNU C++ @@ -209,8 +197,7 @@ DEC - DEC C++ HP - HPUX C++ HPACC - HPUX ANSI C++ - USLC - SCO OUDK, UDK, and UnixWare 2.X C++ - CDS - Reliant C++ + USLC - UDK, and UnixWare 2.X C++ KAI - KAI C++ INTEL - Intel C++ for Linux, Intel C++ for Windows HIGHC - MetaWare High C/C++ @@ -238,11 +225,6 @@ # define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD -#elif defined(__MWERKS__) -# define Q_CC_MWERKS -/* "explicit" recognized since 4.0d1 */ -# define TQMAC_PASCAL pascal - #elif defined(_MSC_VER) # define Q_CC_MSVC /* proper support of bool for _MSC_VER >= 1100 */ @@ -351,36 +333,6 @@ # define Q_CANNOT_DELETE_CONSTANT # endif -/* Older versions of DEC C++ do not define __EDG__ or __EDG - observed - on DEC C++ V5.5-004. New versions do define __EDG__ - observed on - Compaq C++ V6.3-002. - This compiler is different enough from other EDG compilers to handle - it separately anyway. */ -#elif defined(__DECCXX) || defined(__DECC) -# define Q_CC_DEC -/* Compaq C++ V6 compilers are EDG-based but I'm not sure about older - DEC C++ V5 compilers. */ -# if defined(__EDG__) -# define Q_CC_EDG -# endif -/* Compaq have disabled EDG's _BOOL macro and use _BOOL_EXISTS instead - - observed on Compaq C++ V6.3-002. - In any case versions prior to Compaq C++ V6.0-005 do not have bool. */ -# if !defined(_BOOL_EXISTS) -# define Q_NO_BOOL_TYPE -# endif -/* Spurious (?) error messages observed on Compaq C++ V6.5-014. */ -# define Q_NO_USING_KEYWORD -/* Apply to all versions prior to Compaq C++ V6.0-000 - observed on - DEC C++ V5.5-004. */ -# if __DECCXX_VER < 60060000 -# define TQ_TYPENAME -# define Q_BROKEN_TEMPLATE_SPECIALIZATION -# define Q_CANNOT_DELETE_CONSTANT -# endif -/* avoid undefined symbol problems with out-of-line template members */ -# define TQ_INLINE_TEMPLATES inline - /* Compilers with EDG front end are similar. To detect them we test: __EDG documented by SGI, observed on MIPSpro 7.3.1.1 and KAI C++ 4.0b __EDG__ documented in EDG online docs, observed on Compaq C++ V6.3-002 */ @@ -445,15 +397,6 @@ # define Q_CC_OC # define Q_NO_USING_KEYWORD -/* CDS++ defines __EDG__ although this is not documented in the Reliant - documentation. It also follows conventions like _BOOL and this documented */ -# elif defined(sinix) -# define Q_CC_CDS -# define Q_NO_USING_KEYWORD -# if defined(__cplusplus) && (__cplusplus < 2) /* Cfront C++ mode */ -# define Q_NO_EXCEPTIONS -# endif - /* The MIPSpro compiler in o32 mode is based on EDG but disables features such as template specialization nevertheless */ # elif defined(__sgi) @@ -507,16 +450,6 @@ # define Q_NO_USING_KEYWORD # endif -/* CDS++ does not seem to define __EDG__ or __EDG according to Reliant - documentation but nevertheless uses EDG conventions like _BOOL */ -#elif defined(sinix) -# define Q_CC_EDG -# define Q_CC_CDS -# if !defined(_BOOL) -# define Q_NO_BOOL_TYPE -# endif -# define Q_BROKEN_TEMPLATE_SPECIALIZATION - #elif defined(Q_OS_HPUX) /* __HP_aCC was not defined in first aCC releases */ # if defined(__HP_aCC) || __cplusplus >= 199707L diff --git a/src/tools/tqlocale.cpp b/src/tools/tqlocale.cpp index 60cfc1bb0..a53d34571 100644 --- a/src/tools/tqlocale.cpp +++ b/src/tools/tqlocale.cpp @@ -70,11 +70,6 @@ # include <ieeefp.h> #endif -#if defined (Q_OS_OSF) && (defined(__DECC) || defined(__DECCXX)) -# define INFINITY DBL_INFINITY -# define NAN DBL_QNAN -#endif - #if (defined(Q_CC_GNU) && defined(Q_OS_WIN)) || __GNUC__ == 4 || defined(QT_QLOCALE_NEEDS_VOLATILE) # define NEEDS_VOLATILE volatile #else diff --git a/src/tools/tqwinexport.cpp b/src/tools/tqwinexport.cpp index d1a2bce22..87639706a 100644 --- a/src/tools/tqwinexport.cpp +++ b/src/tools/tqwinexport.cpp @@ -1,4 +1,4 @@ -#define Q_EXPORT_TEMPLATES +#define TQ_EXPORT_TEMPLATES #include <tqcanvas.h> #include <tqaccessible.h> diff --git a/src/tools/tqwinexport.h b/src/tools/tqwinexport.h index 2b56b294b..86a66daf8 100644 --- a/src/tools/tqwinexport.h +++ b/src/tools/tqwinexport.h @@ -36,161 +36,161 @@ ** **********************************************************************/ -#if defined(Q_TEMPLATEDLL) && ( !defined(QT_MAKEDLL) || defined(Q_EXPORT_TEMPLATES) ) +#if defined(Q_TEMPLATEDLL) && ( !defined(QT_MAKEDLL) || defined(TQ_EXPORT_TEMPLATES) ) // MOC_SKIP_BEGIN -#if defined(Q_DEFINED_QASCIIDICT) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(Q_EXPORTED_QASCIIDICT_TEMPLATES) -#define Q_EXPORTED_QASCIIDICT_TEMPLATES +#if defined(Q_DEFINED_QASCIIDICT) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(TQ_EXPORTED_QASCIIDICT_TEMPLATES) +#define TQ_EXPORTED_QASCIIDICT_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQAsciiDictIterator<TQConnectionList>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQAsciiDict<TQConnectionList>; #endif -#if defined(Q_DEFINED_QSTYLESHEET) && defined(Q_DEFINED_QDICT) && !defined(Q_EXPORTED_QSTYLESHEET_TEMPLATES) -#define Q_EXPORTED_QSTYLESHEET_TEMPLATES +#if defined(Q_DEFINED_QSTYLESHEET) && defined(Q_DEFINED_QDICT) && !defined(TQ_EXPORTED_QSTYLESHEET_TEMPLATES) +#define TQ_EXPORTED_QSTYLESHEET_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQDict<TQStyleSheetItem>; #endif -#if defined(Q_DEFINED_QLIBRARY) && defined(Q_DEFINED_QDICT) && !defined(Q_EXPORTED_QDICTLIBRARY_TEMPLATES) -#define Q_EXPORTED_QDICTLIBRARY_TEMPLATES +#if defined(Q_DEFINED_QLIBRARY) && defined(Q_DEFINED_QDICT) && !defined(TQ_EXPORTED_QDICTLIBRARY_TEMPLATES) +#define TQ_EXPORTED_QDICTLIBRARY_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQDict<TQLibrary>; // for TQtopia #endif -#if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QOBJECT) && !defined(Q_EXPORTED_QGUARDEDPTROBJECT_TEMPLATES) -#define Q_EXPORTED_QGUARDEDPTROBJECT_TEMPLATES +#if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QOBJECT) && !defined(TQ_EXPORTED_QGUARDEDPTROBJECT_TEMPLATES) +#define TQ_EXPORTED_QGUARDEDPTROBJECT_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQGuardedPtr<TQObject>; #endif // needed for TQtopia -#if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QWIDGET) && !defined(Q_EXPORTED_QGUARDEDPTRTQWIDGET_TEMPLATES) -#define Q_EXPORTED_QGUARDEDPTRTQWIDGET_TEMPLATES +#if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QWIDGET) && !defined(TQ_EXPORTED_QGUARDEDPTRTQWIDGET_TEMPLATES) +#define TQ_EXPORTED_QGUARDEDPTRTQWIDGET_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQGuardedPtr<TQWidget>; #endif -#if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QACCESSIBLE_OBJECT) && !defined(Q_EXPORTED_QACCESSIBLEOBJECT_TEMPLATES) -#define Q_EXPORTED_QACCESSIBLEOBJECT_TEMPLATES +#if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QACCESSIBLE_OBJECT) && !defined(TQ_EXPORTED_QACCESSIBLEOBJECT_TEMPLATES) +#define TQ_EXPORTED_QACCESSIBLEOBJECT_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQGuardedPtr<TQAccessibleObject>; #endif -#if defined(Q_DEFINED_QINTDICT) && !defined(Q_EXPORTED_QINTDICT_TEMPLATES) -#define Q_EXPORTED_QINTDICT_TEMPLATES +#if defined(Q_DEFINED_QINTDICT) && !defined(TQ_EXPORTED_QINTDICT_TEMPLATES) +#define TQ_EXPORTED_QINTDICT_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDict<int>; #endif -#if defined(Q_DEFINED_QINTDICT) && defined(Q_DEFINED_QWIDGET) && !defined(Q_EXPORTED__TEMPLATES) -#define Q_EXPORTED__TEMPLATES +#if defined(Q_DEFINED_QINTDICT) && defined(Q_DEFINED_QWIDGET) && !defined(TQ_EXPORTED__TEMPLATES) +#define TQ_EXPORTED__TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDictIterator<TQWidget>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDict<TQWidget>; #endif -#if defined(Q_DEFINED_QMAP) && !defined(Q_EXPORTED_QMAPBASIC_TEMPLATES) -#define Q_EXPORTED_QMAPBASIC_TEMPLATES +#if defined(Q_DEFINED_QMAP) && !defined(TQ_EXPORTED_QMAPBASIC_TEMPLATES) +#define TQ_EXPORTED_QMAPBASIC_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, int>; // for TQtopia Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, bool>; // for TQtopia #endif -#if defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QMAPTQSTRING_TEMPLATES) -#define Q_EXPORTED_QMAPTQSTRING_TEMPLATES +#if defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QSTRING) && !defined(TQ_EXPORTED_QMAPTQSTRING_TEMPLATES) +#define TQ_EXPORTED_QMAPTQSTRING_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<TQString, TQString>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<TQString, int>; // for TQtopia Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, TQString>; // for TQtopia #endif -#if defined(Q_DEFINED_QMEMARRAY) && !defined(Q_EXPORTED_QMEMARRAY_BASIC_TEMPLATES) -#define Q_EXPORTED_QMEMARRAY_BASIC_TEMPLATES +#if defined(Q_DEFINED_QMEMARRAY) && !defined(TQ_EXPORTED_QMEMARRAY_BASIC_TEMPLATES) +#define TQ_EXPORTED_QMEMARRAY_BASIC_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<int>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<bool>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<char>; #endif -#if defined(Q_DEFINED_QMEMARRAY) && defined(Q_DEFINED_QPOINT) && !defined(Q_EXPORTED_QMEMARAYPOINT_TEMPLATES) -#define Q_EXPORTED_QMEMARAYPOINT_TEMPLATES +#if defined(Q_DEFINED_QMEMARRAY) && defined(Q_DEFINED_QPOINT) && !defined(TQ_EXPORTED_QMEMARAYPOINT_TEMPLATES) +#define TQ_EXPORTED_QMEMARAYPOINT_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<TQPoint>; #endif -#if defined(Q_DEFINED_QPTRLIST) && !defined(Q_EXPORTED_QPTRLIST_BASIC_TEMPLATES) -#define Q_EXPORTED_QPTRLIST_BASIC_TEMPLATES +#if defined(Q_DEFINED_QPTRLIST) && !defined(TQ_EXPORTED_QPTRLIST_BASIC_TEMPLATES) +#define TQ_EXPORTED_QPTRLIST_BASIC_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<char>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<char>; #endif -#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QWIDGET) && !defined(Q_EXPORTED_QPTRLISTWIDGET_TEMPLATES) -#define Q_EXPORTED_QPTRLISTWIDGET_TEMPLATES +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QWIDGET) && !defined(TQ_EXPORTED_QPTRLISTWIDGET_TEMPLATES) +#define TQ_EXPORTED_QPTRLISTWIDGET_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQWidget>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQWidget>; #endif -#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QCONNECTION) && !defined(Q_EXPORTED_QPTRLISTCONNECTION_TEMPLATES) -#define Q_EXPORTED_QPTRLISTCONNECTION_TEMPLATES +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QCONNECTION) && !defined(TQ_EXPORTED_QPTRLISTCONNECTION_TEMPLATES) +#define TQ_EXPORTED_QPTRLISTCONNECTION_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQConnection>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQConnection>; #endif -#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QOBJECT) && !defined(Q_EXPORTED_QPTRLISTOBJECT_TEMPLATES) -#define Q_EXPORTED_QPTRLISTOBJECT_TEMPLATES +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QOBJECT) && !defined(TQ_EXPORTED_QPTRLISTOBJECT_TEMPLATES) +#define TQ_EXPORTED_QPTRLISTOBJECT_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQObject>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQObject>; #endif -#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QDOCKWINDOW) && !defined(Q_EXPORTED_QPTRLISTDOCWINDOW_TEMPLATES) -#define Q_EXPORTED_QPTRLISTDOCWINDOW_TEMPLATES +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QDOCKWINDOW) && !defined(TQ_EXPORTED_QPTRLISTDOCWINDOW_TEMPLATES) +#define TQ_EXPORTED_QPTRLISTDOCWINDOW_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQDockWindow>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQDockWindow>; #endif -#if defined(Q_DEFINED_QPTRVECTOR) && !defined(Q_EXPORTED_QPTRVECTOR_BASIC_TEMPLATES) -#define Q_EXPORTED_QPTRVECTOR_BASIC_TEMPLATES +#if defined(Q_DEFINED_QPTRVECTOR) && !defined(TQ_EXPORTED_QPTRVECTOR_BASIC_TEMPLATES) +#define TQ_EXPORTED_QPTRVECTOR_BASIC_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<int>; #endif -#if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QSTYLESHEET) && !defined(Q_EXPORTED_QPTRVECTORSTYLESHEETITEM_TEMPLATES) -#define Q_EXPORTED_QPTRVECTORSTYLESHEETITEM_TEMPLATES +#if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QSTYLESHEET) && !defined(TQ_EXPORTED_QPTRVECTORSTYLESHEETITEM_TEMPLATES) +#define TQ_EXPORTED_QPTRVECTORSTYLESHEETITEM_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQStyleSheetItem>; #endif -#if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QWIDGET) && !defined(Q_EXPORTED_QPTRVECTORWIDGET_TEMPLATES) -#define Q_EXPORTED_QPTRVECTORWIDGET_TEMPLATES +#if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QWIDGET) && !defined(TQ_EXPORTED_QPTRVECTORWIDGET_TEMPLATES) +#define TQ_EXPORTED_QPTRVECTORWIDGET_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQWidget>; #endif -#if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(Q_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES) -#define Q_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES +#if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(TQ_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES) +#define TQ_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQConnectionList>; #endif -#if defined(Q_DEFINED_QVALUELIST) && !defined(Q_EXPORTED_QVALUELIST_BASIC_TEMPLATES) -#define Q_EXPORTED_QVALUELIST_BASIC_TEMPLATES +#if defined(Q_DEFINED_QVALUELIST) && !defined(TQ_EXPORTED_QVALUELIST_BASIC_TEMPLATES) +#define TQ_EXPORTED_QVALUELIST_BASIC_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<bool>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<bool>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<int>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<int>; #endif -#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QRECT) && !defined(Q_EXPORTED_QVALUELISTRECT_TEMPLATES) -#define Q_EXPORTED_QVALUELISTRECT_TEMPLATES +#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QRECT) && !defined(TQ_EXPORTED_QVALUELISTRECT_TEMPLATES) +#define TQ_EXPORTED_QVALUELISTRECT_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<TQRect>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQRect>; #endif -#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QVALUELISTSTRING_TEMPLATES) -#define Q_EXPORTED_QVALUELISTSTRING_TEMPLATES +#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QSTRING) && !defined(TQ_EXPORTED_QVALUELISTSTRING_TEMPLATES) +#define TQ_EXPORTED_QVALUELISTSTRING_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<TQString>; Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQString>; #endif // TQStylesheet template exports -#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QSTYLESHEET) && !defined(Q_EXPORTED_QSTYLESHEETITEM1_TEMPLATES) -#define Q_EXPORTED_QSTYLESHEETITEM1_TEMPLATES +#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QSTYLESHEET) && !defined(TQ_EXPORTED_QSTYLESHEETITEM1_TEMPLATES) +#define TQ_EXPORTED_QSTYLESHEETITEM1_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList< TQPtrVector< TQStyleSheetItem> >; #endif -#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QSTYLESHEET) && !defined(Q_EXPORTED_QSTYLESHEETITEM2_TEMPLATES) -#define Q_EXPORTED_QSTYLESHEETITEM2_TEMPLATES +#if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QSTYLESHEET) && !defined(TQ_EXPORTED_QSTYLESHEETITEM2_TEMPLATES) +#define TQ_EXPORTED_QSTYLESHEETITEM2_TEMPLATES Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQStyleSheetItem::ListStyle>; #endif // tqcanvas template exports -#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QCANVAS) && !defined(Q_EXPORTED_QCANVAS1_TEMPLATES) -#define Q_EXPORTED_QCANVAS1_TEMPLATES +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QCANVAS) && !defined(TQ_EXPORTED_QCANVAS1_TEMPLATES) +#define TQ_EXPORTED_QCANVAS1_TEMPLATES TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQPtrListIterator< TQCanvasItem >; TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQPtrList< TQCanvasItem >; TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQPtrListIterator< TQCanvasView >; @@ -198,13 +198,13 @@ TQM_TEMPLATE_EXTERN_CANVAS template class TQM_EXPORT_CANVAS TQPtrList< TQCanvasV #endif // tqtable template exports -#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QTABLE_SELECTION) && !defined(Q_EXPORTED_QTABLESELECTION_TEMPLATES) -#define Q_EXPORTED_QTABLESELECTION_TEMPLATES +#if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QTABLE_SELECTION) && !defined(TQ_EXPORTED_QTABLESELECTION_TEMPLATES) +#define TQ_EXPORTED_QTABLESELECTION_TEMPLATES TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrList<TQTableSelection>; #endif -#if defined(Q_DEFINED_QTABLE_ITEM) && defined(Q_DEFINED_QPTRVECTOR) && !defined(Q_EXPORTED_QTABLEITEM_TEMPLATES) -#define Q_EXPORTED_QTABLEITEM_TEMPLATES +#if defined(Q_DEFINED_QTABLE_ITEM) && defined(Q_DEFINED_QPTRVECTOR) && !defined(TQ_EXPORTED_QTABLEITEM_TEMPLATES) +#define TQ_EXPORTED_QTABLEITEM_TEMPLATES TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrVector<TQTableItem>; #endif @@ -213,8 +213,8 @@ TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrVector<TQTableIte #endif // tqsqlextension template exports -#if defined(Q_DEFINED_QSQLEXTENSION) && defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QVALUEVECTOR) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QSQLEXTENSION_TEMPLATES) -#define Q_EXPORTED_QSQLEXTENSION_TEMPLATES +#if defined(Q_DEFINED_QSQLEXTENSION) && defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QVALUEVECTOR) && defined(Q_DEFINED_QSTRING) && !defined(TQ_EXPORTED_QSQLEXTENSION_TEMPLATES) +#define TQ_EXPORTED_QSQLEXTENSION_TEMPLATES TQM_TEMPLATE_EXTERN_SQL template class TQM_EXPORT_SQL TQMap<TQString,TQSqlParam>; TQM_TEMPLATE_EXTERN_SQL template class TQM_EXPORT_SQL TQValueVector<Holder>; #endif diff --git a/src/tqmoc/tqmoc.l b/src/tqmoc/tqmoc.l index 373c6712c..8051e7310 100644 --- a/src/tqmoc/tqmoc.l +++ b/src/tqmoc/tqmoc.l @@ -41,30 +41,6 @@ %{ #ifdef TQMOC_YACC_CODE -#ifdef TQMOC_MWERKS_PLUGIN -#ifdef Q_OS_MAC9 -# define isascii(c) ((int)( (unsigned int) (c) <= (unsigned char)0x7F )) -#endif -const char *buf_buffer = NULL; -long buf_size_total = 0, buf_index = 0; -#define YY_INPUT(buf, result, max_size) \ - { \ - if(buf_index < buf_size_total ) { \ - while(!isascii(buf_buffer[buf_index])) buf_index++; \ - int ms = ((max_size < buf_size_total) ? max_size : buf_size_total); \ - for(result = 0; result < ms; result++) { \ - char c = buf_buffer[buf_index + result]; \ - if(!isascii(c)) { \ - buf_index++; \ - break; \ - } \ - buf[result] = c == '\r' ? '\n' : c; \ - } \ - buf_index += result; \ - } else result = YY_NULL; \ - } -#endif - #include "tqstring.h" diff --git a/src/tqmoc/tqmoc.pro b/src/tqmoc/tqmoc.pro index 2a430efee..bcb942e6e 100644 --- a/src/tqmoc/tqmoc.pro +++ b/src/tqmoc/tqmoc.pro @@ -51,15 +51,3 @@ macx:LIBS += -framework Carbon target.path=$$bins.path INSTALLS += target - -*-mwerks { - TEMPLATE = lib - TARGET = McMoc - CONFIG -= static - CONFIG += shared plugin - DEFINES += TQMOC_MWERKS_PLUGIN - MWERKSDIR = $QT_SOURCE_TREE/util/mwerks_plugin - INCLUDEPATH += $$MWERKSDIR/Headers - LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb - SOURCES += mwerks_mac.cpp -} diff --git a/src/tqmoc/tqmoc.y b/src/tqmoc/tqmoc.y index 7bd726a32..639756218 100644 --- a/src/tqmoc/tqmoc.y +++ b/src/tqmoc/tqmoc.y @@ -67,21 +67,6 @@ void yyerror( const char *msg ); #include "tqptrlist.h" #include "tqregexp.h" #include "tqstrlist.h" -#ifdef TQMOC_MWERKS_PLUGIN -# ifdef Q_OS_MACX -# undef OLD_DEBUG -# ifdef DEBUG -# define OLD_DEBUG DEBUG -# undef DEBUG -# endif -# define DEBUG 0 -# ifndef __IMAGECAPTURE__ -# define __IMAGECAPTURE__ -# endif -# include <Carbon/Carbon.h> -# endif -# include "mwerks_mac.h" -#endif #include <ctype.h> #include <stdio.h> @@ -1673,7 +1658,6 @@ void setDefaultIncludeFile() #define ErrorFormatString "%s:%d:" #endif -#ifndef TQMOC_MWERKS_PLUGIN int main( int argc, char **argv ) { init(); @@ -1815,109 +1799,7 @@ int main( int argc, char **argv ) cleanup(); return ret; } -#else -bool tqt_is_gui_used = FALSE; -#include <ctype.h> -#include <stdio.h> -#include <string.h> -#ifdef Q_OS_MAC9 -# include <Files.h> -# include <Strings.h> -# include <Errors.h> -# include "Aliases.h" -#endif -#include "CWPluginErrors.h" -#include <CWPlugins.h> -#include "DropInCompilerLinker.h" -#include <stat.h> - -const unsigned char *p_str(const char *, int =-1); - -CWPluginContext g_ctx; - -tqmoc_status do_moc( CWPluginContext ctx, const TQCString &fin, const TQCString &fout, CWFileSpec *dspec, bool i) -{ - init(); - - g_ctx = ctx; - g->noInclude = i; - g->fileName = fin; - g->outputFile = fout; - - setDefaultIncludeFile(); - - CWFileInfo fi; - memset(&fi, 0, sizeof(fi)); - fi.fullsearch = TRUE; - fi.dependencyType = cwNormalDependency; - fi.isdependentoffile = kCurrentCompiledFile; - if(CWFindAndLoadFile( ctx, fin.data(), &fi) != cwNoErr) { - cleanup(); - return tqmoc_no_source; - } - - if(dspec) { - memcpy(dspec, &fi.filespec, sizeof(fi.filespec)); - const unsigned char *f = p_str(fout.data()); - memcpy(dspec->name, f, f[0]+1); - free(f); - } - buf_size_total = fi.filedatalength; - buf_buffer = fi.filedata; - - TQCString path(""); - AliasHandle alias; - Str63 str; - AliasInfoType x = 1; - char tmp[sizeof(Str63)+2]; - if(NewAlias( NULL, &fi.filespec, &alias) != noErr) { - cleanup(); - return tqmoc_general_error; - } - for(;;) { - GetAliasInfo(alias, x++, str); - if(!str[0]) - break; - strncpy((char *)tmp, (const char *)str+1, str[0]); - tmp[str[0]] = '\0'; - path.prepend(":"); - path.prepend((char *)tmp); - } - path.prepend("MacOS 9:"); //FIXME - TQString inpath = path + fin, outpath = path + fout; - struct stat istat, ostat; - if(stat(inpath, &istat) == -1) { - cleanup(); - return tqmoc_no_source; - } - if(stat(outpath, &ostat) == 0 && istat.st_mtime < ostat.st_mtime) { - cleanup(); - return tqmoc_not_time; - } - - unlink(outpath.data()); - out = fopen(outpath.data(), "w+"); - if(!out) { - cleanup(); - return tqmoc_general_error; - } - - yyparse(); - if(out != stdout) - fclose(out); - - if(g->mocError || !g->generatedCode) { - unlink(outpath.data()); - tqmoc_status ret = !g->generatedCode ? tqmoc_no_qobject : tqmoc_parse_error; - cleanup(); - return ret; - } - - cleanup(); - return tqmoc_success; -} -#endif void replace( char *s, char c1, char c2 ) { if ( !s ) @@ -1995,23 +1877,12 @@ void init() // initialize tmpArgList = new ArgList; tmpFunc = new Function; tmpEnum = new Enum; - -#ifdef TQMOC_MWERKS_PLUGIN - buf_buffer = NULL; - buf_index = 0; - buf_size_total = 0; -#endif } void cleanup() { delete g; g = NULL; - -#ifdef TQMOC_MWERKS_PLUGIN - if(buf_buffer && g_ctx) - CWReleaseFileText(g_ctx, buf_buffer); -#endif } void initClass() // prepare for new class @@ -2182,13 +2053,7 @@ void addExpressionChar( const char c ) void yyerror( const char *msg ) // print yacc error message { g->mocError = TRUE; -#ifndef TQMOC_MWERKS_PLUGIN fprintf( stderr, ErrorFormatString" Error: %s\n", g->fileName.data(), lineNo, msg ); -#else - char msg2[200]; - sprintf(msg2, ErrorFormatString" Error: %s", g->fileName.data(), lineNo, msg); - CWReportMessage(g_ctx, NULL, msg2, NULL, messagetypeError, 0); -#endif if ( errorControl ) { if ( !g->outputFile.isEmpty() && yyin && fclose(yyin) == 0 ) remove( g->outputFile ); diff --git a/src/tqmoc/tqmoc_lex.cpp b/src/tqmoc/tqmoc_lex.cpp index aba3d5b48..de1d2822e 100644 --- a/src/tqmoc/tqmoc_lex.cpp +++ b/src/tqmoc/tqmoc_lex.cpp @@ -986,30 +986,6 @@ char *yytext; #line 42 "moc.l" #ifdef TQMOC_YACC_CODE -#ifdef TQMOC_MWERKS_PLUGIN -#ifdef Q_OS_MAC9 -# define isascii(c) ((int)( (unsigned int) (c) <= (unsigned char)0x7F )) -#endif -const char *buf_buffer = NULL; -long buf_size_total = 0, buf_index = 0; -#define YY_INPUT(buf, result, max_size) \ - { \ - if(buf_index < buf_size_total ) { \ - while(!isascii(buf_buffer[buf_index])) buf_index++; \ - int ms = ((max_size < buf_size_total) ? max_size : buf_size_total); \ - for(result = 0; result < ms; result++) { \ - char c = buf_buffer[buf_index + result]; \ - if(!isascii(c)) { \ - buf_index++; \ - break; \ - } \ - buf[result] = c == '\r' ? '\n' : c; \ - } \ - buf_index += result; \ - } else result = YY_NULL; \ - } -#endif - #include "tqstring.h" diff --git a/src/tqmoc/tqmoc_yacc.cpp b/src/tqmoc/tqmoc_yacc.cpp index fdf898cd6..2c7098fc1 100644 --- a/src/tqmoc/tqmoc_yacc.cpp +++ b/src/tqmoc/tqmoc_yacc.cpp @@ -80,21 +80,6 @@ void yyerror( const char *msg ); #include "tqptrlist.h" #include "tqregexp.h" #include "tqstrlist.h" -#ifdef TQMOC_MWERKS_PLUGIN -# ifdef Q_OS_MACX -# undef OLD_DEBUG -# ifdef DEBUG -# define OLD_DEBUG DEBUG -# undef DEBUG -# endif -# define DEBUG 0 -# ifndef __IMAGECAPTURE__ -# define __IMAGECAPTURE__ -# endif -# include <Carbon/Carbon.h> -# endif -# include "mwerks_mac.h" -#endif #include <ctype.h> #include <stdio.h> @@ -4548,7 +4533,6 @@ void setDefaultIncludeFile() #define ErrorFormatString "%s:%d:" #endif -#ifndef TQMOC_MWERKS_PLUGIN int main( int argc, char **argv ) { init(); @@ -4690,109 +4674,7 @@ int main( int argc, char **argv ) cleanup(); return ret; } -#else -bool tqt_is_gui_used = FALSE; -#include <ctype.h> -#include <stdio.h> -#include <string.h> -#ifdef Q_OS_MAC9 -# include <Files.h> -# include <Strings.h> -# include <Errors.h> -# include "Aliases.h" -#endif -#include "CWPluginErrors.h" -#include <CWPlugins.h> -#include "DropInCompilerLinker.h" -#include <stat.h> - -const unsigned char *p_str(const char *, int =-1); - -CWPluginContext g_ctx; - -tqmoc_status do_moc( CWPluginContext ctx, const TQCString &fin, const TQCString &fout, CWFileSpec *dspec, bool i) -{ - init(); - - g_ctx = ctx; - g->noInclude = i; - g->fileName = fin; - g->outputFile = fout; - - setDefaultIncludeFile(); - - CWFileInfo fi; - memset(&fi, 0, sizeof(fi)); - fi.fullsearch = TRUE; - fi.dependencyType = cwNormalDependency; - fi.isdependentoffile = kCurrentCompiledFile; - if(CWFindAndLoadFile( ctx, fin.data(), &fi) != cwNoErr) { - cleanup(); - return tqmoc_no_source; - } - if(dspec) { - memcpy(dspec, &fi.filespec, sizeof(fi.filespec)); - const unsigned char *f = p_str(fout.data()); - memcpy(dspec->name, f, f[0]+1); - free(f); - } - buf_size_total = fi.filedatalength; - buf_buffer = fi.filedata; - - TQCString path(""); - AliasHandle alias; - Str63 str; - AliasInfoType x = 1; - char tmp[sizeof(Str63)+2]; - if(NewAlias( NULL, &fi.filespec, &alias) != noErr) { - cleanup(); - return tqmoc_general_error; - } - for(;;) { - GetAliasInfo(alias, x++, str); - if(!str[0]) - break; - strncpy((char *)tmp, (const char *)str+1, str[0]); - tmp[str[0]] = '\0'; - path.prepend(":"); - path.prepend((char *)tmp); - } - path.prepend("MacOS 9:"); //FIXME - - TQString inpath = path + fin, outpath = path + fout; - struct stat istat, ostat; - if(stat(inpath, &istat) == -1) { - cleanup(); - return tqmoc_no_source; - } - if(stat(outpath, &ostat) == 0 && istat.st_mtime < ostat.st_mtime) { - cleanup(); - return tqmoc_not_time; - } - - unlink(outpath.data()); - out = fopen(outpath.data(), "w+"); - if(!out) { - cleanup(); - return tqmoc_general_error; - } - - yyparse(); - if(out != stdout) - fclose(out); - - if(g->mocError || !g->generatedCode) { - unlink(outpath.data()); - tqmoc_status ret = !g->generatedCode ? tqmoc_no_qobject : tqmoc_parse_error; - cleanup(); - return ret; - } - - cleanup(); - return tqmoc_success; -} -#endif void replace( char *s, char c1, char c2 ) { if ( !s ) @@ -4870,23 +4752,12 @@ void init() // initialize tmpArgList = new ArgList; tmpFunc = new Function; tmpEnum = new Enum; - -#ifdef TQMOC_MWERKS_PLUGIN - buf_buffer = NULL; - buf_index = 0; - buf_size_total = 0; -#endif } void cleanup() { delete g; g = NULL; - -#ifdef TQMOC_MWERKS_PLUGIN - if(buf_buffer && g_ctx) - CWReleaseFileText(g_ctx, buf_buffer); -#endif } void initClass() // prepare for new class @@ -5057,13 +4928,7 @@ void addExpressionChar( const char c ) void yyerror( const char *msg ) // print yacc error message { g->mocError = TRUE; -#ifndef TQMOC_MWERKS_PLUGIN fprintf( stderr, ErrorFormatString" Error: %s\n", g->fileName.data(), lineNo, msg ); -#else - char msg2[200]; - sprintf(msg2, ErrorFormatString" Error: %s", g->fileName.data(), lineNo, msg); - CWReportMessage(g_ctx, NULL, msg2, NULL, messagetypeError, 0); -#endif if ( errorControl ) { if ( !g->outputFile.isEmpty() && yyin && fclose(yyin) == 0 ) remove( g->outputFile ); diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp index b9c7cb047..e0bb62f1a 100644 --- a/tools/designer/app/main.cpp +++ b/tools/designer/app/main.cpp @@ -33,11 +33,6 @@ #include "qplatformdefs.h" -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - #include "mainwindow.h" #include "formwindow.h" @@ -52,11 +47,6 @@ #include <stdlib.h> #include <signal.h> -// SCO OpenServer redefines raise -> kill -#if defined(raise) -# undef raise -#endif - #if defined(TQ_WS_WIN) #include <qt_windows.h> #include <process.h> diff --git a/tools/designer/examples/opengl/main.cpp b/tools/designer/examples/opengl/main.cpp index 3882cab86..24f3fbb59 100644 --- a/tools/designer/examples/opengl/main.cpp +++ b/tools/designer/examples/opengl/main.cpp @@ -299,7 +299,7 @@ TQRESULT OpenGLWidgetInterface::queryInterface( const TQUuid& uuid, TQUnknownInt return TQS_OK; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( OpenGLWidgetInterface ); } diff --git a/tools/designer/plugins/cppeditor/common.cpp b/tools/designer/plugins/cppeditor/common.cpp index 02c80de11..7a8e94d73 100644 --- a/tools/designer/plugins/cppeditor/common.cpp +++ b/tools/designer/plugins/cppeditor/common.cpp @@ -105,7 +105,7 @@ TQRESULT CommonInterface::queryInterface( const TQUuid &uuid, TQUnknownInterface } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( CommonInterface ) } diff --git a/tools/designer/plugins/dlg/main.cpp b/tools/designer/plugins/dlg/main.cpp index 96bb6d914..ab93650b9 100644 --- a/tools/designer/plugins/dlg/main.cpp +++ b/tools/designer/plugins/dlg/main.cpp @@ -102,7 +102,7 @@ bool DlgFilter::canUnload() const return TRUE; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( DlgFilter ) } diff --git a/tools/designer/plugins/glade/main.cpp b/tools/designer/plugins/glade/main.cpp index 879493c6c..d4a7668b9 100644 --- a/tools/designer/plugins/glade/main.cpp +++ b/tools/designer/plugins/glade/main.cpp @@ -103,7 +103,7 @@ bool GladeFilter::canUnload() const return TRUE; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( GladeFilter ) } diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp index 767c90b9b..aef5517e0 100644 --- a/tools/designer/plugins/kdevdlg/main.cpp +++ b/tools/designer/plugins/kdevdlg/main.cpp @@ -114,7 +114,7 @@ bool KDevDlgFilter::canUnload() const return TRUE; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( KDevDlgFilter ) } diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp index 502c6729e..6a821686b 100644 --- a/tools/designer/plugins/rc/main.cpp +++ b/tools/designer/plugins/rc/main.cpp @@ -111,7 +111,7 @@ bool RCFilter::canUnload() const return TRUE; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( RCFilter ) } diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp index 1a4bb7b53..cca81382a 100644 --- a/tools/designer/plugins/wizards/main.cpp +++ b/tools/designer/plugins/wizards/main.cpp @@ -136,7 +136,7 @@ TQRESULT StandardTemplateWizardInterface::queryInterface( const TQUuid& uuid, TQ return TQS_OK; } -Q_EXPORT_COMPONENT() +TQ_EXPORT_COMPONENT() { Q_CREATE_INSTANCE( StandardTemplateWizardInterface ) } diff --git a/tools/designer/tquic/embed.cpp b/tools/designer/tquic/embed.cpp index 422023009..4f8fa48f4 100644 --- a/tools/designer/tquic/embed.cpp +++ b/tools/designer/tquic/embed.cpp @@ -297,7 +297,7 @@ void TQUic::embed( TQTextStream& out, const char* project, const TQStringList& i out << "{\n"; out << "public:\n"; out << " StaticInitImages_" << cProject << "() { qInitImages_" << cProject << "(); }\n"; - out << "#if defined(Q_OS_SCO) || defined(Q_OS_UNIXWARE)\n"; + out << "#if defined(Q_OS_UNIXWARE)\n"; out << " ~StaticInitImages_" << cProject << "() { }\n"; out << "#else\n"; out << " ~StaticInitImages_" << cProject << "() { qCleanupImages_" << cProject << "(); }\n"; diff --git a/tools/designer/tquic/tquic.pro b/tools/designer/tquic/tquic.pro index 40a9b436e..1f5d5f718 100644 --- a/tools/designer/tquic/tquic.pro +++ b/tools/designer/tquic/tquic.pro @@ -28,15 +28,3 @@ DESTDIR = ../../../bin target.path=$$bins.path INSTALLS += target - -*-mwerks { - TEMPLATE = lib - TARGET = McUic - CONFIG -= static - CONFIG += shared plugin - DEFINES += UIC_MWERKS_PLUGIN - MWERKSDIR = $(QT_SOURCE_TREE)/util/mwerks_plugin - INCLUDEPATH += $$MWERKSDIR/Headers - LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb - SOURCES += mwerks_mac.cpp -} |