Test conversion to TQt3 from Qt3 8c6fc1f8e35fd264dd01c582ca5e7549b32ab731

2 files changed, 260 insertions, 0 deletions

diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf
new file mode 100644
index 000000000..f0bbdb28d
--- /dev/null
+++ b/mkspecs/win32-borland/qmake.conf
@@ -0,0 +1,106 @@
+#
+#
+# qmake configuration for win32-borland
+#
+# Written for Borland C++.
+#
+
+MAKEFILE_GENERATOR	= BMAKE
+TEMPLATE		= app
+CONFIG			+= qt warn_on release link_prl
+DEFINES			+= UNICODE
+QMAKE_NOFORCE		= 1
+
+exists( $(QTDIR)\.qtwinconfig ) {
+	include( $(QTDIR)\.qtwinconfig )
+}
+
+QMAKE_CC		= bcc32
+QMAKE_LEX		= flex
+QMAKE_LEXFLAGS		= 
+QMAKE_YACC		= byacc
+QMAKE_YACCFLAGS		= -d
+QMAKE_CFLAGS		= -tWR
+QMAKE_CFLAGS_WARN_ON	= -w -w-hid
+QMAKE_CFLAGS_WARN_OFF	= -w-
+QMAKE_CFLAGS_RELEASE	= -O2
+QMAKE_CFLAGS_DEBUG	= -v
+QMAKE_CFLAGS_MT		= -tWM
+QMAKE_CFLAGS_MT_DBG	= -tWM
+QMAKE_CFLAGS_MT_DLL	= -tWM
+QMAKE_CFLAGS_MT_DLLDBG	= -tWM
+QMAKE_CFLAGS_YACC	=
+QMAKE_CFLAGS_CONSOLE	= -tWC
+QMAKE_CFLAGS_STL_ON	=
+QMAKE_CFLAGS_STL_OFF	=
+QMAKE_CFLAGS_RTTI_ON	=
+QMAKE_CFLAGS_RTTI_OFF	= -RT-
+QMAKE_CFLAGS_EXCEPTIONS_ON =
+QMAKE_CFLAGS_EXCEPTIONS_OFF = -x-
+
+QMAKE_CXX		= $$QMAKE_CC
+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+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_MT	= $$QMAKE_CFLAGS_MT
+QMAKE_CXXFLAGS_MT_DBG	= $$QMAKE_CFLAGS_MT_DBG
+QMAKE_CXXFLAGS_MT_DLL	= $$QMAKE_CFLAGS_MT_DLL
+QMAKE_CXXFLAGS_MT_DLLDBG= $$QMAKE_CFLAGS_MT_DLLDBG
+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_CONSOLE	= $$QMAKE_CFLAGS_CONSOLE
+QMAKE_CXXFLAGS_STL_ON	= $$QMAKE_CFLAGS_STL_ON
+QMAKE_CXXFLAGS_STL_OFF	= $$QMAKE_CFLAGS_STL_OFF
+QMAKE_CXXFLAGS_RTTI_ON	= $$QMAKE_CFLAGS_RTTI_ON
+QMAKE_CXXFLAGS_RTTI_OFF	= $$QMAKE_CFLAGS_RTTI_OFF
+QMAKE_CXXFLAGS_EXCEPTIONS_ON = $$QMAKE_CFLAGS_EXCEPTIONS_ON
+QMAKE_CXXFLAGS_EXCEPTIONS_OFF = $$QMAKE_CFLAGS_EXCEPTIONS_OFF
+
+QMAKE_INCDIR		=
+QMAKE_INCDIR_QT		= $(QTDIR)\include
+QMAKE_LIBDIR		= $(BCB)\lib
+QMAKE_LIBDIR_QT		= $(QTDIR)\lib
+
+QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -o$obj $src
+QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -o$@ $<
+QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$obj $src
+QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -o$@ $<
+
+QMAKE_LINK		= ilink32
+QMAKE_LFLAGS		= -c -x -Gn
+QMAKE_LFLAGS_RELEASE	=
+QMAKE_LFLAGS_DEBUG	= -v
+QMAKE_LFLAGS_CONSOLE	= -ap -Tpe c0x32.obj
+QMAKE_LFLAGS_WINDOWS	= -aa -Tpe c0w32.obj
+QMAKE_LFLAGS_CONSOLE_DLL= -Gi -ap -Tpd c0d32.obj
+QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj
+
+QMAKE_LIBS		= import32.lib
+QMAKE_LIBS_RT		= cw32i.lib
+QMAKE_LIBS_RTMT		= cw32mti.lib
+QMAKE_LIBS_CONSOLE	=
+QMAKE_LIBS_WINDOWS	=
+QMAKE_LIBS_QT		= qt.lib
+QMAKE_LIBS_QT_THREAD	= qtmt.lib
+QMAKE_LIBS_QT_ENTRY	= qtmain.lib
+
+QMAKE_LIBS_OPENGL	=
+QMAKE_LFLAGS_OPENGL	= /dopengl32.dll
+
+QMAKE_MOC		= $(QTDIR)\bin\moc.exe
+QMAKE_UIC		= $(QTDIR)\bin\uic.exe
+QMAKE_IDC		= $(QTDIR)\bin\idc.exe
+
+QMAKE_IDL		= midl
+QMAKE_LIB		= tlib /C /P256
+QMAKE_RC		= brcc32 -dQ_CC_BOR
+
+QMAKE_ZIP		= zip -r -9
+
+QMAKE_COPY		= copy
+QMAKE_MOVE		= move
+QMAKE_DEL_FILE		= del
+QMAKE_DEL_DIR		= rmdir
+QMAKE_CHK_DIR_EXISTS	= if not exist
+QMAKE_MKDIR		= mkdir
diff --git a/mkspecs/win32-borland/qplatformdefs.h b/mkspecs/win32-borland/qplatformdefs.h
new file mode 100644
index 000000000..39ce64a01
--- /dev/null
+++ b/mkspecs/win32-borland/qplatformdefs.h
@@ -0,0 +1,154 @@
+#ifndef TQPLATFORMDEFS_H
+#define TQPLATFORMDEFS_H
+
+#ifdef UNICODE
+#ifndef _UNICODE
+#define _UNICODE
+#endif
+#endif
+
+// Get TQt defines/settings
+
+#include "qglobal.h"
+#define Q_FS_FAT
+
+#define _POSIX_
+#include <limits.h>
+#undef _POSIX_
+
+#include <tchar.h>
+#include <io.h>
+#include <direct.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <dos.h>
+#include <stdlib.h>
+#include <windows.h>
+
+#if __BORLANDC__ >= 0x550
+// Borland Builder 6
+
+#ifdef QT_LARGEFILE_SUPPORT
+#  define QT_STATBUF		struct stati64		// non-ANSI defs
+#  define QT_STATBUF4TSTAT	struct stati64		// non-ANSI defs
+#  define QT_STAT		::_stati64
+#  define QT_FSTAT		::fstati64
+#  define QT_LSEEK		::_lseeki64
+#  define QT_TSTAT		::_tstati64
+#else
+#  define QT_STATBUF		struct stat		// non-ANSI defs
+#  define QT_STATBUF4TSTAT	struct _stat		// non-ANSI defs
+#  define QT_STAT		::stat
+#  define QT_FSTAT		::fstat
+#  define QT_LSEEK		::_lseek
+#  define QT_TSTAT		::_tstat
+#endif
+
+#define QT_STAT_REG		_S_IFREG
+#define QT_STAT_DIR		_S_IFDIR
+#define QT_STAT_MASK		_S_IFMT
+
+#if defined(_S_IFLNK)
+#  define QT_STAT_LNK		_S_IFLNK
+#endif
+
+#define QT_FILENO		_fileno
+#define QT_OPEN			::open
+#define QT_CLOSE		::_close
+
+#define QT_READ			::_read
+#define QT_WRITE		::_write
+#define QT_ACCESS		::_access
+#define QT_GETCWD		::_getcwd
+#define QT_CHDIR		::chdir
+#define QT_MKDIR		::_mkdir
+#define QT_RMDIR		::_rmdir
+#define QT_OPEN_RDONLY		_O_RDONLY
+#define QT_OPEN_WRONLY		_O_WRONLY
+#define QT_OPEN_RDWR		_O_RDWR
+#define QT_OPEN_CREAT		_O_CREAT
+#define QT_OPEN_TRUNC		_O_TRUNC
+#define QT_OPEN_APPEND		_O_APPEND
+
+#if defined(O_TEXT)
+#  define QT_OPEN_TEXT		_O_TEXT
+#  define QT_OPEN_BINARY	_O_BINARY
+#endif
+
+#else
+// Borland Builder 5
+
+#ifdef QT_LARGEFILE_SUPPORT
+#  define QT_STATBUF		struct stati64		// non-ANSI defs
+#  define QT_STATBUF4TSTAT	struct stati64		// non-ANSI defs
+#  define QT_STAT		::stati64
+#  define QT_FSTAT		::fstati64
+#  define QT_LSEEK		::lseeki64
+#  define QT_TSTAT		::tstati64
+#else
+#  define QT_STATBUF		struct stat		// non-ANSI defs
+#  define QT_STATBUF4TSTAT	struct stat		// non-ANSI defs
+#  define QT_STAT		::stat
+#  define QT_FSTAT		::fstat
+#  define QT_LSEEK		::lseek
+#  define QT_TSTAT		::tstat
+#endif
+
+#define QT_STAT_REG		S_IFREG
+#define QT_STAT_DIR		S_IFDIR
+#define QT_STAT_MASK		S_IFMT
+
+#if defined(S_IFLNK)
+#  define QT_STAT_LNK		S_IFLNK
+#endif
+
+#define QT_FILENO		fileno
+#define QT_OPEN			::open
+#define QT_CLOSE		::close
+
+#define QT_READ			::read
+#define QT_WRITE		::write
+#define QT_ACCESS		::access
+
+#if defined(Q_OS_OS2EMX)
+    // This is documented in the un*x to OS/2-EMX Porting FAQ:
+    // http://homepages.tu-darmstadt.de/~st002279/os2/porting.html
+#  define QT_GETCWD		::_getcwd2
+#  define QT_CHDIR		::_chdir2
+#else
+#  define QT_GETCWD		::getcwd
+#  define QT_CHDIR		::chdir
+#endif
+
+#define QT_MKDIR		::mkdir
+#define QT_RMDIR		::rmdir
+#define QT_OPEN_RDONLY		O_RDONLY
+#define QT_OPEN_WRONLY		O_WRONLY
+#define QT_OPEN_RDWR		O_RDWR
+#define QT_OPEN_CREAT		O_CREAT
+#define QT_OPEN_TRUNC		O_TRUNC
+#define QT_OPEN_APPEND		O_APPEND
+
+#if defined(O_TEXT)
+#  define QT_OPEN_TEXT		O_TEXT
+#  define QT_OPEN_BINARY	O_BINARY
+#endif
+
+#endif // __BORLANDC__ >= 0x550
+
+// Borland Builder 5 and 6
+
+#define QT_SIGNAL_ARGS		int
+
+#define QT_VSNPRINTF		::_vsnprintf
+#define QT_SNPRINTF		::_snprintf
+
+# define F_OK	0
+# define X_OK	1
+# define W_OK	2
+# define R_OK	4
+
+
+#endif // TQPLATFORMDEFS_H