Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (72 commits)
  Attempt again at fixing the OpenVG paint engine build
  Revert "Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp"
  Attempt at fixing compile failure introduced by 4.6 merge in qpaintengine_vg.cpp
  Fixing the wrong QUrl usage
  When on Symbian use smaller files.
  correctly position glyphs for complex languages
  Removed inneccessary QGlyphLayout::offsets initialization.
  Fix mirrored characters for RTL text in Symbian
  QNAM: Add a code comment related to the cache
  tst_QSystemSemaphore::processes fixed for WinCE
  tst_qsystemsemaphore: fix deployment of lackey.exe for WinCE
  tst_qsharedmemory: create multiple instances of lackey.exe on WinCE
  tst_qsharedmemory: fix deployment of lackey.exe for WinCE
  fix compilation of tst_sharedmemory on Windows CE
  QtScript: regression with instanceof operator for QMetaObject wrappers
  examples/widgets/stylesheet fix mainwindow.ui
  QStyleSheetStyle: fix memory leak on base style change
  QNAM HTTP: Fixed a bug when getting empty files with pipelining
  Fix window transparency on Symbian.
  Tweak the 'normalGeometry' of the widget before setting it.
  ...

1 files changed, 0 insertions, 122 deletions

diff --git a/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ppc32.txt
index 301c5e1..0550242 100644
--- a/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ppc32.txt
+++ b/tests/auto/bic/data/QtDBus.4.2.0.macx-gcc-ppc32.txt
@@ -1,9 +1,3 @@
-
-
-
-
-
-
 Class QSysInfo
    size=1 align=1
    base size=0 base align=1
@@ -24,38 +18,11 @@ Class qIsNull(float)::U
    base size=4 base align=4
 qIsNull(float)::U (0x983fc0) 0
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 Class QFlag
    size=4 align=4
    base size=4 base align=4
 QFlag (0x9aec40) 0
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 Class QInternal
    size=1 align=1
    base size=0 base align=1
@@ -72,7 +39,6 @@ Class QGenericReturnArgument
 QGenericReturnArgument (0x9fe980) 0
   QGenericArgument (0x9fe9c0) 0
 
-
 Class QMetaObject
    size=16 align=4
    base size=16 base align=4
@@ -88,7 +54,6 @@ Class QChar
    base size=2 base align=2
 QChar (0x9fedc0) 0
 
-
 Class QBasicAtomic
    size=4 align=4
    base size=4 base align=4
@@ -100,7 +65,6 @@ Class QAtomic
 QAtomic (0xb2b4c0) 0
   QBasicAtomic (0xb2b500) 0
 
-
 Class __darwin_pthread_handler_rec
    size=12 align=4
    base size=12 base align=4
@@ -181,7 +145,6 @@ Class QByteRef
    base size=8 base align=4
 QByteRef (0xbd34c0) 0
 
-
 Class QString::Null
    size=1 align=1
    base size=0 base align=1
@@ -202,7 +165,6 @@ Class QLatin1String
    base size=4 base align=4
 QLatin1String (0xd12000) 0
 
-
 Class QCharRef
    size=8 align=4
    base size=8 base align=4
@@ -214,7 +176,6 @@ Class QConstString
 QConstString (0xe1a080) 0
   QString (0xe1a0c0) 0
 
-
 Vtable for std::exception
 std::exception::_ZTVSt9exception: 5u entries
 0     (int (*)(...))0
@@ -276,8 +237,6 @@ Class QListData
    base size=4 base align=4
 QListData (0xe1aa40) 0
 
-
-
 Vtable for QObjectData
 QObjectData::_ZTV11QObjectData: 4u entries
 0     (int (*)(...))0
@@ -368,7 +327,6 @@ QIODevice (0xf3e540) 0
   QObject (0xf3e580) 0
       primary-for QIODevice (0xf3e540)
 
-
 Vtable for QDataStream
 QDataStream::_ZTV11QDataStream: 4u entries
 0     (int (*)(...))0
@@ -387,59 +345,6 @@ Class QMetaType
    base size=0 base align=1
 QMetaType (0xf3eec0) 0 empty
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 Class QMapData::Node
    size=8 align=4
    base size=8 base align=4
@@ -475,18 +380,11 @@ Class QVariant
    base size=16 base align=4
 QVariant (0x1039dc0) 0
 
-
-
-
-
-
-
 Class QVariantComparisonHelper
    size=4 align=4
    base size=4 base align=4
 QVariantComparisonHelper (0x112d880) 0
 
-
 Vtable for QDBusAbstractAdaptor
 QDBusAbstractAdaptor::_ZTV20QDBusAbstractAdaptor: 14u entries
 0     (int (*)(...))0
@@ -528,27 +426,23 @@ Class QDBusObjectPath
 QDBusObjectPath (0x112dc40) 0
   QString (0x112dc80) 0
 
-
 Class QDBusSignature
    size=4 align=4
    base size=4 base align=4
 QDBusSignature (0x11d4000) 0
   QString (0x11d4040) 0
 
-
 Class QDBusVariant
    size=16 align=4
    base size=16 base align=4
 QDBusVariant (0x11d4480) 0
   QVariant (0x11d44c0) 0
 
-
 Class QDBusConnection
    size=4 align=4
    base size=4 base align=4
 QDBusConnection (0x11d4840) 0
 
-
 Vtable for QDBusAbstractInterface
 QDBusAbstractInterface::_ZTV22QDBusAbstractInterface: 14u entries
 0     (int (*)(...))0
@@ -579,34 +473,22 @@ Class QRegExp
    base size=4 base align=4
 QRegExp (0x11d4ac0) 0
 
-
 Class QStringMatcher
    size=1036 align=4
    base size=1036 base align=4
 QStringMatcher (0x11d4d80) 0
 
-
-
 Class QStringList
    size=4 align=4
    base size=4 base align=4
 QStringList (0x11d4a40) 0
   QList<QString> (0x1259000) 0
 
-
-
 Class QDBusArgument
    size=4 align=4
    base size=4 base align=4
 QDBusArgument (0x1259840) 0
 
-
-
-
-
-
-
-
 Vtable for QDBusConnectionInterface
 QDBusConnectionInterface::_ZTV24QDBusConnectionInterface: 14u entries
 0     (int (*)(...))0
@@ -634,7 +516,6 @@ QDBusConnectionInterface (0x12e2680) 0
     QObject (0x12e2700) 0
         primary-for QDBusAbstractInterface (0x12e26c0)
 
-
 Vtable for QDBusInterface
 QDBusInterface::_ZTV14QDBusInterface: 14u entries
 0     (int (*)(...))0
@@ -692,6 +573,3 @@ QDBusServer (0x12e2c80) 0
   QObject (0x12e2cc0) 0
       primary-for QDBusServer (0x12e2c80)
 
-
-
-