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/arthur/common/paintcommands.h | |
| 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/arthur/common/paintcommands.h')
| -rw-r--r-- | tests/arthur/common/paintcommands.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h index 08c0e25a7b..786ff64943 100644 --- a/tests/arthur/common/paintcommands.h +++ b/tests/arthur/common/paintcommands.h @@ -185,14 +185,6 @@ private: void command_gradient_setCoordinateMode(QRegExp re); // commands: drawing ops -#ifdef QT3_SUPPORT - void command_qt3_drawArc(QRegExp re); - void command_qt3_drawChord(QRegExp re); - void command_qt3_drawEllipse(QRegExp re); - void command_qt3_drawPie(QRegExp re); - void command_qt3_drawRect(QRegExp re); - void command_qt3_drawRoundRect(QRegExp re); -#endif void command_drawArc(QRegExp re); void command_drawChord(QRegExp re); void command_drawConvexPolygon(QRegExp re); |