diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp | 8 | ||||
-rw-r--r-- | tests/benchmarks/gui/text/qtext/main.cpp | 63 |
2 files changed, 4 insertions, 67 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index c94eca5572..ad1dbc1a4d 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -4243,14 +4243,14 @@ void tst_QGraphicsItem::textControlGetterSetter() { QGraphicsTextItem *item = new QGraphicsTextItem; QVERIFY(item->textControl()->parent() == item); - QPointer<QTextControl> control = item->textControl(); + QPointer<QWidgetTextControl> control = item->textControl(); delete item; QVERIFY(!control); item = new QGraphicsTextItem; - QPointer<QTextControl> oldControl = control; - control = new QTextControl; + QPointer<QWidgetTextControl> oldControl = control; + control = new QWidgetTextControl; item->setTextControl(control); QVERIFY(item->textControl() == control); @@ -4269,7 +4269,7 @@ void tst_QGraphicsItem::textControlGetterSetter() // test that on setting a control the item size // is adjusted oldControl = control; - control = new QTextControl; + control = new QWidgetTextControl; control->setPlainText("foo!"); item->setTextControl(control); QCOMPARE(item->boundingRect().size(), control->document()->documentLayout()->documentSize()); diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp index 0cbb38aed3..a5e27cff0f 100644 --- a/tests/benchmarks/gui/text/qtext/main.cpp +++ b/tests/benchmarks/gui/text/qtext/main.cpp @@ -44,7 +44,6 @@ #include <QTextDocumentWriter> #include <QTextLayout> #include <QTextCursor> -#include <private/qtextcontrol_p.h> #include <qmath.h> #include <QFile> #include <QPainter> @@ -73,7 +72,6 @@ private slots: void odfWriting_text(); void odfWriting_images(); - void constructControl(); void constructDocument(); void newLineReplacement(); @@ -90,10 +88,6 @@ private slots: void paintDocToPixmap(); void paintDocToPixmap_painterFill(); - void control(); - void paintControlToPixmap(); - void paintControlToPixmap_painterFill(); - private: QSize setupTextLayout(QTextLayout *layout, bool wrap = true, int wrapWidth = 100); @@ -255,17 +249,6 @@ QSize tst_QText::setupTextLayout(QTextLayout *layout, bool wrap, int wrapWidth) return QSize(qCeil(widthUsed), height); } -void tst_QText::constructControl() -{ - QTextControl *control = new QTextControl; - delete control; - - QBENCHMARK { - QTextControl *control = new QTextControl; - delete control; - } -} - void tst_QText::constructDocument() { QTextDocument *doc = new QTextDocument; @@ -441,52 +424,6 @@ void tst_QText::paintDocToPixmap_painterFill() } } -void tst_QText::control() -{ - QTextControl *control = new QTextControl(m_shortLorem); - Q_UNUSED(control); - - QBENCHMARK { - QTextControl *control = new QTextControl; - QTextDocument *doc = control->document(); - doc->setHtml(m_shortLorem); - } -} - -void tst_QText::paintControlToPixmap() -{ - QTextControl *control = new QTextControl; - QTextDocument *doc = control->document(); - doc->setHtml(m_shortLorem); - doc->setTextWidth(300); - QSize size = doc->size().toSize(); - - QBENCHMARK { - QPixmap img(size); - img.fill(Qt::transparent); - QPainter p(&img); - control->drawContents(&p, QRectF(QPointF(0, 0), QSizeF(size))); - } -} - -void tst_QText::paintControlToPixmap_painterFill() -{ - QTextControl *control = new QTextControl; - QTextDocument *doc = control->document(); - doc->setHtml(m_shortLorem); - doc->setTextWidth(300); - QSize size = doc->size().toSize(); - - QBENCHMARK { - QPixmap img(size); - QPainter p(&img); - p.setCompositionMode(QPainter::CompositionMode_Source); - p.fillRect(0, 0, img.width(), img.height(), Qt::transparent); - p.setCompositionMode(QPainter::CompositionMode_SourceOver); - control->drawContents(&p, QRectF(QPointF(0, 0), QSizeF(size))); - } -} - QTEST_MAIN(tst_QText) #include "main.moc" |