Merge commit 'origin/4.6' into kinetic-declarativeui

Conflicts:
	configure.exe

5 files changed, 9 insertions, 288 deletions

diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index abc8a7a..728703f 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -68,7 +68,7 @@ QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32
 QMAKE_LIBS_NETWORK      = 
 QMAKE_LIBS_EGL          = -llibEGL
 QMAKE_LIBS_OPENGL       = 
-QMAKE_LIBS_OPENVG       = -llibOpenVG
+QMAKE_LIBS_OPENVG       = -llibOpenVG -lgraphicsresource
 QMAKE_LIBS_COMPAT       = 
 QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
 QMAKE_LIBS_S60          = -lavkon
@@ -106,8 +106,9 @@ QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
 load(qt_config)
 load(platform_paths)
 
+MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl"
 MMP_RULES += PAGED
-MMP_RULES += "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl"
+MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
 SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6
 
 # Legacy support requires some hardcoded stdapis paths. 
diff --git a/mkspecs/features/static.prf b/mkspecs/features/static.prf
index 7ee7a8a..21a532e 100644
--- a/mkspecs/features/static.prf
+++ b/mkspecs/features/static.prf
@@ -12,4 +12,9 @@ mac {
     CONFIG += hide_symbols
 }
 
+symbian {
+    # we don't care about exports from static libraries, as they don't end up in DEF files
+    MMP_RULES -= $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
+}
+
 !static_and_shared:fix_output_dirs:fixExclusiveOutputDirs(static, shared)
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf
index b4dbc9c..8892d2a 100644
--- a/mkspecs/features/symbian/stl.prf
+++ b/mkspecs/features/symbian/stl.prf
@@ -18,19 +18,8 @@ INCLUDEPATH -= $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off
 exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll ) {
     LIBS *= -llibstdcppv5.dll
 
-    # STDCPP turns on standard C++ new behaviour in SBSv2
+    # STDCPP turns on standard C++ new behaviour (ie. throwing new)
     MMP_RULES += "STDCPP"
-    
-    # defining __SYMBIAN_STDCPP_SUPPORT__ turns on standard C++ new behaviour pre SBSv2
-    DEFINES += "__SYMBIAN_STDCPP_SUPPORT__"
-
-    # operator new is actually supplied in stdnew.lib for hardware builds
-    eabiStdNewLibBlock = \
-        "$${LITERAL_HASH}ifdef EABI" \
-        "LIBRARY stdnew.lib" \
-        "$${LITERAL_HASH}endif"
-
-    MMP_RULES += eabiStdNewLibBlock
 } else {
     LIBS *= -llibstdcpp.dll
 }
diff --git a/mkspecs/win32-mwc/qmake.conf b/mkspecs/win32-mwc/qmake.conf
deleted file mode 100644
index 8ebe4ff..0000000
--- a/mkspecs/win32-mwc/qmake.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# qmake configuration for win32-mwc
-#
-# Written for mwc
-#
-
-MAKEFILE_GENERATOR	= MINGW
-TEMPLATE		= app
-CONFIG			+= qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target
-QT			+= core gui
-DEFINES			+= UNICODE QT_NO_PROCESS QT_NO_SHAREDMEMORY QT_NO_CONCURRENT QT_NO_SYSTEMSEMAPHORE
-QMAKE_COMPILER_DEFINES  += __GNUC__ WIN32
-
-QMAKE_EXT_OBJ           = .o
-QMAKE_EXT_RES           = _res.o
-
-QMAKE_CC		= mwccsym2
-QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		=
-QMAKE_YACC		= byacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -gccinc -stackcommit 1024000 -stackreserve 1024000
-QMAKE_CFLAGS_DEPS	= -M
-QMAKE_CFLAGS_WARN_ON	= -w on -w nonotused -w nonotinlined -w noimplicit -w nopadding -w noemptydecl -w nounusedexpr -w nopossible
-QMAKE_CFLAGS_WARN_OFF	= -w off
-QMAKE_CFLAGS_RELEASE	= -O2
-QMAKE_CFLAGS_DEBUG	= -g -O1
-QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-
-QMAKE_CXX		= mwccsym2
-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_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
-QMAKE_CXXFLAGS_RTTI_ON	= -RTTI on
-QMAKE_CXXFLAGS_RTTI_OFF	= -RTTI off
-QMAKE_CXXFLAGS_EXCEPTIONS_ON = "-Cpp_exceptions on"
-QMAKE_CXXFLAGS_EXCEPTIONS_OFF = "-Cpp_exceptions off"
-
-QMAKE_INCDIR		=
-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
-
-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		= mwldsym2
-#QMAKE_LFLAGS		= -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
-QMAKE_LFLAGS		= 
-QMAKE_LFLAGS_EXCEPTIONS_ON = 
-QMAKE_LFLAGS_EXCEPTIONS_OFF = 
-#QMAKE_LFLAGS_RELEASE	= -Wl,-s
-QMAKE_LFLAGS_RELEASE	= 
-QMAKE_LFLAGS_DEBUG	=
-#QMAKE_LFLAGS_CONSOLE	= -Wl,-subsystem,console
-#QMAKE_LFLAGS_WINDOWS	= -Wl,-subsystem,windows
-QMAKE_LFLAGS_CONSOLE	= 
-QMAKE_LFLAGS_WINDOWS	= 
-QMAKE_LFLAGS_DLL        = -runtime dm
-QMAKE_LINK_OBJECT_MAX	= 99999999
-QMAKE_LINK_OBJECT_SCRIPT= object_script
-
-
-QMAKE_LIBS		=
-QMAKE_LIBS_CORE         = -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lws2_32
-QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-QMAKE_LIBS_NETWORK      = -lws2_32
-QMAKE_LIBS_OPENGL       = -lopengl32 -lglu32 -lgdi32 -luser32
-QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-#QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
-QMAKE_LIBS_QT_ENTRY     = -lqtmain
-
-!isEmpty(QMAKE_SH) {
-    MINGW_IN_SHELL      = 1
-	QMAKE_DIR_SEP		= /
-	QMAKE_COPY		= cp
-	QMAKE_COPY_DIR		= xcopy /s /q /y /i
-	QMAKE_MOVE		= mv
-	QMAKE_DEL_FILE		= rm
-	QMAKE_MKDIR		= mkdir
-	QMAKE_DEL_DIR		= rmdir
-    QMAKE_CHK_DIR_EXISTS = test -d
-} else {
-	QMAKE_COPY		= copy /y
-	QMAKE_COPY_DIR		= xcopy /s /q /y /i
-	QMAKE_MOVE		= move
-	QMAKE_DEL_FILE		= del
-	QMAKE_MKDIR		= mkdir
-	QMAKE_DEL_DIR		= rmdir
-    QMAKE_CHK_DIR_EXISTS	= if not exist
-}
-
-QMAKE_MOC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
-QMAKE_UIC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
-QMAKE_IDC		= $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
-
-QMAKE_IDL		= midl
-QMAKE_LIB		= $$QMAKE_LINK -library -o
-QMAKE_RC		= windres
-QMAKE_ZIP		= zip -r -9
-
-QMAKE_STRIP		= strip
-QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
-load(qt_config)
diff --git a/mkspecs/win32-mwc/qplatformdefs.h b/mkspecs/win32-mwc/qplatformdefs.h
deleted file mode 100644
index c1d6eb1..0000000
--- a/mkspecs/win32-mwc/qplatformdefs.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** 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 <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>
-#include <limits.h>
-
-#if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)
-typedef enum {
-    NameUnknown		  = 0, 
-    NameFullyQualifiedDN  = 1, 
-    NameSamCompatible	  = 2, 
-    NameDisplay		  = 3, 
-    NameUniqueId	  = 6, 
-    NameCanonical	  = 7, 
-    NameUserPrincipal	  = 8, 
-    NameCanonicalEx	  = 9, 
-    NameServicePrincipal  = 10, 
-    NameDnsDomain	  = 12
-} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;
-#endif
-
-#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
-#ifndef UNICODE
-#define QT_TSTAT		_stati64
-#else
-#define QT_TSTAT		_wstati64
-#endif
-#else
-#define QT_LSEEK		_lseek
-#ifndef UNICODE
-#define QT_TSTAT		_stat
-#else
-#define QT_TSTAT		_wstat
-#endif
-#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_LARGEFILE       0
-#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_FOPEN                fopen
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_FSEEK                fseeko64
-#define QT_FTELL                ftello64
-#else
-#define QT_FSEEK                fseek
-#define QT_FTELL                ftell
-#endif
-#define QT_FGETPOS              fgetpos
-#define QT_FSETPOS              fsetpos
-#define QT_FPOS_T               fpos_t
-#ifdef QT_LARGEFILE_SUPPORT
-#define QT_OFF_T                off64_t
-#else
-#define QT_OFF_T                long
-#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
-
-#define PATH_MAX 1024
-#endif // QPLATFORMDEFS_H