AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use Qt3Support in arthur test suite.

Browse Source 
Change-Id: I5acc05aeb7db5aedbbe35594f46d614319a299b2
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
This commit is contained in:
Jason McDonald 2011-05-17 12:04:02 +10:00
parent cbb5d693c8
commit 65feb28928
10 changed files with 1 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/arthur/common/common.pro
View File

@ -6,7 +6,7 @@
#include(../arthurtester.pri)
#TEMPLATE = lib
#CONFIG += static
#QT += xml opengl svg qt3support
#QT += xml opengl svg
#build_all:!build_pass {
# CONFIG -= build_all

148
tests/arthur/common/paintcommands.cpp
View File

@ -49,10 +49,6 @@
#include <qtextlayout.h>
#include <qdebug.h>
#ifdef QT3_SUPPORT
#include <q3painter.h>
#endif
#ifndef QT_NO_OPENGL
#include <qglpixelbuffer.h>
#endif
@ -364,33 +360,6 @@ void PaintCommands::staticInit()
"^gradient_setCoordinateMode\\s+(\\w*)$",
"gradient_setCoordinateMode <coordinate method enum>",
"gradient_setCoordinateMode ObjectBoundingMode");
#ifdef QT3_SUPPORT
DECL_PAINTCOMMANDSECTION("qt3 drawing ops");
DECL_PAINTCOMMAND("qt3_drawArc", command_qt3_drawArc,
"^qt3_drawArc\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
"qt3_drawArc <x> <y> <w> <h> <angleStart> <angleArc>\n - angles are expressed in 1/16th of degree",
"qt3_drawArc 10 10 20 20 0 5760");
DECL_PAINTCOMMAND("qt3_drawChord", command_qt3_drawChord,
"^qt3_drawChord\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
"qt3_drawChord <x> <y> <w> <h> <angleStart> <angleArc>\n - angles are expressed in 1/16th of degree",
"qt3_drawChord 10 10 20 20 0 5760");
DECL_PAINTCOMMAND("qt3_drawEllipse", command_qt3_drawEllipse,
"^qt3_drawEllipse\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
"qt3_drawEllipse <x> <y> <w> <h>",
"qt3_drawEllipse 10 10 20 20");
DECL_PAINTCOMMAND("qt3_drawPie", command_qt3_drawPie,
"^qt3_drawPie\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
"qt3_drawPie <x> <y> <w> <h> <angleStart> <angleArc>\n - angles are expressed in 1/16th of degree",
"qt3_drawPie 10 10 20 20 0 5760");
DECL_PAINTCOMMAND("qt3_drawRect", command_qt3_drawRect,
"^qt3_drawRect\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
"qt3_drawRect <x> <y> <w> <h>",
"qt3_drawRect 10 10 20 20");
DECL_PAINTCOMMAND("qt3_drawRoundRect", command_qt3_drawRoundRect,
"^qt3_drawRoundRect\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s*(-?\\w)?\\s*(-?\\w)?$",
"qt3_drawRoundRect <x> <y> <w> <h> [rx] [ry]",
"qt3_drawRoundRect 10 10 20 20 3 3");
#endif
DECL_PAINTCOMMANDSECTION("drawing ops");
DECL_PAINTCOMMAND("drawPoint", command_drawPoint,
"^drawPoint\\s+(-?[\\w.]*)\\s+(-?[\\w.]*)$",
@ -1271,123 +1240,6 @@ void PaintCommands::command_drawArc(QRegExp re)
m_painter->drawArc(x, y, w, h, angle, sweep);
}
#ifdef QT3_SUPPORT
/***************************************************************************************************/
void PaintCommands::command_qt3_drawRect(QRegExp re)
{
Q_UNUSED(re);
#ifdef QT3_SUPPORT
QStringList caps = re.capturedTexts();
int x = convertToInt(caps.at(1));
int y = convertToInt(caps.at(2));
int w = convertToInt(caps.at(3));
int h = convertToInt(caps.at(4));
if (m_verboseMode)
printf(" -(lance) qt3_drawRect(%d, %d, %d, %d)\n", x, y, w, h);
static_cast<Q3Painter*>(m_painter)->drawRect(x, y, w, h);
#endif
}
/***************************************************************************************************/
void PaintCommands::command_qt3_drawRoundRect(QRegExp re)
{
Q_UNUSED(re);
#ifdef QT3_SUPPORT
QStringList caps = re.capturedTexts();
int x = convertToInt(caps.at(1));
int y = convertToInt(caps.at(2));
int w = convertToInt(caps.at(3));
int h = convertToInt(caps.at(4));
int xrnd = caps.at(5).isEmpty() ? 25 : convertToInt(caps.at(5));
int yrnd = caps.at(6).isEmpty() ? 25 : convertToInt(caps.at(6));
if (m_verboseMode)
printf(" -(lance) qt3_drawRoundRect(%d, %d, %d, %d), %d, %d\n", x, y, w, h, xrnd, yrnd);
static_cast<Q3Painter*>(m_painter)->drawRoundRect(x, y, w, h, xrnd, yrnd);
#endif
}
/***************************************************************************************************/
void PaintCommands::command_qt3_drawEllipse(QRegExp re)
{
Q_UNUSED(re);
#ifdef QT3_SUPPORT
QStringList caps = re.capturedTexts();
int x = convertToInt(caps.at(1));
int y = convertToInt(caps.at(2));
int w = convertToInt(caps.at(3));
int h = convertToInt(caps.at(4));
if (m_verboseMode)
printf(" -(lance) qt3_drawEllipse(%d, %d, %d, %d)\n", x, y, w, h);
static_cast<Q3Painter*>(m_painter)->drawEllipse(x, y, w, h);
#endif
}
/***************************************************************************************************/
void PaintCommands::command_qt3_drawPie(QRegExp re)
{
Q_UNUSED(re);
#ifdef QT3_SUPPORT
QStringList caps = re.capturedTexts();
int x = convertToInt(caps.at(1));
int y = convertToInt(caps.at(2));
int w = convertToInt(caps.at(3));
int h = convertToInt(caps.at(4));
int angle = convertToInt(caps.at(5));
int sweep = convertToInt(caps.at(6));
if (m_verboseMode)
printf(" -(lance) qt3_drawPie(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep);
static_cast<Q3Painter*>(m_painter)->drawPie(x, y, w, h, angle, sweep);
#endif
}
/***************************************************************************************************/
void PaintCommands::command_qt3_drawChord(QRegExp re)
{
Q_UNUSED(re);
#ifdef QT3_SUPPORT
QStringList caps = re.capturedTexts();
int x = convertToInt(caps.at(1));
int y = convertToInt(caps.at(2));
int w = convertToInt(caps.at(3));
int h = convertToInt(caps.at(4));
int angle = convertToInt(caps.at(5));
int sweep = convertToInt(caps.at(6));
if (m_verboseMode)
printf(" -(lance) qt3_drawChord(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep);
static_cast<Q3Painter*>(m_painter)->drawChord(x, y, w, h, angle, sweep);
#endif
}
/***************************************************************************************************/
void PaintCommands::command_qt3_drawArc(QRegExp re)
{
Q_UNUSED(re);
#ifdef QT3_SUPPORT
QStringList caps = re.capturedTexts();
int x = convertToInt(caps.at(1));
int y = convertToInt(caps.at(2));
int w = convertToInt(caps.at(3));
int h = convertToInt(caps.at(4));
int angle = convertToInt(caps.at(5));
int sweep = convertToInt(caps.at(6));
if (m_verboseMode)
printf(" -(lance) qt3_drawArc(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep);
static_cast<Q3Painter*>(m_painter)->drawArc(x, y, w, h, angle, sweep);
#endif
}
#endif //QT3_SUPPORT
/***************************************************************************************************/
void PaintCommands::command_drawText(QRegExp re)
{

8
tests/arthur/common/paintcommands.h
View File

@ -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);

60
tests/arthur/data/qps/sizes.qps
View File

@ -14,16 +14,6 @@ drawRect 120 0 16 16
drawRect 140 0 17 17
drawRect 160 0 18 18
drawRect 180 0 19 19
qt3_drawRect 200 0 10 10
qt3_drawRect 220 0 11 11
qt3_drawRect 240 0 12 12
qt3_drawRect 260 0 13 13
qt3_drawRect 280 0 14 14
qt3_drawRect 300 0 15 15
qt3_drawRect 320 0 16 16
qt3_drawRect 340 0 17 17
qt3_drawRect 360 0 18 18
qt3_drawRect 380 0 19 19
drawEllipse 0 20 10 10
drawEllipse 20 20 11 11
@ -35,16 +25,6 @@ drawEllipse 120 20 16 16
drawEllipse 140 20 17 17
drawEllipse 160 20 18 18
drawEllipse 180 20 19 19
qt3_drawEllipse 200 20 10 10
qt3_drawEllipse 220 20 11 11
qt3_drawEllipse 240 20 12 12
qt3_drawEllipse 260 20 13 13
qt3_drawEllipse 280 20 14 14
qt3_drawEllipse 300 20 15 15
qt3_drawEllipse 320 20 16 16
qt3_drawEllipse 340 20 17 17
qt3_drawEllipse 360 20 18 18
qt3_drawEllipse 380 20 19 19
drawRoundRect 0 40 10 10
drawRoundRect 20 40 11 11
@ -56,16 +36,6 @@ drawRoundRect 120 40 16 16
drawRoundRect 140 40 17 17
drawRoundRect 160 40 18 18
drawRoundRect 180 40 19 19
qt3_drawRoundRect 200 40 10 10
qt3_drawRoundRect 220 40 11 11
qt3_drawRoundRect 240 40 12 12
qt3_drawRoundRect 260 40 13 13
qt3_drawRoundRect 280 40 14 14
qt3_drawRoundRect 300 40 15 15
qt3_drawRoundRect 320 40 16 16
qt3_drawRoundRect 340 40 17 17
qt3_drawRoundRect 360 40 18 18
qt3_drawRoundRect 380 40 19 19
drawPie 0 60 10 10 0 4320
drawPie 20 60 11 11 0 4320
@ -77,16 +47,6 @@ drawPie 120 60 16 16 0 4320
drawPie 140 60 17 17 0 4320
drawPie 160 60 18 18 0 4320
drawPie 180 60 19 19 0 4320
qt3_drawPie 200 60 10 10 0 4320
qt3_drawPie 220 60 11 11 0 4320
qt3_drawPie 240 60 12 12 0 4320
qt3_drawPie 260 60 13 13 0 4320
qt3_drawPie 280 60 14 14 0 4320
qt3_drawPie 300 60 15 15 0 4320
qt3_drawPie 320 60 16 16 0 4320
qt3_drawPie 340 60 17 17 0 4320
qt3_drawPie 360 60 18 18 0 4320
qt3_drawPie 380 60 19 19 0 4320
drawArc 0 80 10 10 0 4320
drawArc 20 80 11 11 0 4320
@ -98,16 +58,6 @@ drawArc 120 80 16 16 0 4320
drawArc 140 80 17 17 0 4320
drawArc 160 80 18 18 0 4320
drawArc 180 80 19 19 0 4320
qt3_drawArc 200 80 10 10 0 4320
qt3_drawArc 220 80 11 11 0 4320
qt3_drawArc 240 80 12 12 0 4320
qt3_drawArc 260 80 13 13 0 4320
qt3_drawArc 280 80 14 14 0 4320
qt3_drawArc 300 80 15 15 0 4320
qt3_drawArc 320 80 16 16 0 4320
qt3_drawArc 340 80 17 17 0 4320
qt3_drawArc 360 80 18 18 0 4320
qt3_drawArc 380 80 19 19 0 4320
drawChord 0 100 10 10 0 4320
drawChord 20 100 11 11 0 4320
@ -119,16 +69,6 @@ drawChord 120 100 16 16 0 4320
drawChord 140 100 17 17 0 4320
drawChord 160 100 18 18 0 4320
drawChord 180 100 19 19 0 4320
qt3_drawChord 200 100 10 10 0 4320
qt3_drawChord 220 100 11 11 0 4320
qt3_drawChord 240 100 12 12 0 4320
qt3_drawChord 260 100 13 13 0 4320
qt3_drawChord 280 100 14 14 0 4320
qt3_drawChord 300 100 15 15 0 4320
qt3_drawChord 320 100 16 16 0 4320
qt3_drawChord 340 100 17 17 0 4320
qt3_drawChord 360 100 18 18 0 4320
qt3_drawChord 380 100 19 19 0 4320
end_block

1
tests/arthur/datagenerator/datagenerator.pro
View File

@ -10,7 +10,6 @@ DESTDIR = ../bin
QT += svg xml
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += datagenerator.h \

1
tests/arthur/htmlgenerator/htmlgenerator.pro
View File

@ -11,7 +11,6 @@ CONFIG += console
QT += svg xml
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += htmlgenerator.h

1
tests/arthur/lance/lance.pro
View File

@ -10,7 +10,6 @@ SOURCES += interactivewidget.cpp main.cpp
RESOURCES += icons.qrc
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
contains(QT_CONFIG, qt3support):QT += qt3support
symbian*: {
testData.files = $$QT_BUILD_TREE/tests/arthur/data/qps

8
tests/arthur/lance/main.cpp
View File

@ -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"

1
tests/arthur/performancediff/performancediff.pro
View File

@ -11,7 +11,6 @@ CONFIG += console
QT += xml svg
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += performancediff.h

1
tests/arthur/shower/shower.pro
View File

@ -9,7 +9,6 @@ DESTDIR = ../bin
QT += xml svg
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += shower.h