diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:14:52 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:14:52 +0100 |
| commit | f4900d340a4c620b56871995741696d28e53c167 (patch) | |
| tree | 66d4ed6e4e8012e8a534717e87bf15cf8a992652 /tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt | |
| parent | 7c33ae6a7bbbd42ce70acf77aa55c1bc2a23c8ec (diff) | |
| parent | 843de37bca944110fdf3aab161d680e3845d2dd2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/widgets/styles/qmacstyle_mac.mm
Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1
Diffstat (limited to 'tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt')
| -rw-r--r-- | tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt index 71154e9150..78509e24cc 100644 --- a/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt @@ -2407,11 +2407,6 @@ QObjectCleanupHandler (0xb4463c30) 0 QObject (0xb4070508) 0 primary-for QObjectCleanupHandler (0xb4463c30) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb4070a48) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 |