From 27d96b4789b98587e64642bf7bd6ef5f3a07e174 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Thu, 26 Nov 2020 17:31:50 +0100 Subject: Replace QtTest headers with QTest Complete search and replace of QtTest and QtTest/QtTest with QTest, as QtTest includes the whole module. Replace all such instances with correct header includes. See Jira task for more discussion. Fixes: QTBUG-88831 Change-Id: I981cfae18a1cabcabcabee376016b086d9d01f44 Pick-to: 6.0 Reviewed-by: Volker Hilsheimer --- .../gui/image/qicoimageformat/tst_qicoimageformat.cpp | 2 +- tests/auto/gui/image/qicon/tst_qicon.cpp | 9 +++++---- .../auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp | 2 +- tests/auto/gui/image/qimage/tst_qimage.cpp | 3 ++- .../gui/image/qimageiohandler/tst_qimageiohandler.cpp | 2 +- .../auto/gui/image/qimagereader/tst_qimagereader.cpp | 2 +- .../auto/gui/image/qimagewriter/tst_qimagewriter.cpp | 6 ++---- tests/auto/gui/image/qmovie/tst_qmovie.cpp | 5 +++-- tests/auto/gui/image/qpicture/tst_qpicture.cpp | 3 ++- tests/auto/gui/image/qpixmap/tst_qpixmap.cpp | 19 ++++++++++--------- .../auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp | 2 +- .../qfilesystemmodel/tst_qfilesystemmodel.cpp | 6 +++++- .../itemmodels/qstandarditem/tst_qstandarditem.cpp | 3 ++- .../qstandarditemmodel/tst_qstandarditemmodel.cpp | 6 ++++-- .../gui/kernel/noqteventloop/tst_noqteventloop.cpp | 2 +- tests/auto/gui/kernel/qaction/tst_qaction.cpp | 4 +++- .../auto/gui/kernel/qactiongroup/tst_qactiongroup.cpp | 2 +- .../kernel/qaddpostroutine/tst_qaddpostroutine.cpp | 2 +- .../gui/kernel/qbackingstore/tst_qbackingstore.cpp | 2 +- tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp | 6 +++++- tests/auto/gui/kernel/qdrag/tst_qdrag.cpp | 3 ++- tests/auto/gui/kernel/qevent/tst_qevent.cpp | 2 +- .../kernel/qfileopenevent/test/tst_qfileopenevent.cpp | 2 +- .../kernel/qguiapplication/tst_qguiapplication.cpp | 3 ++- .../auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp | 2 +- .../gui/kernel/qguivariant/no_application/main.cpp | 2 +- .../gui/kernel/qguivariant/test/tst_qguivariant.cpp | 2 +- tests/auto/gui/kernel/qhighdpi/tst_qhighdpi.cpp | 5 ++++- .../auto/gui/kernel/qinputdevice/tst_qinputdevice.cpp | 2 +- .../auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp | 3 ++- tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp | 2 +- .../auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 2 +- tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp | 2 +- .../qmouseevent_modal/tst_qmouseevent_modal.cpp | 2 +- .../gui/kernel/qopenglwindow/tst_qopenglwindow.cpp | 2 +- tests/auto/gui/kernel/qpalette/tst_qpalette.cpp | 2 +- .../auto/gui/kernel/qpixelformat/tst_qpixelformat.cpp | 2 +- .../gui/kernel/qrasterwindow/tst_qrasterwindow.cpp | 2 +- tests/auto/gui/kernel/qscreen/tst_qscreen.cpp | 3 ++- tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp | 2 +- .../gui/kernel/qsurfaceformat/tst_qsurfaceformat.cpp | 2 +- tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp | 2 +- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 4 ++-- tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp | 2 +- tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp | 2 +- tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp | 2 +- tests/auto/gui/painting/qbrush/tst_qbrush.cpp | 2 +- tests/auto/gui/painting/qcolor/tst_qcolor.cpp | 3 ++- .../auto/gui/painting/qcolorspace/tst_qcolorspace.cpp | 2 +- .../auto/gui/painting/qpagelayout/tst_qpagelayout.cpp | 2 +- .../auto/gui/painting/qpageranges/tst_qpageranges.cpp | 2 +- tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp | 2 +- .../gui/painting/qpaintengine/tst_qpaintengine.cpp | 2 +- tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 2 +- .../gui/painting/qpainterpath/tst_qpainterpath.cpp | 2 +- .../qpainterpathstroker/tst_qpainterpathstroker.cpp | 2 +- .../gui/painting/qpathclipper/tst_qpathclipper.cpp | 2 +- tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp | 4 +++- tests/auto/gui/painting/qpen/tst_qpen.cpp | 2 +- tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp | 2 +- tests/auto/gui/painting/qregion/tst_qregion.cpp | 2 +- tests/auto/gui/painting/qtransform/tst_qtransform.cpp | 2 +- tests/auto/gui/qopengl/tst_qopengl.cpp | 2 +- tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp | 2 +- tests/auto/gui/qvulkan/tst_qvulkan.cpp | 2 +- tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 2 +- tests/auto/gui/rhi/qshader/tst_qshader.cpp | 4 +++- .../tst_qabstracttextdocumentlayout.cpp | 2 +- tests/auto/gui/text/qcssparser/tst_qcssparser.cpp | 2 +- tests/auto/gui/text/qfont/tst_qfont.cpp | 7 ++++--- tests/auto/gui/text/qfontcache/tst_qfontcache.cpp | 2 +- .../auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp | 3 ++- tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp | 2 +- tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp | 2 +- .../auto/gui/text/qinputcontrol/tst_qinputcontrol.cpp | 2 +- tests/auto/gui/text/qrawfont/tst_qrawfont.cpp | 2 +- tests/auto/gui/text/qstatictext/tst_qstatictext.cpp | 2 +- .../qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp | 3 ++- tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp | 2 +- .../auto/gui/text/qtextdocument/tst_qtextdocument.cpp | 4 ++-- .../tst_qtextdocumentfragment.cpp | 2 +- .../qtextdocumentlayout/tst_qtextdocumentlayout.cpp | 2 +- tests/auto/gui/text/qtextformat/tst_qtextformat.cpp | 3 ++- .../text/qtextimagehandler/tst_qtextimagehandler.cpp | 2 +- tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp | 2 +- tests/auto/gui/text/qtextlist/tst_qtextlist.cpp | 2 +- .../tst_qtextmarkdownimporter.cpp | 3 ++- .../qtextmarkdownwriter/tst_qtextmarkdownwriter.cpp | 2 +- tests/auto/gui/text/qtextobject/tst_qtextobject.cpp | 2 +- .../gui/text/qtextodfwriter/tst_qtextodfwriter.cpp | 2 +- .../gui/text/qtextpiecetable/tst_qtextpiecetable.cpp | 3 ++- .../text/qtextscriptengine/tst_qtextscriptengine.cpp | 2 +- tests/auto/gui/text/qtexttable/tst_qtexttable.cpp | 2 +- tests/auto/gui/text/qzip/tst_qzip.cpp | 4 +++- .../util/qdesktopservices/tst_qdesktopservices.cpp | 2 +- .../util/qdoublevalidator/tst_qdoublevalidator.cpp | 4 ++-- .../auto/gui/util/qintvalidator/tst_qintvalidator.cpp | 4 +++- .../tst_qregularexpressionvalidator.cpp | 3 ++- .../util/qshadergenerator/tst_qshadergenerator.cpp | 2 +- tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp | 2 +- .../qshadergraphloader/tst_qshadergraphloader.cpp | 2 +- tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp | 2 +- .../qshadernodesloader/tst_qshadernodesloader.cpp | 2 +- .../qtexturefilereader/tst_qtexturefilereader.cpp | 2 +- tests/auto/gui/util/qundogroup/tst_qundogroup.cpp | 6 +++++- tests/auto/gui/util/qundostack/tst_qundostack.cpp | 6 +++++- 106 files changed, 174 insertions(+), 127 deletions(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp index 1716570046..37d5f4998c 100644 --- a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp +++ b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp @@ -25,7 +25,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index ece9941dfb..0cd433ecb1 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -26,16 +26,17 @@ ** ****************************************************************************/ - -#include +#include #include +#include +#include +#include + #include #include -#include #include - class tst_QIcon : public QObject { Q_OBJECT diff --git a/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp b/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp index 62878926fa..3282776ee6 100644 --- a/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp +++ b/tests/auto/gui/image/qiconhighdpi/tst_qiconhighdpi.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include class tst_QIconHighDpi : public QObject diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 0e0cb5d5a5..2c9f3a3746 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ -#include +#include +#include #include #include diff --git a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp index 9da4d1a1f1..9fa0e37cad 100644 --- a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp +++ b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index c39eb7e9c4..1019def466 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp index e4708f358b..907719259d 100644 --- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp @@ -26,10 +26,7 @@ ** ****************************************************************************/ - -#include - - +#include #include #include #include @@ -38,6 +35,7 @@ #include #include #include +#include #ifdef Q_OS_UNIX // for geteuid() # include diff --git a/tests/auto/gui/image/qmovie/tst_qmovie.cpp b/tests/auto/gui/image/qmovie/tst_qmovie.cpp index c8217b2cec..a54bf03fb2 100644 --- a/tests/auto/gui/image/qmovie/tst_qmovie.cpp +++ b/tests/auto/gui/image/qmovie/tst_qmovie.cpp @@ -27,8 +27,9 @@ ****************************************************************************/ -#include - +#include +#include +#include #include #ifndef QT_NO_WIDGETS diff --git a/tests/auto/gui/image/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp index c55a96d697..25e284a6ec 100644 --- a/tests/auto/gui/image/qpicture/tst_qpicture.cpp +++ b/tests/auto/gui/image/qpicture/tst_qpicture.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ -#include +#include +#include #include #include diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index 39d58effd3..e6123decb2 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -26,24 +26,25 @@ ** ****************************************************************************/ +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include #ifndef QT_NO_WIDGETS -#include +#include #endif -#include #include #include #include #include -#include - #ifdef Q_OS_WIN #include #endif diff --git a/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp index da0ab4c6e0..a87ec5d025 100644 --- a/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp +++ b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp @@ -28,7 +28,7 @@ #define Q_TEST_QPIXMAPCACHE -#include +#include #include diff --git a/tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp index e814e79dbe..a096fcd324 100644 --- a/tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/gui/itemmodels/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -28,7 +28,11 @@ #include -#include +#include +#include +#include +#include + #ifdef QT_BUILD_INTERNAL #include #endif diff --git a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp index 9b98ad04e9..61683b20a6 100644 --- a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp +++ b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ -#include +#include +#include #include diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp index 202b1c02f3..f046ff9512 100644 --- a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp +++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp @@ -27,10 +27,12 @@ ****************************************************************************/ -#include - +#include #include #include +#include +#include + #include #include diff --git a/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp b/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp index 3e19764618..eba4aa4790 100644 --- a/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp +++ b/tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/kernel/qaction/tst_qaction.cpp b/tests/auto/gui/kernel/qaction/tst_qaction.cpp index 277e86d1be..7f817a5c98 100644 --- a/tests/auto/gui/kernel/qaction/tst_qaction.cpp +++ b/tests/auto/gui/kernel/qaction/tst_qaction.cpp @@ -26,7 +26,9 @@ ** ****************************************************************************/ -#include +#include +#include +#include #include #include diff --git a/tests/auto/gui/kernel/qactiongroup/tst_qactiongroup.cpp b/tests/auto/gui/kernel/qactiongroup/tst_qactiongroup.cpp index 52720ab7ff..8ac3a0b4c7 100644 --- a/tests/auto/gui/kernel/qactiongroup/tst_qactiongroup.cpp +++ b/tests/auto/gui/kernel/qactiongroup/tst_qactiongroup.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/kernel/qaddpostroutine/tst_qaddpostroutine.cpp b/tests/auto/gui/kernel/qaddpostroutine/tst_qaddpostroutine.cpp index 500543d2e1..731547f681 100644 --- a/tests/auto/gui/kernel/qaddpostroutine/tst_qaddpostroutine.cpp +++ b/tests/auto/gui/kernel/qaddpostroutine/tst_qaddpostroutine.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include static bool done = false; diff --git a/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp b/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp index b2dc8ee035..5349119b6d 100644 --- a/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp +++ b/tests/auto/gui/kernel/qbackingstore/tst_qbackingstore.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp index 790b53ff9f..43596ed127 100644 --- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp @@ -27,7 +27,11 @@ ****************************************************************************/ -#include +#include +#include +#include +#include + #include #include #include diff --git a/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp b/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp index 91ff24ffd1..5c243df6d0 100644 --- a/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp +++ b/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ -#include +#include +#include #include #include diff --git a/tests/auto/gui/kernel/qevent/tst_qevent.cpp b/tests/auto/gui/kernel/qevent/tst_qevent.cpp index 50710a0475..6542ed5ad3 100644 --- a/tests/auto/gui/kernel/qevent/tst_qevent.cpp +++ b/tests/auto/gui/kernel/qevent/tst_qevent.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp index 9da15b3e36..0e5c7927e0 100644 --- a/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp +++ b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include -#include +#include #include class tst_qfileopenevent : public QObject diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index b68f00ea46..f970382db3 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ -#include +#include +#include #include #include #include diff --git a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp index dc91b8792b..aac914bc68 100644 --- a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp +++ b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include Q_DECLARE_METATYPE(QMetaType::Type) diff --git a/tests/auto/gui/kernel/qguivariant/no_application/main.cpp b/tests/auto/gui/kernel/qguivariant/no_application/main.cpp index 4a50c1f7da..1ab0f63240 100644 --- a/tests/auto/gui/kernel/qguivariant/no_application/main.cpp +++ b/tests/auto/gui/kernel/qguivariant/no_application/main.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp index 9ef5ce75bf..aea5cb3ac3 100644 --- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp +++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include diff --git a/tests/auto/gui/kernel/qhighdpi/tst_qhighdpi.cpp b/tests/auto/gui/kernel/qhighdpi/tst_qhighdpi.cpp index c98864e9d9..13cdce6b12 100644 --- a/tests/auto/gui/kernel/qhighdpi/tst_qhighdpi.cpp +++ b/tests/auto/gui/kernel/qhighdpi/tst_qhighdpi.cpp @@ -29,7 +29,10 @@ #include #include -#include +#include +#include +#include +#include Q_LOGGING_CATEGORY(lcTests, "qt.gui.tests") diff --git a/tests/auto/gui/kernel/qinputdevice/tst_qinputdevice.cpp b/tests/auto/gui/kernel/qinputdevice/tst_qinputdevice.cpp index 115bea996b..077a44b229 100644 --- a/tests/auto/gui/kernel/qinputdevice/tst_qinputdevice.cpp +++ b/tests/auto/gui/kernel/qinputdevice/tst_qinputdevice.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include #include #include diff --git a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp index d28dab3ad0..318309d959 100644 --- a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp +++ b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp @@ -26,7 +26,8 @@ ** ****************************************************************************/ -#include +#include +#include #include #include diff --git a/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp b/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp index 09becfe860..1873c190d5 100644 --- a/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp +++ b/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp index 421fdc7933..58f0e6644e 100644 --- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include #include diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp index c9cc956d35..d5174e0942 100644 --- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp +++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include #include diff --git a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp index c430148a91..ec2a9729bb 100644 --- a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp +++ b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp b/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp index 2785d57a42..379034a20e 100644 --- a/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp +++ b/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include -#include +#include #include #include #include diff --git a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp index cd968100e6..6524f73143 100644 --- a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp +++ b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include "qpalette.h" diff --git a/tests/auto/gui/kernel/qpixelformat/tst_qpixelformat.cpp b/tests/auto/gui/kernel/qpixelformat/tst_qpixelformat.cpp index 14d2b74491..6372303290 100644 --- a/tests/auto/gui/kernel/qpixelformat/tst_qpixelformat.cpp +++ b/tests/auto/gui/kernel/qpixelformat/tst_qpixelformat.cpp @@ -25,7 +25,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include +#include #include diff --git a/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp b/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp index deb4837956..f0725bff2d 100644 --- a/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp +++ b/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include -#include +#include #include class tst_QRasterWindow : public QObject diff --git a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp index 57444a3888..83d476e812 100644 --- a/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp +++ b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp @@ -31,7 +31,8 @@ #include #include -#include +#include +#include class tst_QScreen: public QObject { diff --git a/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp index cc0492666d..fc230f98e2 100644 --- a/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp +++ b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include #include #include diff --git a/tests/auto/gui/kernel/qsurfaceformat/tst_qsurfaceformat.cpp b/tests/auto/gui/kernel/qsurfaceformat/tst_qsurfaceformat.cpp index 6fd768022c..f4410b2dae 100644 --- a/tests/auto/gui/kernel/qsurfaceformat/tst_qsurfaceformat.cpp +++ b/tests/auto/gui/kernel/qsurfaceformat/tst_qsurfaceformat.cpp @@ -28,7 +28,7 @@ #include -#include +#include class tst_QSurfaceFormat: public QObject { diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp index 8ef63154a8..28c33e8226 100644 --- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 602e5a0178..e4f2223bfc 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -34,8 +34,8 @@ #include #include -#include - +#include +#include #include #include diff --git a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp index 18d4b4cff6..275c684815 100644 --- a/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp +++ b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp index 52cd478794..b9ba7278da 100644 --- a/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp +++ b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp index 3aa54a4af2..9d3f7dda7c 100644 --- a/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp +++ b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include #include #include diff --git a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp index ac357c92db..490d127efc 100644 --- a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp +++ b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include "qbrush.h" #include diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp index 40d42806a8..a5a2983ce7 100644 --- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp +++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp @@ -27,7 +27,8 @@ ****************************************************************************/ -#include +#include +#include #include diff --git a/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp b/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp index 4acbfbba74..f484187315 100644 --- a/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp +++ b/tests/auto/gui/painting/qcolorspace/tst_qcolorspace.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp b/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp index 478b482064..830e0cd16c 100644 --- a/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp +++ b/tests/auto/gui/painting/qpagelayout/tst_qpagelayout.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include class tst_QPageLayout : public QObject diff --git a/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp b/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp index 953f1c472a..4912aa43c1 100644 --- a/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp +++ b/tests/auto/gui/painting/qpageranges/tst_qpageranges.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include typedef QList PageRangeList; diff --git a/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp b/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp index 6b49a14ddf..838f7e59cd 100644 --- a/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp +++ b/tests/auto/gui/painting/qpagesize/tst_qpagesize.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include #include #include diff --git a/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp index d6b532887f..4363799702 100644 --- a/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp +++ b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index c777a90282..30ce4fcfa8 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #ifndef QT_NO_WIDGETS #include diff --git a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp index f96ed563d3..12a8fff33b 100644 --- a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp +++ b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp b/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp index f0bb9a880a..de3f612b10 100644 --- a/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp +++ b/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp index 01853d841a..83a8d6bd47 100644 --- a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp +++ b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp @@ -29,7 +29,7 @@ #include "paths.h" #include "pathcompare.h" -#include +#include #include #include diff --git a/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp b/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp index 8c98a8ad98..c74baf0ba4 100644 --- a/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp +++ b/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp @@ -26,9 +26,11 @@ ** ****************************************************************************/ -#include +#include #include #include +#include + #include #include #include diff --git a/tests/auto/gui/painting/qpen/tst_qpen.cpp b/tests/auto/gui/painting/qpen/tst_qpen.cpp index 295ae27d17..64c01a81b5 100644 --- a/tests/auto/gui/painting/qpen/tst_qpen.cpp +++ b/tests/auto/gui/painting/qpen/tst_qpen.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include "qpen.h" #include "qbrush.h" diff --git a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp index a33e1559de..4cde0aa549 100644 --- a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp +++ b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/painting/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp index 27327d8d1a..29179c44a0 100644 --- a/tests/auto/gui/painting/qregion/tst_qregion.cpp +++ b/tests/auto/gui/painting/qregion/tst_qregion.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp index a3ff1b0081..1bab7200f0 100644 --- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp +++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include #include diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp index decd75ae10..9e66ec9a43 100644 --- a/tests/auto/gui/qopengl/tst_qopengl.cpp +++ b/tests/auto/gui/qopengl/tst_qopengl.cpp @@ -48,7 +48,7 @@ #include #include -#include +#include #include diff --git a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp index d0f19dd9a3..d65293f8b8 100644 --- a/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp +++ b/tests/auto/gui/qopenglconfig/tst_qopenglconfig.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/tests/auto/gui/qvulkan/tst_qvulkan.cpp b/tests/auto/gui/qvulkan/tst_qvulkan.cpp index f200ec6ba4..020448af8b 100644 --- a/tests/auto/gui/qvulkan/tst_qvulkan.cpp +++ b/tests/auto/gui/qvulkan/tst_qvulkan.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index 643720d4fc..877f8f9c17 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include #include #include #include diff --git a/tests/auto/gui/rhi/qshader/tst_qshader.cpp b/tests/auto/gui/rhi/qshader/tst_qshader.cpp index fc01b8d6a5..d84053dfa7 100644 --- a/tests/auto/gui/rhi/qshader/tst_qshader.cpp +++ b/tests/auto/gui/rhi/qshader/tst_qshader.cpp @@ -26,8 +26,10 @@ ** ****************************************************************************/ -#include +#include #include +#include + #include #include 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 +#include #include #include 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 +#include #include #include #include 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 - +#include +#include +#include +#include #include #include 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 +#include #include 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 +#include +#include #include #include 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 +#include #include #include #include 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 +#include #include #include 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 +#include #include #include 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 +#include #include #include 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 +#include #include #include #include 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 +#include #include #include #include #include #include +#include #ifndef QT_NO_WIDGETS #include 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 +#include #include #include 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 - +#include +#include #include #include 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 +#include #include 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 +#include #include #include 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 +#include +#include #include #include 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 +#include #include #include 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 +#include 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 +#include #include #include 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 +#include #include #include #include @@ -36,6 +36,7 @@ #include #include #include +#include #include 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 +#include #include #include #include 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 +#include #include #include 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 +#include #include #include #include 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 +#include +#include #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 +#include #include #include #include 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 +#include #include 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 +#include #include +#include + #include #include diff --git a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp index ba4a035767..7446f8ed9f 100644 --- a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp +++ b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp b/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp index 366f3b6fdf..fb8e5f0a3a 100644 --- a/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp +++ b/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp @@ -27,8 +27,8 @@ ****************************************************************************/ -#include - +#include +#include #include diff --git a/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp b/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp index ec0d63f67c..5dc7cba2c2 100644 --- a/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp +++ b/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp @@ -27,7 +27,9 @@ ****************************************************************************/ -#include +#include +#include + #include class tst_QIntValidator : public QObject diff --git a/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp b/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp index 63aa6bd558..0d1d748e00 100644 --- a/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp +++ b/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp @@ -28,7 +28,8 @@ ****************************************************************************/ #include -#include +#include +#include class tst_QRegularExpressionValidator : public QObject { diff --git a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp index 58bea1b6b7..408460132b 100644 --- a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp +++ b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp b/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp index 3a8d5700b4..8cf62eb387 100644 --- a/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp +++ b/tests/auto/gui/util/qshadergraph/tst_qshadergraph.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include diff --git a/tests/auto/gui/util/qshadergraphloader/tst_qshadergraphloader.cpp b/tests/auto/gui/util/qshadergraphloader/tst_qshadergraphloader.cpp index 53ddc1874f..86db9edbea 100644 --- a/tests/auto/gui/util/qshadergraphloader/tst_qshadergraphloader.cpp +++ b/tests/auto/gui/util/qshadergraphloader/tst_qshadergraphloader.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include diff --git a/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp b/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp index 9eb738a1b2..be6239a4fd 100644 --- a/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp +++ b/tests/auto/gui/util/qshadernodes/tst_qshadernodes.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include #include diff --git a/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp b/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp index af9e7b8c8e..fd022ba83f 100644 --- a/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp +++ b/tests/auto/gui/util/qshadernodesloader/tst_qshadernodesloader.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ -#include +#include #include diff --git a/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp b/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp index 9b78d18954..6ff3497a74 100644 --- a/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp +++ b/tests/auto/gui/util/qtexturefilereader/tst_qtexturefilereader.cpp @@ -27,7 +27,7 @@ ****************************************************************************/ #include -#include +#include class tst_qtexturefilereader : public QObject { diff --git a/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp b/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp index 514890d50b..7c45a60c72 100644 --- a/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/gui/util/qundogroup/tst_qundogroup.cpp @@ -25,10 +25,14 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include +#include #include #include #include +#include +#include +#include +#include /****************************************************************************** ** Commands diff --git a/tests/auto/gui/util/qundostack/tst_qundostack.cpp b/tests/auto/gui/util/qundostack/tst_qundostack.cpp index aa3f3c6aa4..662dbe3f36 100644 --- a/tests/auto/gui/util/qundostack/tst_qundostack.cpp +++ b/tests/auto/gui/util/qundostack/tst_qundostack.cpp @@ -27,9 +27,13 @@ ****************************************************************************/ -#include +#include #include #include +#include +#include +#include +#include /****************************************************************************** ** Commands -- cgit v1.2.3