diff options
Diffstat (limited to 'tests/auto/gui/text')
27 files changed, 38 insertions, 30 deletions
diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp index 5e6f8ce946..cdd2b9cd44 100644 --- a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp +++ b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qcoreapplication.h> #include <qdebug.h> diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp index 937e7c2acd..ef86d06cb4 100644 --- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp +++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp @@ -25,7 +25,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtXml/QtXml> #include <QtGui/QFontInfo> #include <QtGui/QFontMetrics> diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index 09214c256e..d1a202ace2 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -26,9 +26,10 @@ ** ****************************************************************************/ - -#include <QtTest/QtTest> - +#include <QTest> +#include <QBuffer> +#include <QtEndian> +#include <QProcess> #include <qfont.h> #include <private/qfont_p.h> diff --git a/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp b/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp index ec652997fc..3a7eebdc64 100644 --- a/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp +++ b/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qfont.h> diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index ebd0673cde..2f63221d54 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QSignalSpy> #include <qfontdatabase.h> #include <qfontinfo.h> diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp index 93d9950492..c78475a76f 100644 --- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qfont.h> #include <qfontmetrics.h> #include <qfontdatabase.h> diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp index da8ae5606f..cf03877516 100644 --- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp +++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qglyphrun.h> #include <qpainter.h> diff --git a/tests/auto/gui/text/qinputcontrol/tst_qinputcontrol.cpp b/tests/auto/gui/text/qinputcontrol/tst_qinputcontrol.cpp index 173e137d17..16f0195852 100644 --- a/tests/auto/gui/text/qinputcontrol/tst_qinputcontrol.cpp +++ b/tests/auto/gui/text/qinputcontrol/tst_qinputcontrol.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <private/qinputcontrol_p.h> #include <QtGui/QKeyEvent> diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp index 9eb6eff1b3..c324aa3549 100644 --- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp +++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtGui/QFontDatabase> #include <qrawfont.h> diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp index 8908d8b9d1..fe7396ae4c 100644 --- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QtGui/QGuiApplication> #include <QtGui/QPainter> #include <QtGui/QImage> diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp index da73e7846a..43086a1c14 100644 --- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp +++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp @@ -27,12 +27,13 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QTextDocument> #include <QTextLayout> #include <QDebug> #include <QAbstractTextDocumentLayout> #include <QSyntaxHighlighter> +#include <QSignalSpy> #ifndef QT_NO_WIDGETS #include <QTextEdit> diff --git a/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp index 52a17bd2ea..17d2336b74 100644 --- a/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp +++ b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qtextdocument.h> #include <qtexttable.h> diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index c308ce31b1..c290305d2f 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -27,8 +27,8 @@ ****************************************************************************/ -#include <QtTest/QtTest> - +#include <QTest> +#include <QSignalSpy> #include <qtextdocument.h> #include <qdebug.h> diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp index 3b8ae9a872..a7408fcc8e 100644 --- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp +++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qtextdocument.h> diff --git a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp index d1495a2067..0075203c97 100644 --- a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp +++ b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qtextdocument.h> #include <qabstracttextdocumentlayout.h> diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp index 6e52014857..cf87cd41aa 100644 --- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp +++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QBuffer> #include <qcoreapplication.h> #include <qdebug.h> diff --git a/tests/auto/gui/text/qtextimagehandler/tst_qtextimagehandler.cpp b/tests/auto/gui/text/qtextimagehandler/tst_qtextimagehandler.cpp index ee79c36ba5..d5dde13770 100644 --- a/tests/auto/gui/text/qtextimagehandler/tst_qtextimagehandler.cpp +++ b/tests/auto/gui/text/qtextimagehandler/tst_qtextimagehandler.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QPainter> #include <private/qtextimagehandler_p.h> diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp index 7433d2c534..ebbc21836b 100644 --- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp @@ -32,7 +32,7 @@ Please don't save this file in emacs. It contains utf8 text sequences emacs will silently convert to a series of question marks. */ -#include <QtTest/QtTest> +#include <QTest> diff --git a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp index 93e40e7f23..b160d41a05 100644 --- a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp +++ b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qtextdocument.h> #include <qtextdocumentfragment.h> diff --git a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp index d652db0699..5a8df45d99 100644 --- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp +++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QBuffer> #include <QDebug> #include <QFontInfo> @@ -36,6 +36,7 @@ #include <QTextDocumentFragment> #include <QTextList> #include <QTextTable> +#include <QLoggingCategory> #include <private/qtextmarkdownimporter_p.h> diff --git a/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp b/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp index 13449299cb..bc6ee81ad4 100644 --- a/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp +++ b/tests/auto/gui/text/qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QTextDocument> #include <QTextCursor> #include <QTextBlock> diff --git a/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp b/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp index 57373a77b3..2afca43915 100644 --- a/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp +++ b/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qcoreapplication.h> #include <qdebug.h> diff --git a/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp index bbb90ec82a..e9e2eac268 100644 --- a/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp +++ b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QTextDocument> #include <QTextCursor> #include <QTextBlock> diff --git a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp index 436cd09914..32ab425ccf 100644 --- a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp +++ b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> +#include <QRandomGenerator> #define protected public diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp index e752ef8ec7..b3a33c2d92 100644 --- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <private/qfontengine_p.h> #include <private/qtextengine_p.h> #include <qtextlayout.h> diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp index a848dad3d8..405537cc59 100644 --- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp +++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <qtextdocument.h> diff --git a/tests/auto/gui/text/qzip/tst_qzip.cpp b/tests/auto/gui/text/qzip/tst_qzip.cpp index 07672d219d..6be7c7b833 100644 --- a/tests/auto/gui/text/qzip/tst_qzip.cpp +++ b/tests/auto/gui/text/qzip/tst_qzip.cpp @@ -26,8 +26,10 @@ ** ****************************************************************************/ -#include <QtTest/QtTest> +#include <QTest> #include <QDebug> +#include <QBuffer> + #include <private/qzipwriter_p.h> #include <private/qzipreader_p.h> |