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

diff --git a/tests/auto/bic/data/QtNetwork.4.2.0.win32-gcc-ia32.txt b/tests/auto/bic/data/QtNetwork.4.2.0.win32-gcc-ia32.txt
index 00c2a1c..ca18f9c 100644
--- a/tests/auto/bic/data/QtNetwork.4.2.0.win32-gcc-ia32.txt
+++ b/tests/auto/bic/data/QtNetwork.4.2.0.win32-gcc-ia32.txt
@@ -1,9 +1,3 @@
-
-
-
-
-
-
 Class QSysInfo
    size=1 align=1
    base size=0 base align=1
@@ -24,21 +18,6 @@ Class qIsNull(float)::U
    base size=4 base align=4
 qIsNull(float)::U (0xaf3380) 0
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 Class QFlag
    size=4 align=4
    base size=4 base align=4
@@ -54,7 +33,6 @@ Class QChar
    base size=2 base align=2
 QChar (0xb60f00) 0
 
-
 Class QBasicAtomic
    size=4 align=4
    base size=4 base align=4
@@ -81,20 +59,6 @@ Class QByteRef
    base size=8 base align=4
 QByteRef (0xc4bb00) 0
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 Class QInternal
    size=1 align=1
    base size=0 base align=1
@@ -120,7 +84,6 @@ Class QLatin1String
    base size=4 base align=4
 QLatin1String (0xee0240) 0
 
-
 Class QCharRef
    size=8 align=4
    base size=8 base align=4
@@ -132,7 +95,6 @@ Class QConstString
 QConstString (0x11f3dc0) 0
   QString (0x11f3e00) 0
 
-
 Vtable for std::exception
 std::exception::_ZTVSt9exception: 5u entries
 0     0u
@@ -194,7 +156,6 @@ Class QListData
    base size=4 base align=4
 QListData (0x12d61c0) 0
 
-
 Class QTextCodec::ConverterState
    size=28 align=4
    base size=28 base align=4
@@ -218,8 +179,6 @@ Class QTextCodec
 QTextCodec (0xee01c0) 0 nearly-empty
     vptr=((&QTextCodec::_ZTV10QTextCodec) + 8u)
 
-
-
 Class QTextEncoder
    size=32 align=4
    base size=32 base align=4
@@ -241,14 +200,11 @@ Class QGenericReturnArgument
 QGenericReturnArgument (0x144b300) 0
   QGenericArgument (0x144b340) 0
 
-
 Class QMetaObject
    size=16 align=4
    base size=16 base align=4
 QMetaObject (0x144b8c0) 0
 
-
-
 Vtable for QObjectData
 QObjectData::_ZTV11QObjectData: 4u entries
 0     0u
@@ -339,7 +295,6 @@ QIODevice (0x13b5a40) 0
   QObject (0x150ab40) 0
       primary-for QIODevice (0x13b5a40)
 
-
 Vtable for QDataStream
 QDataStream::_ZTV11QDataStream: 4u entries
 0     0u
@@ -358,22 +313,17 @@ Class QRegExp
    base size=4 base align=4
 QRegExp (0xee00c0) 0
 
-
 Class QStringMatcher
    size=1036 align=4
    base size=1036 base align=4
 QStringMatcher (0x15d9f80) 0
 
-
-
 Class QStringList
    size=4 align=4
    base size=4 base align=4
 QStringList (0xee0140) 0
   QList<QString> (0x15f1740) 0
 
-
-
 Vtable for QFactoryInterface
 QFactoryInterface::_ZTV17QFactoryInterface: 5u entries
 0     0u
@@ -501,23 +451,16 @@ QFile (0x1708080) 0
     QObject (0x1708100) 0
         primary-for QIODevice (0x17080c0)
 
-
 Class QFileInfo
    size=4 align=4
    base size=4 base align=4
 QFileInfo (0x1760140) 0
 
-
-
-
-
 Class QDir
    size=4 align=4
    base size=4 base align=4
 QDir (0x171efc0) 0
 
-
-
 Class QAbstractFileEngine::ExtensionOption
    size=1 align=1
    base size=0 base align=1
@@ -573,7 +516,6 @@ Class QAbstractFileEngine
 QAbstractFileEngine (0x16f5f80) 0
     vptr=((&QAbstractFileEngine::_ZTV19QAbstractFileEngine) + 8u)
 
-
 Vtable for QAbstractFileEngineHandler
 QAbstractFileEngineHandler::_ZTV26QAbstractFileEngineHandler: 5u entries
 0     0u
@@ -646,7 +588,6 @@ Class QHashDummyValue
    base size=0 base align=1
 QHashDummyValue (0x18bbb80) 0 empty
 
-
 Class QMapData::Node
    size=8 align=4
    base size=8 base align=4
@@ -670,7 +611,6 @@ Class QTextStream
 QTextStream (0x1afb580) 0
     vptr=((&QTextStream::_ZTV11QTextStream) + 8u)
 
-
 Class QTextStreamManipulator
    size=24 align=4
    base size=22 base align=4
@@ -706,9 +646,6 @@ QTextOStream (0x1b89740) 0
   QTextStream (0x1b89780) 0
       primary-for QTextOStream (0x1b89740)
 
-
-
-
 Class QVectorData
    size=16 align=4
    base size=16 base align=4
@@ -845,8 +782,6 @@ Class QLocale
    base size=4 base align=4
 QLocale (0x1e50cc0) 0
 
-
-
 Vtable for QSystemLocale
 QSystemLocale::_ZTV13QSystemLocale: 6u entries
 0     0u
@@ -872,59 +807,6 @@ Class QMetaType
    base size=0 base align=1
 QMetaType (0x1efb400) 0 empty
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 Class QVariant::PrivateShared
    size=8 align=4
    base size=8 base align=4
@@ -950,18 +832,11 @@ Class QVariant
    base size=16 base align=8
 QVariant (0x1476c80) 0
 
-
-
-
-
-
-
 Class QVariantComparisonHelper
    size=4 align=4
    base size=4 base align=4
 QVariantComparisonHelper (0x1fae800) 0
 
-
 Vtable for QSettings
 QSettings::_ZTV9QSettings: 14u entries
 0     0u
@@ -1038,8 +913,6 @@ Class QUrl
    base size=4 base align=4
 QUrl (0x1f1c180) 0
 
-
-
 Vtable for QEventLoop
 QEventLoop::_ZTV10QEventLoop: 14u entries
 0     0u
@@ -1065,7 +938,6 @@ QEventLoop (0x21b66c0) 0
   QObject (0x21b6700) 0
       primary-for QEventLoop (0x21b66c0)
 
-
 Vtable for QAbstractEventDispatcher
 QAbstractEventDispatcher::_ZTV24QAbstractEventDispatcher: 27u entries
 0     0u
@@ -1109,13 +981,11 @@ Class QModelIndex
    base size=16 base align=4
 QModelIndex (0x222d200) 0
 
-
 Class QPersistentModelIndex
    size=4 align=4
    base size=4 base align=4
 QPersistentModelIndex (0x222d180) 0
 
-
 Vtable for QAbstractItemModel
 QAbstractItemModel::_ZTV18QAbstractItemModel: 42u entries
 0     0u
@@ -1284,7 +1154,6 @@ Class QBasicTimer
    base size=4 base align=4
 QBasicTimer (0x22dd7c0) 0
 
-
 Vtable for QEvent
 QEvent::_ZTV6QEvent: 4u entries
 0     0u
@@ -1391,13 +1260,11 @@ Class QMetaMethod
    base size=8 base align=4
 QMetaMethod (0x143fc00) 0
 
-
 Class QMetaEnum
    size=8 align=4
    base size=8 base align=4
 QMetaEnum (0x143fc80) 0
 
-
 Class QMetaProperty
    size=20 align=4
    base size=20 base align=4
@@ -1408,7 +1275,6 @@ Class QMetaClassInfo
    base size=8 base align=4
 QMetaClassInfo (0x143fd80) 0
 
-
 Vtable for QMimeData
 QMimeData::_ZTV9QMimeData: 17u entries
 0     0u
@@ -1589,7 +1455,6 @@ QLibrary (0x2451040) 0
   QObject (0x2451080) 0
       primary-for QLibrary (0x2451040)
 
-
 Vtable for QPluginLoader
 QPluginLoader::_ZTV13QPluginLoader: 14u entries
 0     0u
@@ -1630,7 +1495,6 @@ Class QMutex
    base size=4 base align=4
 QMutex (0x24c17c0) 0
 
-
 Class QMutexLocker
    size=4 align=4
    base size=4 base align=4
@@ -1641,13 +1505,11 @@ Class QReadWriteLock
    base size=4 base align=4
 QReadWriteLock (0x24eee00) 0
 
-
 Class QReadLocker
    size=4 align=4
    base size=4 base align=4
 QReadLocker (0x24eefc0) 0
 
-
 Class QWriteLocker
    size=4 align=4
    base size=4 base align=4
@@ -1704,7 +1566,6 @@ Class QBitRef
    base size=8 base align=4
 QBitRef (0x2543ac0) 0
 
-
 Class QByteArrayMatcher
    size=1032 align=4
    base size=1032 base align=4
@@ -1715,43 +1576,36 @@ Class QDate
    base size=4 base align=4
 QDate (0x1e50b40) 0
 
-
 Class QTime
    size=4 align=4
    base size=4 base align=4
 QTime (0x1e50bc0) 0
 
-
 Class QDateTime
    size=4 align=4
    base size=4 base align=4
 QDateTime (0x1760040) 0
 
-
 Class QPoint
    size=8 align=4
    base size=8 base align=4
 QPoint (0x1f1c340) 0
 
-
 Class QPointF
    size=16 align=8
    base size=16 base align=8
 QPointF (0x1f1c380) 0
 
-
 Class QLine
    size=16 align=4
    base size=16 base align=4
 QLine (0x1f1c2c0) 0
 
-
 Class QLineF
    size=32 align=8
    base size=32 base align=8
 QLineF (0x1f1c300) 0
 
-
 Class QLinkedListData
    size=20 align=4
    base size=20 base align=4
@@ -1762,25 +1616,21 @@ Class QSize
    base size=8 base align=4
 QSize (0x1f1c240) 0
 
-
 Class QSizeF
    size=16 align=8
    base size=16 base align=8
 QSizeF (0x1f1c280) 0
 
-
 Class QRect
    size=16 align=4
    base size=16 base align=4
 QRect (0x1f1c1c0) 0
 
-
 Class QRectF
    size=32 align=8
    base size=32 base align=8
 QRectF (0x1f1c200) 0
 
-
 Class QSharedData
    size=4 align=4
    base size=4 base align=4
@@ -2004,13 +1854,11 @@ Class QNetworkAddressEntry
    base size=4 base align=4
 QNetworkAddressEntry (0x2add380) 0
 
-
 Class QNetworkInterface
    size=4 align=4
    base size=4 base align=4
 QNetworkInterface (0x2add700) 0
 
-
 Class QNetworkProxy
    size=4 align=4
    base size=4 base align=4
@@ -2134,8 +1982,3 @@ QUdpSocket (0x2b42700) 0
       QObject (0x2b427c0) 0
           primary-for QIODevice (0x2b42780)
 
-
-
-
-
-