diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/book/qmake-install.leaf | 6 | ||||
| -rw-r--r-- | qmake/generators/mac/metrowerks_xml.cpp | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf index b988713e1..fc7c78467 100644 --- a/qmake/book/qmake-install.leaf +++ b/qmake/book/qmake-install.leaf @@ -31,12 +31,6 @@ 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 -The environment variable should be set to qws/envvar where envvar is -one of the following: - -linux-arm-g++ linux-generic-g++ linux-mips-g++ linux-x86-g++ -linux-freebsd-g++ linux-ipaq-g++ linux-solaris-g++ qnx-rtp-g++ - \i TQTDIR \BR This must be set to where TQt is (or will be) installed. For example, \e {c:\\qt} and \e {\\local\\qt} \endlist diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp index 22cc89b33..3d7853df6 100644 --- a/qmake/generators/mac/metrowerks_xml.cpp +++ b/qmake/generators/mac/metrowerks_xml.cpp @@ -43,7 +43,7 @@ #include <ntqregexp.h> #include <stdlib.h> #include <time.h> -#if !defined(TQWS) && defined(Q_OS_MAC) +#if defined(Q_OS_MAC) #include <Carbon/Carbon.h> #include <sys/types.h> #include <sys/stat.h> @@ -621,7 +621,7 @@ MetrowerksMakefileGenerator::findTemplate(const TQString &file) bool MetrowerksMakefileGenerator::createFork(const TQString &f) { -#if !defined(TQWS) && defined(Q_OS_MACX) +#if defined(Q_OS_MACX) FSRef fref; FSSpec fileSpec; if(TQFile::exists(f)) { @@ -664,7 +664,7 @@ MetrowerksMakefileGenerator::fixifyToMacPath(TQString &p, TQString &v, bool ) static TQString st_volume; if(st_volume.isEmpty()) { st_volume = var("QMAKE_VOLUMENAME"); -#if !defined(TQWS) && defined(Q_OS_MACX) +#if defined(Q_OS_MACX) if(st_volume.isEmpty()) { uchar foo[512]; HVolumeParam pb; |