diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-12 21:03:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-12 21:03:49 +0100 |
| commit | d5098f2802255da10b749b93705084ad1fdfc6a5 (patch) | |
| tree | 6462008a4ab7d13435d93490fed96c62c516cbdf /tests/auto/widgets/widgets | |
| parent | d5a85940f785459d7b982d5fdf59a9fd18825092 (diff) | |
| parent | b5b41c18345719612e5411cc482466d2dbafdaf7 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7
Diffstat (limited to 'tests/auto/widgets/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qmenubar/qmenubar.pro | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qtextedit/qtextedit.pro | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/widgets/widgets/qmenubar/qmenubar.pro b/tests/auto/widgets/widgets/qmenubar/qmenubar.pro index 6f35d4516f..6bacaa0d37 100644 --- a/tests/auto/widgets/widgets/qmenubar/qmenubar.pro +++ b/tests/auto/widgets/widgets/qmenubar/qmenubar.pro @@ -5,5 +5,3 @@ SOURCES += tst_qmenubar.cpp # QTBUG-4965, QTBUG-11823 - unstable tests linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG += insignificant_test - -win32:CONFIG += insignificant_test # QTBUG-24326 diff --git a/tests/auto/widgets/widgets/qtextedit/qtextedit.pro b/tests/auto/widgets/widgets/qtextedit/qtextedit.pro index 294f1d84e7..85658c222e 100644 --- a/tests/auto/widgets/widgets/qtextedit/qtextedit.pro +++ b/tests/auto/widgets/widgets/qtextedit/qtextedit.pro @@ -17,5 +17,3 @@ wince* { } contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-20756 crashes on xcb - -win32:CONFIG += insignificant_test # QTBUG-24348 |