Test conversion to TQt3 from Qt3 8c6fc1f8e35fd264dd01c582ca5e7549b32ab731

2 files changed, 193 insertions, 0 deletions

diff --git a/mkspecs/win32-msvc.net/qmake.conf b/mkspecs/win32-msvc.net/qmake.conf
new file mode 100644
index 000000000..34e0573dd
--- /dev/null
+++ b/mkspecs/win32-msvc.net/qmake.conf
@@ -0,0 +1,106 @@
+#
+#
+# qmake configuration for win32-msvc.net
+#
+# Written for Microsoft C++.NET.
+#
+
+MAKEFILE_GENERATOR	= MSVC.NET
+TEMPLATE		= app
+CONFIG			+= qt warn_on release incremental flat link_prl precompile_header
+DEFINES			+= UNICODE WIN32
+
+exists( $(QTDIR)\.qtwinconfig ) {
+	include( $(QTDIR)\.qtwinconfig )
+}
+
+QMAKE_CC		= cl
+QMAKE_LEX		= flex
+QMAKE_LEXFLAGS		=
+QMAKE_YACC		= byacc
+QMAKE_YACCFLAGS		= -d
+QMAKE_CFLAGS		= -nologo -Zm200
+QMAKE_CFLAGS_WARN_ON	= -W3
+QMAKE_CFLAGS_WARN_OFF	= -W0
+QMAKE_CFLAGS_RELEASE	= -O1
+QMAKE_CFLAGS_DEBUG	= -Zi -Gm
+QMAKE_CFLAGS_MT		= -MD
+QMAKE_CFLAGS_MT_DBG	= -MDd
+QMAKE_CFLAGS_MT_DLL	= -MD
+QMAKE_CFLAGS_MT_DLLDBG	= -MDd
+QMAKE_CFLAGS_YACC	=
+QMAKE_CFLAGS_STL_ON	= -GX
+QMAKE_CFLAGS_STL_OFF	=
+QMAKE_CFLAGS_RTTI_ON	= -GR
+QMAKE_CFLAGS_RTTI_OFF	=
+QMAKE_CFLAGS_EXCEPTIONS_ON = -GX
+QMAKE_CFLAGS_EXCEPTIONS_OFF =
+
+QMAKE_CXX		= $$QMAKE_CC
+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189
+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_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_QT		= $(QTDIR)\lib
+
+QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
+QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
+QMAKE_RUN_CC_IMP_BATCH	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<<
+QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
+QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
+QMAKE_RUN_CXX_IMP_BATCH	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
+
+QMAKE_LINK		= link
+QMAKE_LFLAGS		= /NOLOGO
+QMAKE_LFLAGS_RELEASE	= /DELAYLOAD:comdlg32.dll /DELAYLOAD:oleaut32.dll /DELAYLOAD:winmm.dll /DELAYLOAD:wsock32.dll /DELAYLOAD:winspool.dll
+QMAKE_LFLAGS_DEBUG	= /DEBUG
+QMAKE_LFLAGS_CONSOLE	= /SUBSYSTEM:CONSOLE
+QMAKE_LFLAGS_WINDOWS	= /SUBSYSTEM:WINDOWS
+QMAKE_LFLAGS_CONSOLE_DLL= /SUBSYSTEM:CONSOLE /DLL
+QMAKE_LFLAGS_WINDOWS_DLL= /SUBSYSTEM:WINDOWS /DLL
+QMAKE_LFLAGS_QT_DLL	= /BASE:0x39D00000
+
+QMAKE_LIBS		=
+QMAKE_LIBS_CONSOLE	=
+QMAKE_LIBS_WINDOWS	= kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib delayimp.lib
+QMAKE_LIBS_QT		= qt.lib
+QMAKE_LIBS_QT_THREAD	= tqt-mt.lib
+QMAKE_LIBS_QT_ENTRY	= qtmain.lib
+
+QMAKE_LIBS_OPENGL	= opengl32.lib glu32.lib
+QMAKE_LFLAGS_OPENGL	= /DELAYLOAD:opengl32.dll
+
+QMAKE_MOC		= $(QTDIR)\bin\moc.exe
+QMAKE_UIC		= $(QTDIR)\bin\uic.exe
+QMAKE_IDC		= $(QTDIR)\bin\idc.exe
+
+QMAKE_IDL		= midl
+QMAKE_LIB		= lib /NOLOGO
+QMAKE_RC		= rc
+
+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
+
+VCPROJ_EXTENSION	= .vcproj
+VCSOLUTION_EXTENSION	= .sln
diff --git a/mkspecs/win32-msvc.net/qplatformdefs.h b/mkspecs/win32-msvc.net/qplatformdefs.h
new file mode 100644
index 000000000..5c5c0fa43
--- /dev/null
+++ b/mkspecs/win32-msvc.net/qplatformdefs.h
@@ -0,0 +1,87 @@
+#ifndef TQPLATFORMDEFS_H
+#define TQPLATFORMDEFS_H
+
+#ifdef UNICODE
+#ifndef _UNICODE
+#define _UNICODE
+#endif
+#endif
+
+// Get TQt defines/settings
+
+#include "qglobal.h"
+
+#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 <stdlib.h>
+#include <windows.h>
+
+#define Q_FS_FAT
+#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
+#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
+#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
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_LSEEK		::_lseeki64
+#define QT_TSTAT		::_tstati64
+#else
+#define QT_LSEEK		::_lseek
+#define QT_TSTAT		::_tstat
+#endif
+#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
+
+#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
+
+typedef int mode_t;
+
+
+#endif // TQPLATFORMDEFS_H