Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 221 insertions, 0 deletions

diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
new file mode 100644
index 0000000..d6e4ba7
--- /dev/null
+++ b/mkspecs/common/wince/qmake.conf
@@ -0,0 +1,90 @@
+#
+# qmake configuration for common Windows CE
+#
+
+MAKEFILE_GENERATOR = MSVC.NET
+TEMPLATE = app
+QT	       += core gui
+CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
+
+DEFINES    += UNDER_CE WINCE _WINDOWS _UNICODE UNICODE _WIN32 QT_NO_PRINTER QT_NO_PRINTDIALOG
+
+QMAKE_COMPILER_DEFINES  += _MSC_VER=1400
+
+QMAKE_CC		= cl
+QMAKE_LEX		= flex
+QMAKE_LEXFLAGS		=
+QMAKE_YACC		= byacc
+QMAKE_YACCFLAGS		= -d
+QMAKE_CFLAGS		= -nologo -Zm200 -Zc:wchar_t-
+QMAKE_CFLAGS_WARN_ON	= -W3
+QMAKE_CFLAGS_WARN_OFF	= -W0
+QMAKE_CFLAGS_RELEASE    = -O2 -MD
+QMAKE_CFLAGS_LTCG       = -GL
+QMAKE_CFLAGS_DEBUG	= -DDEBUG -D_DEBUG -Zi -MDd
+QMAKE_CFLAGS_YACC	=
+
+# Uncomment the following lines to reduce library sizes
+# with potential cost of performance
+# QMAKE_CFLAGS += -Os
+# QMAKE_CFLAGS_RELEASE += -Os
+
+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_LTCG     = $$QMAKE_CFLAGS_LTCG
+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_STL_ON	= -EHsc
+QMAKE_CXXFLAGS_STL_OFF	=
+QMAKE_CXXFLAGS_RTTI_ON	= -GR
+QMAKE_CXXFLAGS_RTTI_OFF	=
+QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc
+QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -EHs-c-
+
+QMAKE_INCDIR		=
+QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+
+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 /NODEFAULTLIB:OLDNAMES.LIB
+QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
+QMAKE_LFLAGS_DEBUG	= /DEBUG
+QMAKE_LFLAGS_LTCG       = /LTCG
+QMAKE_LIBS_NETWORK      = ws2.lib
+QMAKE_LIBS_OPENGL       = 
+QMAKE_LIBS_COMPAT       = 
+
+QMAKE_LIBS_QT_ENTRY	= -lqtmain
+
+QMAKE_MOC		= $$[QT_INSTALL_BINS]\moc.exe
+QMAKE_UIC		= $$[QT_INSTALL_BINS]\uic.exe
+QMAKE_IDC		= $$[QT_INSTALL_BINS]\idc.exe
+
+QMAKE_IDL		= midl
+QMAKE_LIB		= lib
+QMAKE_RC		= rc
+
+QMAKE_ZIP		= zip -r -9
+
+QMAKE_COPY		= copy /y
+QMAKE_COPY_DIR		= xcopy /s /q /y /i
+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
+VCPROJ_KEYWORD	= Qt4VSv1.0
+load(qt_config)
diff --git a/mkspecs/common/wince/qplatformdefs.h b/mkspecs/common/wince/qplatformdefs.h
new file mode 100644
index 0000000..4e67948
--- /dev/null
+++ b/mkspecs/common/wince/qplatformdefs.h
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake spec of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+#ifdef UNICODE
+#ifndef _UNICODE
+#define _UNICODE
+#endif
+#endif
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+#include "qfunctions_wince.h"
+
+#define _POSIX_
+#include <limits.h>
+#undef _POSIX_
+
+#include <tchar.h>
+#include <stdio.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			::qt_wince_stat
+#define QT_FSTAT		::qt_wince__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		::qt_wince___fileno
+#define QT_OPEN			::qt_wince_open
+#define QT_CLOSE		::qt_wince__close
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_LSEEK		::_lseeki64
+#define QT_TSTAT		::_tstati64
+#else
+#define QT_LSEEK		::qt_wince__lseek
+#define QT_TSTAT		::_tstat
+#endif
+#define QT_READ			::qt_wince__read
+#define QT_WRITE		::qt_wince__write
+#define QT_ACCESS		::qt_wince__access
+#define QT_GETCWD		::_getcwd
+#define QT_CHDIR		::_chdir
+#define QT_MKDIR		::qt_wince__mkdir
+#define QT_RMDIR		::qt_wince__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
+# define QT_OPEN_TEXT		_O_TEXT
+# define QT_OPEN_BINARY		_O_BINARY
+
+#define QT_FOPEN                ::fopen
+#define QT_FSEEK                ::fseek
+#define QT_FTELL                ::ftell
+#define QT_FGETPOS              ::fgetpos
+#define QT_FSETPOS              ::fsetpos
+#define QT_FPOS_T               fpos_t
+#define QT_OFF_T                long
+
+#define QT_SIGNAL_ARGS		int
+
+#define QT_VSNPRINTF(buffer, count, format, arg) \
+    _vsnprintf(buffer, count, format, arg)
+
+#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 // QPLATFORMDEFS_H