Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (84 commits)
  Disabled activeqt/webbrowser example from mingw build.
  Fix broken Solaris build (getpwnam_r usage)
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)
  Update changelog for Qt 4.8
  add 4.8 changes created/merged by me
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  runonphone: Include USB serial ports on OS X for CODA, too
  Update changelog for Qt 4.8.0
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  Update changelog for Qt 4.8
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Update changelog for Qt 4.8
  Prevent unnecessary graphics item updates when graphics effect changes.
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  runonphone: Implement traceswitch support for coda
  ...

1 files changed, 56 insertions, 75 deletions

diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index 85030cd..ef97c67 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -1933,79 +1933,60 @@ EXPORTS
 	_ZN23QDeclarativeItemPrivate15setLayoutMirrorEb @ 1932 NONAME
 	_ZN23QDeclarativeItemPrivate19resolveLayoutMirrorEv @ 1933 NONAME
 	_ZN23QDeclarativeItemPrivate23setImplicitLayoutMirrorEbb @ 1934 NONAME
-	_ZN15QPacketProtocol18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1935 NONAME
-	_ZN15QPacketProtocol25staticMetaObjectExtraDataE @ 1936 NONAME DATA 8
-	_ZN16QDeclarativeItem18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1937 NONAME
-	_ZN16QDeclarativeItem25staticMetaObjectExtraDataE @ 1938 NONAME DATA 8
-	_ZN16QDeclarativeView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1939 NONAME
-	_ZN16QDeclarativeView25staticMetaObjectExtraDataE @ 1940 NONAME DATA 8
-	_ZN17QDeclarativeState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1941 NONAME
-	_ZN17QDeclarativeState25staticMetaObjectExtraDataE @ 1942 NONAME DATA 8
-	_ZN18QDeclarativeEngine18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1943 NONAME
-	_ZN18QDeclarativeEngine25staticMetaObjectExtraDataE @ 1944 NONAME DATA 8
-	_ZN19QDeclarativeContext18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1945 NONAME
-	_ZN19QDeclarativeContext25staticMetaObjectExtraDataE @ 1946 NONAME DATA 8
-	_ZN21QDeclarativeComponent18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1947 NONAME
-	_ZN21QDeclarativeComponent25staticMetaObjectExtraDataE @ 1948 NONAME DATA 8
-	_ZN22QDeclarativeExpression18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1949 NONAME
-	_ZN22QDeclarativeExpression25staticMetaObjectExtraDataE @ 1950 NONAME DATA 8
-	_ZN22QDeclarativeStateGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1951 NONAME
-	_ZN22QDeclarativeStateGroup25staticMetaObjectExtraDataE @ 1952 NONAME DATA 8
-	_ZN22QDeclarativeTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1953 NONAME
-	_ZN22QDeclarativeTransition25staticMetaObjectExtraDataE @ 1954 NONAME DATA 8
-	_ZN23QDeclarativeDebugServer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1955 NONAME
-	_ZN23QDeclarativeDebugServer25staticMetaObjectExtraDataE @ 1956 NONAME DATA 8
-	_ZN23QDeclarativePropertyMap18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1957 NONAME
-	_ZN23QDeclarativePropertyMap25staticMetaObjectExtraDataE @ 1958 NONAME DATA 8
-	_ZN24QDeclarativeDebugService18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1959 NONAME
-	_ZN24QDeclarativeDebugService25staticMetaObjectExtraDataE @ 1960 NONAME DATA 8
-	_ZN26QDeclarativeStateOperation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1961 NONAME
-	_ZN26QDeclarativeStateOperation25staticMetaObjectExtraDataE @ 1962 NONAME DATA 8
-	_ZN27QDeclarativeExtensionPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1963 NONAME
-	_ZN27QDeclarativeExtensionPlugin25staticMetaObjectExtraDataE @ 1964 NONAME DATA 8
-	_ZN15QPacketProtocol16waitForReadyReadEi @ 1965 NONAME
-	_ZN23QDeclarativeDebugServer14waitForMessageEP24QDeclarativeDebugService @ 1966 NONAME
-	_ZN24QDeclarativeDebugService14waitForMessageEv @ 1967 NONAME
-	_ZN27QDeclarativeObserverService10gotMessageERK10QByteArray @ 1968 NONAME ABSENT
-	_ZN27QDeclarativeObserverService10removeViewEP16QDeclarativeView @ 1969 NONAME ABSENT
-	_ZN27QDeclarativeObserverService11qt_metacallEN11QMetaObject4CallEiPPv @ 1970 NONAME ABSENT
-	_ZN27QDeclarativeObserverService11qt_metacastEPKc @ 1971 NONAME ABSENT
-	_ZN27QDeclarativeObserverService11sendMessageERK10QByteArray @ 1972 NONAME ABSENT
-	_ZN27QDeclarativeObserverService13statusChangedEN24QDeclarativeDebugService6StatusE @ 1973 NONAME ABSENT
-	_ZN27QDeclarativeObserverService15messageReceivedERK10QByteArray @ 1974 NONAME ABSENT
-	_ZN27QDeclarativeObserverService16staticMetaObjectE @ 1975 NONAME DATA 16 ABSENT
-	_ZN27QDeclarativeObserverService18loadObserverPluginEv @ 1976 NONAME ABSENT
-	_ZN27QDeclarativeObserverService18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1977 NONAME ABSENT
-	_ZN27QDeclarativeObserverService19getStaticMetaObjectEv @ 1978 NONAME ABSENT
-	_ZN27QDeclarativeObserverService25staticMetaObjectExtraDataE @ 1979 NONAME DATA 8 ABSENT
-	_ZN27QDeclarativeObserverService7addViewEP16QDeclarativeView @ 1980 NONAME ABSENT
-	_ZN27QDeclarativeObserverService8instanceEv @ 1981 NONAME ABSENT
-	_ZN27QDeclarativeObserverServiceC1Ev @ 1982 NONAME ABSENT
-	_ZN27QDeclarativeObserverServiceC2Ev @ 1983 NONAME ABSENT
-	_ZN28QDeclarativeDebuggingEnablerC1Ev @ 1984 NONAME
-	_ZN28QDeclarativeDebuggingEnablerC2Ev @ 1985 NONAME
-	_ZNK27QDeclarativeObserverService10metaObjectEv @ 1986 NONAME ABSENT
-	_ZTI27QDeclarativeObserverService @ 1987 NONAME ABSENT
-	_ZTV27QDeclarativeObserverService @ 1988 NONAME ABSENT
-	_ZN18QDeclarativePixmap10flushCacheEv @ 1989 NONAME
-	_ZN28QDeclarativeInspectorService10gotMessageERK10QByteArray @ 1990 NONAME
-	_ZN28QDeclarativeInspectorService10removeViewEP16QDeclarativeView @ 1991 NONAME
-	_ZN28QDeclarativeInspectorService11qt_metacallEN11QMetaObject4CallEiPPv @ 1992 NONAME
-	_ZN28QDeclarativeInspectorService11qt_metacastEPKc @ 1993 NONAME
-	_ZN28QDeclarativeInspectorService11sendMessageERK10QByteArray @ 1994 NONAME
-	_ZN28QDeclarativeInspectorService13statusChangedEN24QDeclarativeDebugService6StatusE @ 1995 NONAME
-	_ZN28QDeclarativeInspectorService15messageReceivedERK10QByteArray @ 1996 NONAME
-	_ZN28QDeclarativeInspectorService16staticMetaObjectE @ 1997 NONAME DATA 16
-	_ZN28QDeclarativeInspectorService18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1998 NONAME
-	_ZN28QDeclarativeInspectorService19getStaticMetaObjectEv @ 1999 NONAME
-	_ZN28QDeclarativeInspectorService19loadInspectorPluginEv @ 2000 NONAME
-	_ZN28QDeclarativeInspectorService25staticMetaObjectExtraDataE @ 2001 NONAME DATA 8
-	_ZN28QDeclarativeInspectorService7addViewEP16QDeclarativeView @ 2002 NONAME
-	_ZN28QDeclarativeInspectorService8instanceEv @ 2003 NONAME
-	_ZN28QDeclarativeInspectorServiceC1Ev @ 2004 NONAME
-	_ZN28QDeclarativeInspectorServiceC2Ev @ 2005 NONAME
-	_ZNK28QDeclarativeInspectorService10metaObjectEv @ 2006 NONAME
-	_ZTI28QDeclarativeInspectorService @ 2007 NONAME
-	_ZTV28QDeclarativeInspectorService @ 2008 NONAME
-	_ZN28QDeclarativeInspectorService12updateStatusEv @ 2009 NONAME
+	_ZN15QPacketProtocol16waitForReadyReadEi @ 1935 NONAME
+	_ZN15QPacketProtocol18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1936 NONAME
+	_ZN15QPacketProtocol25staticMetaObjectExtraDataE @ 1937 NONAME DATA 8
+	_ZN16QDeclarativeItem18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1938 NONAME
+	_ZN16QDeclarativeItem25staticMetaObjectExtraDataE @ 1939 NONAME DATA 8
+	_ZN16QDeclarativeView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1940 NONAME
+	_ZN16QDeclarativeView25staticMetaObjectExtraDataE @ 1941 NONAME DATA 8
+	_ZN17QDeclarativeState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1942 NONAME
+	_ZN17QDeclarativeState25staticMetaObjectExtraDataE @ 1943 NONAME DATA 8
+	_ZN18QDeclarativeEngine18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1944 NONAME
+	_ZN18QDeclarativeEngine25staticMetaObjectExtraDataE @ 1945 NONAME DATA 8
+	_ZN18QDeclarativePixmap10flushCacheEv @ 1946 NONAME
+	_ZN19QDeclarativeContext18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1947 NONAME
+	_ZN19QDeclarativeContext25staticMetaObjectExtraDataE @ 1948 NONAME DATA 8
+	_ZN21QDeclarativeComponent18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1949 NONAME
+	_ZN21QDeclarativeComponent25staticMetaObjectExtraDataE @ 1950 NONAME DATA 8
+	_ZN22QDeclarativeExpression18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1951 NONAME
+	_ZN22QDeclarativeExpression25staticMetaObjectExtraDataE @ 1952 NONAME DATA 8
+	_ZN22QDeclarativeStateGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1953 NONAME
+	_ZN22QDeclarativeStateGroup25staticMetaObjectExtraDataE @ 1954 NONAME DATA 8
+	_ZN22QDeclarativeTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1955 NONAME
+	_ZN22QDeclarativeTransition25staticMetaObjectExtraDataE @ 1956 NONAME DATA 8
+	_ZN23QDeclarativeDebugServer14waitForMessageEP24QDeclarativeDebugService @ 1957 NONAME
+	_ZN23QDeclarativeDebugServer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1958 NONAME
+	_ZN23QDeclarativeDebugServer25staticMetaObjectExtraDataE @ 1959 NONAME DATA 8
+	_ZN23QDeclarativePropertyMap18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1960 NONAME
+	_ZN23QDeclarativePropertyMap25staticMetaObjectExtraDataE @ 1961 NONAME DATA 8
+	_ZN24QDeclarativeDebugService14waitForMessageEv @ 1962 NONAME
+	_ZN24QDeclarativeDebugService18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1963 NONAME
+	_ZN24QDeclarativeDebugService25staticMetaObjectExtraDataE @ 1964 NONAME DATA 8
+	_ZN26QDeclarativeStateOperation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1965 NONAME
+	_ZN26QDeclarativeStateOperation25staticMetaObjectExtraDataE @ 1966 NONAME DATA 8
+	_ZN27QDeclarativeExtensionPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1967 NONAME
+	_ZN27QDeclarativeExtensionPlugin25staticMetaObjectExtraDataE @ 1968 NONAME DATA 8
+	_ZN28QDeclarativeDebuggingEnablerC1Ev @ 1969 NONAME
+	_ZN28QDeclarativeDebuggingEnablerC2Ev @ 1970 NONAME
+	_ZN28QDeclarativeInspectorService10gotMessageERK10QByteArray @ 1971 NONAME
+	_ZN28QDeclarativeInspectorService10removeViewEP16QDeclarativeView @ 1972 NONAME
+	_ZN28QDeclarativeInspectorService11qt_metacallEN11QMetaObject4CallEiPPv @ 1973 NONAME
+	_ZN28QDeclarativeInspectorService11qt_metacastEPKc @ 1974 NONAME
+	_ZN28QDeclarativeInspectorService11sendMessageERK10QByteArray @ 1975 NONAME
+	_ZN28QDeclarativeInspectorService12updateStatusEv @ 1976 NONAME
+	_ZN28QDeclarativeInspectorService13statusChangedEN24QDeclarativeDebugService6StatusE @ 1977 NONAME
+	_ZN28QDeclarativeInspectorService15messageReceivedERK10QByteArray @ 1978 NONAME
+	_ZN28QDeclarativeInspectorService16staticMetaObjectE @ 1979 NONAME DATA 16
+	_ZN28QDeclarativeInspectorService18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1980 NONAME
+	_ZN28QDeclarativeInspectorService19getStaticMetaObjectEv @ 1981 NONAME
+	_ZN28QDeclarativeInspectorService19loadInspectorPluginEv @ 1982 NONAME
+	_ZN28QDeclarativeInspectorService25staticMetaObjectExtraDataE @ 1983 NONAME DATA 8
+	_ZN28QDeclarativeInspectorService7addViewEP16QDeclarativeView @ 1984 NONAME
+	_ZN28QDeclarativeInspectorService8instanceEv @ 1985 NONAME
+	_ZN28QDeclarativeInspectorServiceC1Ev @ 1986 NONAME
+	_ZN28QDeclarativeInspectorServiceC2Ev @ 1987 NONAME
+	_ZNK28QDeclarativeInspectorService10metaObjectEv @ 1988 NONAME
+	_ZTI28QDeclarativeInspectorService @ 1989 NONAME
+	_ZTV28QDeclarativeInspectorService @ 1990 NONAME