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, 103 deletions

diff --git a/tests/auto/bic/data/QtNetwork.4.0.0.macx-gcc-ppc32.txt b/tests/auto/bic/data/QtNetwork.4.0.0.macx-gcc-ppc32.txt
index 949efd0..38a6774 100644
--- a/tests/auto/bic/data/QtNetwork.4.0.0.macx-gcc-ppc32.txt
+++ b/tests/auto/bic/data/QtNetwork.4.0.0.macx-gcc-ppc32.txt
@@ -59,20 +59,6 @@ Class QBool
    base size=4 base align=4
 QBool (0x7c2480) 0
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 Class QFlag
    size=4 align=4
    base size=4 base align=4
@@ -88,7 +74,6 @@ Class QChar
    base size=2 base align=2
 QChar (0x807440) 0
 
-
 Class QBasicAtomic
    size=4 align=4
    base size=4 base align=4
@@ -100,7 +85,6 @@ Class QAtomic
 QAtomic (0x807900) 0
   QBasicAtomic (0x807940) 0
 
-
 Class __darwin_pthread_handler_rec
    size=12 align=4
    base size=12 base align=4
@@ -181,19 +165,6 @@ Class QByteRef
    base size=8 base align=4
 QByteRef (0xec9840) 0
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 Class QInternal
    size=1 align=1
    base size=0 base align=1
@@ -219,7 +190,6 @@ Class QLatin1String
    base size=4 base align=4
 QLatin1String (0xff6d80) 0
 
-
 Class QCharRef
    size=8 align=4
    base size=8 base align=4
@@ -231,7 +201,6 @@ Class QConstString
 QConstString (0x1181dc0) 0
   QString (0x1181e00) 0
 
-
 Class QListData::Data
    size=24 align=4
    base size=24 base align=4
@@ -242,7 +211,6 @@ Class QListData
    base size=4 base align=4
 QListData (0x12a1140) 0
 
-
 Class QTextCodec::ConverterState
    size=28 align=4
    base size=28 base align=4
@@ -266,8 +234,6 @@ Class QTextCodec
 QTextCodec (0x12a15c0) 0 nearly-empty
     vptr=((& QTextCodec::_ZTV10QTextCodec) + 8u)
 
-
-
 Class QTextEncoder
    size=32 align=4
    base size=32 base align=4
@@ -289,14 +255,11 @@ Class QGenericReturnArgument
 QGenericReturnArgument (0x12a1cc0) 0
   QGenericArgument (0x12a1d00) 0
 
-
 Class QMetaObject
    size=16 align=4
    base size=16 base align=4
 QMetaObject (0x12a1f40) 0
 
-
-
 Vtable for QObjectData
 QObjectData::_ZTV11QObjectData: 4u entries
 0     (int (*)(...))0
@@ -387,7 +350,6 @@ QIODevice (0x14057c0) 0
   QObject (0x1405800) 0
       primary-for QIODevice (0x14057c0)
 
-
 Vtable for QDataStream
 QDataStream::_ZTV11QDataStream: 4u entries
 0     (int (*)(...))0
@@ -406,22 +368,17 @@ Class QRegExp
    base size=4 base align=4
 QRegExp (0x14f1000) 0
 
-
 Class QStringMatcher
    size=1036 align=4
    base size=1036 base align=4
 QStringMatcher (0x14f1280) 0
 
-
-
 Class QStringList
    size=4 align=4
    base size=4 base align=4
 QStringList (0x14f1540) 0
   QList<QString> (0x14f1580) 0
 
-
-
 Vtable for QFactoryInterface
 QFactoryInterface::_ZTV17QFactoryInterface: 5u entries
 0     (int (*)(...))0
@@ -576,7 +533,6 @@ Class QTextStream
 QTextStream (0x1680300) 0
     vptr=((& QTextStream::_ZTV11QTextStream) + 8u)
 
-
 Class QTextStreamManipulator
    size=24 align=4
    base size=22 base align=4
@@ -666,23 +622,16 @@ QFile (0x1713180) 0
     QObject (0x1713200) 0
         primary-for QIODevice (0x17131c0)
 
-
 Class QFileInfo
    size=4 align=4
    base size=4 base align=4
 QFileInfo (0x1713400) 0
 
-
-
-
-
 Class QDir
    size=4 align=4
    base size=4 base align=4
 QDir (0x17137c0) 0
 
-
-
 Vtable for QFileEngine
 QFileEngine::_ZTV11QFileEngine: 35u entries
 0     (int (*)(...))0
@@ -741,7 +690,6 @@ Class QFileEngineHandler
 QFileEngineHandler (0x1713c00) 0 nearly-empty
     vptr=((& QFileEngineHandler::_ZTV18QFileEngineHandler) + 8u)
 
-
 Vtable for QProcess
 QProcess::_ZTV8QProcess: 31u entries
 0     (int (*)(...))0
@@ -791,23 +739,6 @@ Class QMetaType
    base size=0 base align=1
 QMetaType (0x1713fc0) 0 empty
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 Class QVariant::PrivateShared
    size=8 align=4
    base size=8 base align=4
@@ -833,19 +764,11 @@ Class QVariant
    base size=16 base align=4
 QVariant (0x187b800) 0
 
-
-
-
-
 Class QVariantComparisonHelper
    size=4 align=4
    base size=4 base align=4
 QVariantComparisonHelper (0x191a1c0) 0
 
-
-
-
-
 Vtable for QSettings
 QSettings::_ZTV9QSettings: 14u entries
 0     (int (*)(...))0
@@ -922,8 +845,6 @@ Class QUrl
    base size=4 base align=4
 QUrl (0x191ad80) 0
 
-
-
 Vtable for QEventLoop
 QEventLoop::_ZTV10QEventLoop: 14u entries
 0     (int (*)(...))0
@@ -949,7 +870,6 @@ QEventLoop (0x191a900) 0
   QObject (0x191ac80) 0
       primary-for QEventLoop (0x191a900)
 
-
 Vtable for QAbstractEventDispatcher
 QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries
 0     (int (*)(...))0
@@ -993,13 +913,11 @@ Class QModelIndex
    base size=16 base align=4
 QModelIndex (0x1a20400) 0
 
-
 Class QPersistentModelIndex
    size=4 align=4
    base size=4 base align=4
 QPersistentModelIndex (0x1a20680) 0
 
-
 Vtable for QAbstractItemModel
 QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries
 0     (int (*)(...))0
@@ -1168,7 +1086,6 @@ Class QBasicTimer
    base size=4 base align=4
 QBasicTimer (0x1a20e80) 0
 
-
 Vtable for QEvent
 QEvent::_ZTV6QEvent: 4u entries
 0     (int (*)(...))0
@@ -1259,13 +1176,11 @@ Class QMetaMethod
    base size=8 base align=4
 QMetaMethod (0x1ae6900) 0
 
-
 Class QMetaEnum
    size=8 align=4
    base size=8 base align=4
 QMetaEnum (0x1ae6a40) 0
 
-
 Class QMetaProperty
    size=20 align=4
    base size=20 base align=4
@@ -1276,7 +1191,6 @@ Class QMetaClassInfo
    base size=8 base align=4
 QMetaClassInfo (0x1ae6bc0) 0
 
-
 Vtable for QMimeData
 QMimeData::_ZTV9QMimeData: 17u entries
 0     (int (*)(...))0
@@ -1563,7 +1477,6 @@ Class QBitRef
    base size=8 base align=4
 QBitRef (0x1c33480) 0
 
-
 Class QByteArrayMatcher
    size=1032 align=4
    base size=1032 base align=4
@@ -1584,49 +1497,41 @@ Class QHashDummyValue
    base size=0 base align=1
 QHashDummyValue (0x1c33800) 0 empty
 
-
 Class QDate
    size=4 align=4
    base size=4 base align=4
 QDate (0x1d32040) 0
 
-
 Class QTime
    size=4 align=4
    base size=4 base align=4
 QTime (0x1d322c0) 0
 
-
 Class QDateTime
    size=4 align=4
    base size=4 base align=4
 QDateTime (0x1d32500) 0
 
-
 Class QPoint
    size=8 align=4
    base size=8 base align=4
 QPoint (0x1d32700) 0
 
-
 Class QPointF
    size=16 align=8
    base size=16 base align=4
 QPointF (0x1d32d40) 0
 
-
 Class QLine
    size=16 align=4
    base size=16 base align=4
 QLine (0x1d32a40) 0
 
-
 Class QLineF
    size=32 align=8
    base size=32 base align=4
 QLineF (0x1e13040) 0
 
-
 Class QLinkedListData
    size=20 align=4
    base size=20 base align=4
@@ -1637,31 +1542,26 @@ Class QLocale
    base size=4 base align=4
 QLocale (0x1e136c0) 0
 
-
 Class QSize
    size=8 align=4
    base size=8 base align=4
 QSize (0x1e13880) 0
 
-
 Class QSizeF
    size=16 align=8
    base size=16 base align=4
 QSizeF (0x1e13f40) 0
 
-
 Class QRect
    size=16 align=4
    base size=16 base align=4
 QRect (0x1f47300) 0
 
-
 Class QRectF
    size=32 align=8
    base size=32 base align=4
 QRectF (0x1f47740) 0
 
-
 Class QSharedData
    size=4 align=4
    base size=4 base align=4
@@ -1977,6 +1877,3 @@ QUdpSocket (0x22272c0) 0
       QObject (0x2227380) 0
           primary-for QIODevice (0x2227340)
 
-
-
-