diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/other/lancelot/paintcommands.cpp | 3 | ||||
-rw-r--r-- | tests/auto/other/lancelot/scripts/thinlines.qps | 79 | ||||
-rw-r--r-- | tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST | 2 | ||||
-rw-r--r-- | tests/manual/lance/interactivewidget.cpp | 2 | ||||
-rw-r--r-- | tests/manual/lance/main.cpp | 10 | ||||
-rw-r--r-- | tests/manual/lance/widgets.h | 62 | ||||
-rw-r--r-- | tests/manual/shortcuts/main.cpp | 3 |
7 files changed, 114 insertions, 47 deletions
diff --git a/tests/auto/other/lancelot/paintcommands.cpp b/tests/auto/other/lancelot/paintcommands.cpp index 8aa3a035e3..8a2934049e 100644 --- a/tests/auto/other/lancelot/paintcommands.cpp +++ b/tests/auto/other/lancelot/paintcommands.cpp @@ -1200,7 +1200,10 @@ void PaintCommands::command_drawRoundRect(QRegularExpressionMatch re) if (m_verboseMode) printf(" -(lance) drawRoundRect(%d, %d, %d, %d, [%d, %d])\n", x, y, w, h, xs, ys); + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED m_painter->drawRoundRect(x, y, w, h, xs, ys); + QT_WARNING_POP } /***************************************************************************************************/ diff --git a/tests/auto/other/lancelot/scripts/thinlines.qps b/tests/auto/other/lancelot/scripts/thinlines.qps new file mode 100644 index 0000000000..dddfff4538 --- /dev/null +++ b/tests/auto/other/lancelot/scripts/thinlines.qps @@ -0,0 +1,79 @@ +# Version: 1 +# CheckVsReference: 5% + +drawRect 0 0 800 800 + +path_addRect p 0 0 75 75 +path_addEllipse p 25 25 75 75 + +translate -500 -500 + +begin_block drawing + save + drawLine 0 0 100 100 + + translate 0 100 + drawPath p + + translate 0 110 + drawRect 0 0 100 100 + + translate 0 110 + drawPolyline [0 0 100 0 50 50] + + drawPoint 40 40 + drawPoint 41 40 + drawPoint 42 40 + drawPoint 43 40 + drawPoint 44 40 + drawPoint 45 40 + drawPoint 46 40 + drawPoint 47 40 + drawPoint 48 40 + drawPoint 49 40 + drawPoint 50 40 + + restore +end_block + +begin_block univsnonuni + save + + save + scale 0.7 0.7 + repeat_block drawing + restore + + translate 100 0 + save + scale 0.7 0.8 + repeat_block drawing + restore + + restore +end_block + +resetMatrix +translate 20.5 20.5 + +begin_block row +save + repeat_block univsnonuni + + translate 240 0 + save + rotate 10 + repeat_block univsnonuni + restore + + translate 220 0 + save + rotate_y 30 + repeat_block univsnonuni + restore +restore +end_block + +translate 0 320 +setRenderHint AntiAliasing +repeat_block row diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST b/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST index 01679eb6ee..f78d23c6b1 100644 --- a/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST +++ b/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST @@ -9,3 +9,5 @@ b2qt ubuntu b2qt windows +rhel +suse-leap diff --git a/tests/manual/lance/interactivewidget.cpp b/tests/manual/lance/interactivewidget.cpp index 8ac3881af7..d172fac900 100644 --- a/tests/manual/lance/interactivewidget.cpp +++ b/tests/manual/lance/interactivewidget.cpp @@ -45,7 +45,7 @@ InteractiveWidget::InteractiveWidget() // create and populate the command toolbox m_commandsToolBox = new QToolBox(); - QListWidget *currentListWidget = 0; + QListWidget *currentListWidget = nullptr; foreach (PaintCommands::PaintCommandInfos paintCommandInfo, PaintCommands::s_commandInfoTable) { if (paintCommandInfo.isSectionHeader()) { currentListWidget = new QListWidget(); diff --git a/tests/manual/lance/main.cpp b/tests/manual/lance/main.cpp index 749a4b1943..7f5af2d908 100644 --- a/tests/manual/lance/main.cpp +++ b/tests/manual/lance/main.cpp @@ -185,7 +185,7 @@ static void displayCommands() " pixmap_load filename name_in_script\n" " image_load filename name_in_script\n"); } -static InteractiveWidget *interactive_widget = 0; +static InteractiveWidget *interactive_widget = nullptr; static void runInteractive() { @@ -350,15 +350,15 @@ int main(int argc, char **argv) #endif } } - scaledWidth = width * scalefactor; - scaledHeight = height * scalefactor; + scaledWidth = int(width * scalefactor); + scaledHeight = int(height * scalefactor); PaintCommands pcmd(QStringList(), 800, 800, imageFormat); pcmd.setVerboseMode(verboseMode); pcmd.setType(type); pcmd.setCheckersBackground(checkers_background); - QWidget *activeWidget = 0; + QWidget *activeWidget = nullptr; if (interactive) { runInteractive(); @@ -610,7 +610,7 @@ int main(int argc, char **argv) QPrinter p(highres ? QPrinter::HighResolution : QPrinter::ScreenResolution); if (printdlg) { - QPrintDialog printDialog(&p, 0); + QPrintDialog printDialog(&p, nullptr); if (printDialog.exec() != QDialog::Accepted) break; } else { diff --git a/tests/manual/lance/widgets.h b/tests/manual/lance/widgets.h index 583d9e2455..46c55f4c16 100644 --- a/tests/manual/lance/widgets.h +++ b/tests/manual/lance/widgets.h @@ -45,31 +45,12 @@ #include <QPaintEngine> #include <QSignalMapper> #include <QAction> +#include <QDebug> #include <qmath.h> const int CP_RADIUS = 10; -class StupidWorkaround : public QObject -{ - Q_OBJECT -public: - StupidWorkaround(QWidget *widget, int *value) - : QObject(widget), w(widget), mode(value) - { - } - -public slots: - void setViewMode(int m) { - *mode = m; - w->update(); - } - -private: - QWidget *w; - int *mode; -}; - template <class T> class OnScreenWidget : public T { @@ -81,7 +62,7 @@ public: DifferenceView }; - OnScreenWidget(const QString &file, QWidget *parent = 0) + OnScreenWidget(const QString &file, QWidget *parent = nullptr) : T(parent), m_filename(file), m_view_mode(RenderView) @@ -108,33 +89,20 @@ public: } else { T::setWindowTitle("Rendering: '" + file + "'. Shortcuts: 1=render, 2=baseline, 3=difference"); - StupidWorkaround *workaround = new StupidWorkaround(this, &m_view_mode); - - QSignalMapper *mapper = new QSignalMapper(this); - T::connect(mapper, SIGNAL(mapped(int)), workaround, SLOT(setViewMode(int))); - T::connect(mapper, SIGNAL(mapped(QString)), this, SLOT(setWindowTitle(QString))); - QAction *renderViewAction = new QAction("Render View", this); renderViewAction->setShortcut(Qt::Key_1); - T::connect(renderViewAction, SIGNAL(triggered()), mapper, SLOT(map())); - mapper->setMapping(renderViewAction, RenderView); - mapper->setMapping(renderViewAction, "Render View: " + file); + T::connect(renderViewAction, &QAction::triggered, [&] { setMode(RenderView); }); T::addAction(renderViewAction); QAction *baselineAction = new QAction("Baseline", this); baselineAction->setShortcut(Qt::Key_2); - T::connect(baselineAction, SIGNAL(triggered()), mapper, SLOT(map())); - mapper->setMapping(baselineAction, BaselineView); - mapper->setMapping(baselineAction, "Baseline View: " + file); + T::connect(baselineAction, &QAction::triggered, [&] { setMode(BaselineView); }); T::addAction(baselineAction); - QAction *differenceAction = new QAction("Differenfe View", this); + QAction *differenceAction = new QAction("Difference View", this); differenceAction->setShortcut(Qt::Key_3); - T::connect(differenceAction, SIGNAL(triggered()), mapper, SLOT(map())); - mapper->setMapping(differenceAction, DifferenceView); - mapper->setMapping(differenceAction, "Difference View" + file); + T::connect(differenceAction, &QAction::triggered, [&] { setMode(DifferenceView); }); T::addAction(differenceAction); - } } @@ -148,6 +116,18 @@ public: settings.sync(); } + void setMode(ViewMode mode) { + m_view_mode = mode; + QString title; + switch (m_view_mode) { + case RenderView: title = "Render"; break; + case BaselineView: title = "Baseline"; break; + case DifferenceView: title = "Difference"; break; + } + T::setWindowTitle(title + " View: " + m_filename); + T::update(); + } + void setVerboseMode(bool v) { m_verboseMode = v; } void setCheckersBackground(bool b) { m_checkersBackground = b; } void setType(DeviceType t) { m_deviceType = t; } @@ -205,7 +185,7 @@ public: pt.begin(this); pt.setRenderHint(QPainter::Antialiasing); pt.setFont(this->font()); - pt.resetMatrix(); + pt.resetTransform(); pt.setPen(QColor(127, 127, 127, 191)); pt.setBrush(QColor(191, 191, 255, 63)); for (int i=0; i<m_controlPoints.size(); ++i) { @@ -239,7 +219,7 @@ public: p.drawPixmap(0, 0, m_baseline); - p.setPen(QColor::fromRgb(0, 0, 0, 0.1)); + p.setPen(QColor::fromRgbF(0, 0, 0, 0.1)); p.setFont(QFont("Arial", 128)); p.rotate(45); p.drawText(100, 0, "BASELINE"); @@ -251,7 +231,7 @@ public: img.fill(0); QPainter p(&img); - p.drawPixmap(0, 0, m_render_view); + p.drawImage(0, 0, m_image); p.setCompositionMode(QPainter::RasterOp_SourceXorDestination); p.drawPixmap(0, 0, m_baseline); diff --git a/tests/manual/shortcuts/main.cpp b/tests/manual/shortcuts/main.cpp index acc2a2525c..289e8526f0 100644 --- a/tests/manual/shortcuts/main.cpp +++ b/tests/manual/shortcuts/main.cpp @@ -108,6 +108,7 @@ void ShortcutTester::setupLayout() Qt::ControlModifier + Qt::Key_5, Qt::AltModifier + Qt::Key_5, Qt::ControlModifier + Qt::Key_Plus, Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_Plus, + Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_Equal, Qt::ControlModifier + Qt::Key_Y, Qt::ShiftModifier + Qt::Key_Comma, Qt::ControlModifier + Qt::Key_Comma, Qt::ControlModifier + Qt::Key_Slash, Qt::ControlModifier + Qt::Key_Backslash @@ -121,6 +122,8 @@ void ShortcutTester::setupLayout() const int keys3[] = { Qt::MetaModifier + Qt::ShiftModifier + Qt::Key_A, + Qt::MetaModifier + Qt::Key_A, + Qt::MetaModifier + Qt::Key_Q, Qt::MetaModifier + Qt::ShiftModifier + Qt::Key_5, Qt::ControlModifier + Qt::Key_BracketRight, Qt::ShiftModifier + Qt::Key_F3, |