diff options
| author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-08-17 10:52:54 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-18 10:58:46 +0200 |
| commit | fd234c2fc6e733594ff69eb5a5df65c8a729fd14 (patch) | |
| tree | e838e50e655e2d0e0561cc270021496b3418cbf7 /tests | |
| parent | 468c22f6732b5755b68f658dbd7a9c4e9e9601d1 (diff) | |
Auto test for passing QTextEdit as QSyntaxHighlighter parent
Change-Id: Ia225723de5b0b2085a72a2af26e2a563b65955d8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro | 1 | ||||
| -rw-r--r-- | tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp | 20 |
2 files changed, 20 insertions, 1 deletions
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro index 3f9728adf4..c8db4df90e 100644 --- a/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro +++ b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro @@ -3,4 +3,5 @@ CONFIG += parallel_test TARGET = tst_qsyntaxhighlighter SOURCES += tst_qsyntaxhighlighter.cpp QT += testlib +!contains(QT_CONFIG, no-widgets) QT += widgets DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp index 5774be6830..8d9209fc77 100644 --- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp +++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp @@ -47,6 +47,10 @@ #include <QAbstractTextDocumentLayout> #include <QSyntaxHighlighter> +#ifndef QT_NO_WIDGETS +#include <QTextEdit> +#endif + class QTestDocumentLayout : public QAbstractTextDocumentLayout { Q_OBJECT @@ -97,7 +101,10 @@ private slots: void noContentsChangedDuringHighlight(); void rehighlight(); void rehighlightBlock(); - +#ifndef QT_NO_WIDGETS + void textEditParent(); +#endif + private: QTextDocument *doc; QTestDocumentLayout *lout; @@ -123,6 +130,8 @@ class TestHighlighter : public QSyntaxHighlighter public: inline TestHighlighter(const QList<QTextLayout::FormatRange> &fmts, QTextDocument *parent) : QSyntaxHighlighter(parent), formats(fmts), highlighted(false), callCount(0) {} + inline TestHighlighter(QObject *parent) + : QSyntaxHighlighter(parent) {} inline TestHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent), highlighted(false), callCount(0) {} @@ -542,5 +551,14 @@ void tst_QSyntaxHighlighter::rehighlightBlock() QCOMPARE(hl->callCount, 1); } +#ifndef QT_NO_WIDGETS +void tst_QSyntaxHighlighter::textEditParent() +{ + QTextEdit textEdit; + TestHighlighter *hl = new TestHighlighter(&textEdit); + QCOMPARE(hl->document(), textEdit.document()); +} +#endif + QTEST_MAIN(tst_QSyntaxHighlighter) #include "tst_qsyntaxhighlighter.moc" |