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/lance/main.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/arthur/lance/main.cpp')
| -rw-r--r-- | tests/arthur/lance/main.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tests/arthur/lance/main.cpp b/tests/arthur/lance/main.cpp index 2bda932130..9e8e07f96d 100644 --- a/tests/arthur/lance/main.cpp +++ b/tests/arthur/lance/main.cpp @@ -137,14 +137,6 @@ static void displayCommands() " drawText x y \"text\"\n" " drawTiledPixmap pixmapfile x y width height sx sy\n" "\n" - "Compat functions for Qt 3:\n" - " qt3_drawArc x y width height angle sweep\n" - " qt3_drawChord x y width height angle sweep\n" - " qt3_drawEllipse x y width height\n" - " qt3_drawPie x y width height angle sweep\n" - " qt3_drawRect x y width height\n" - " qt3_drawRoundRect x y width height xfactor yfactor\n" - "\n" "Path commands:\n" " path_addEllipse pathname x y width height\n" " path_addPolygon pathname [ x1 y1 x2 y2 ... ] winding?\n" |