diff options
Diffstat (limited to 'tests/arthur/common')
| -rw-r--r-- | tests/arthur/common/paintcommands.cpp | 7 | ||||
| -rw-r--r-- | tests/arthur/common/paintcommands.h | 2 | ||||
| -rw-r--r-- | tests/arthur/common/qengines.cpp | 8 | ||||
| -rw-r--r-- | tests/arthur/common/qengines.h | 3 |
4 files changed, 14 insertions, 6 deletions
diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp index cc2f982..475f07d 100644 --- a/tests/arthur/common/paintcommands.cpp +++ b/tests/arthur/common/paintcommands.cpp @@ -351,7 +351,7 @@ 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*)$", @@ -377,7 +377,7 @@ void PaintCommands::staticInit() "^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.]*)$", @@ -1237,6 +1237,7 @@ 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) { @@ -1352,7 +1353,7 @@ void PaintCommands::command_qt3_drawArc(QRegExp re) static_cast<Q3Painter*>(m_painter)->drawArc(x, y, w, h, angle, sweep); #endif } - +#endif //QT3_SUPPORT /***************************************************************************************************/ void PaintCommands::command_drawText(QRegExp re) { diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h index 0c6cd18..ba91a92 100644 --- a/tests/arthur/common/paintcommands.h +++ b/tests/arthur/common/paintcommands.h @@ -181,12 +181,14 @@ 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); diff --git a/tests/arthur/common/qengines.cpp b/tests/arthur/common/qengines.cpp index d1a357e..a4f4517 100644 --- a/tests/arthur/common/qengines.cpp +++ b/tests/arthur/common/qengines.cpp @@ -49,6 +49,7 @@ #include <QDir> #include <QDebug> #include <QPrintEngine> +#include <QWidget> // For QApplicationPrivate::graphics_system_name #include <private/qapplication_p.h> @@ -100,6 +101,7 @@ void QtEngines::init() m_engines << new GLEngine; #endif +#ifndef QT_NO_PRINTER m_engines << new PDFEngine #ifdef Q_WS_X11 << new PSEngine @@ -108,7 +110,8 @@ void QtEngines::init() << new WinPrintEngine #endif ; - +#endif //QT_NO_PRINTER + m_foreignEngines << new RSVGEngine; } @@ -432,7 +435,7 @@ void WidgetEngine::cleanup() delete m_widget; } - +#ifndef QT_NO_PRINTER PDFEngine::PDFEngine() { } @@ -605,6 +608,7 @@ void PSEngine::cleanup() delete printer; printer = 0; } #endif +#endif //QT_NO_PRINTER RSVGEngine::RSVGEngine() { diff --git a/tests/arthur/common/qengines.h b/tests/arthur/common/qengines.h index ad87741..340578e 100644 --- a/tests/arthur/common/qengines.h +++ b/tests/arthur/common/qengines.h @@ -158,6 +158,7 @@ private: WidgetEngineWidget *m_widget; }; +#ifndef QT_NO_PRINTER class PDFEngine : public QEngine { public: @@ -218,7 +219,7 @@ private: QString m_tempFile; }; #endif - +#endif //QT_NO_PRINTER class RSVGEngine : public QEngine { |