diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
| commit | d671acd5b296b83440db9836a92189c501c87ff3 (patch) | |
| tree | bd9c1a000e17c70124c207666cfb3276b5518ffd /tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp | |
| parent | 42f5786104f9eef9542df2c7469a03324978281d (diff) | |
| parent | 4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff) | |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp')
| -rw-r--r-- | tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp index 83adf49fa4..cb51c3dfdd 100644 --- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -43,9 +43,6 @@ #include <QtTest/QtTest> #include <QtDebug> #include <QMetaObject> -#ifdef QT3_SUPPORT -#include <Q3ProgressBar> -#endif #include <private/qstylesheetstyle_p.h> #include "../platformquirks.h" @@ -1291,9 +1288,6 @@ void tst_QStyleSheetStyle::emptyStyleSheet() QWidget w; QHBoxLayout layout(&w); w.setLayout(&layout); -#ifdef QT3_SUPPORT - layout.addWidget(new Q3ProgressBar(&w)); //task 231137 -#endif layout.addWidget(new QPushButton("push", &w)); layout.addWidget(new QToolButton(&w)); QLabel label("toto", &w); |