diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-16 01:22:45 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-16 01:22:45 +0100 |
| commit | 7075e291998612a3c0a530bb37a515dd07739e28 (patch) | |
| tree | 4e1992498d82ee3f6f92fd6d42754c92928dd581 /tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt | |
| parent | 1161a8a62907796ea45b1877bec31e66aeef77f6 (diff) | |
| parent | 3d9a40038f01bc2a3df0027a9be04e7fa3ce3850 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/widgets/styles/qstyleanimation.cpp
Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8
Diffstat (limited to 'tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt')
| -rw-r--r-- | tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt index 9deebf49a0..aa7b491552 100644 --- a/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtTest.5.0.0.linux-gcc-ia32.txt @@ -261,11 +261,6 @@ Class __sched_param base size=4 base align=4 __sched_param (0xb58d2bd0) 0 -Class timex - size=128 align=4 - base size=128 base align=4 -timex (0xb58d2c40) 0 - Class tm size=44 align=4 base size=44 base align=4 |