diff --git a/bin/syncqt b/bin/syncqt index bc2ccf38ae7..8b4ce6f46aa 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -992,7 +992,11 @@ foreach my $lib (@modules_to_sync) { my $header_copies = 0; #figure out if it is a public header my $public_header = $header; - if($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { + my $qpa_header = 0; + if($public_header =~ /^qplatform/) { + $public_header = 0; + $qpa_header = 1; + } elsif($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { $public_header = 0; } else { foreach (@ignore_for_master_contents) { @@ -1040,13 +1044,20 @@ foreach my $lib (@modules_to_sync) { $header_copies++ if(syncHeader($lib, "$out_basedir/include/$lib/$explicitheaders{$lib}{basename($header)}", "$out_basedir/include/$lib/$header", 0, $ts)); } - } elsif ($create_private_headers) { + } elsif ($create_private_headers && !$qpa_header) { if ($module_version) { @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" ); } else { @headers = ( "$out_basedir/include/$lib/private/$header" ); } + } elsif ($create_private_headers) { + if ($module_version) { + @headers = ( "$out_basedir/include/$lib/$module_version/$lib/qpa/$header" ); + } else { + @headers = ( "$out_basedir/include/$lib/qpa/$header" ); + } } + foreach(@headers) { #sync them $header_copies++ if(syncHeader($lib, $_, $iheader, $copy_headers && !$shadow, $ts)); } @@ -1317,6 +1328,8 @@ if($check_includes) { my $public_header = $header; if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { $public_header = 0; + } elsif ($public_header =~ /^qplatform/) { + $public_header = 0; } else { foreach (@ignore_for_master_contents) { $public_header = 0 if($header eq $_); diff --git a/examples/opengl/hellowindow/main.cpp b/examples/opengl/hellowindow/main.cpp index 9723e8f9de9..e1fde9b5b88 100644 --- a/examples/opengl/hellowindow/main.cpp +++ b/examples/opengl/hellowindow/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include -#include +#include #include #include #include diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri index 70ac033f77e..abffa2ade8a 100644 --- a/src/gui/accessible/accessible.pri +++ b/src/gui/accessible/accessible.pri @@ -6,7 +6,7 @@ contains(QT_CONFIG, accessibility) { accessible/qaccessible2.h \ accessible/qaccessibleobject.h \ accessible/qaccessibleplugin.h \ - accessible/qplatformaccessibility_qpa.h + accessible/qplatformaccessibility.h SOURCES += accessible/qaccessible.cpp \ accessible/qaccessible2.cpp \ diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp index 02318468bb3..af75693ca25 100644 --- a/src/gui/accessible/qaccessible.cpp +++ b/src/gui/accessible/qaccessible.cpp @@ -48,8 +48,8 @@ #include "qaccessiblebridge.h" #include #include -#include "qplatformaccessibility_qpa.h" -#include "qplatformintegration_qpa.h" +#include +#include #include #include diff --git a/src/gui/accessible/qplatformaccessibility_qpa.h b/src/gui/accessible/qplatformaccessibility.h similarity index 100% rename from src/gui/accessible/qplatformaccessibility_qpa.h rename to src/gui/accessible/qplatformaccessibility.h diff --git a/src/gui/accessible/qplatformaccessibility_qpa.cpp b/src/gui/accessible/qplatformaccessibility_qpa.cpp index 91b5de1198b..7ea5a5d2c80 100644 --- a/src/gui/accessible/qplatformaccessibility_qpa.cpp +++ b/src/gui/accessible/qplatformaccessibility_qpa.cpp @@ -38,7 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qplatformaccessibility_qpa.h" +#include "qplatformaccessibility.h" #include #include "qaccessibleplugin.h" #include "qaccessibleobject.h" diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index 34a33aa0f09..737b7fcbd46 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -21,7 +21,7 @@ HEADERS += \ image/qpixmap_blitter_p.h \ image/qpixmapcache.h \ image/qpixmapcache_p.h \ - image/qplatformpixmap_qpa.h \ + image/qplatformpixmap.h \ image/qimagepixmapcleanuphooks_p.h \ SOURCES += \ diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index f3c26dd5b2f..499f9f48f2e 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qbitmap.h" -#include "qplatformpixmap_qpa.h" -#include "qplatformintegration_qpa.h" +#include +#include #include "qimage.h" #include "qscreen.h" #include "qvariant.h" diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index b8ec7de8518..91b21227dfb 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -50,13 +50,13 @@ #include "qstringlist.h" #include "qvariant.h" #include "qimagepixmapcleanuphooks_p.h" -#include "qplatformintegration_qpa.h" +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/src/gui/image/qimagepixmapcleanuphooks.cpp b/src/gui/image/qimagepixmapcleanuphooks.cpp index b118f5f8566..548934829e6 100644 --- a/src/gui/image/qimagepixmapcleanuphooks.cpp +++ b/src/gui/image/qimagepixmapcleanuphooks.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qimagepixmapcleanuphooks_p.h" -#include "qplatformpixmap_qpa.h" +#include #include "private/qimage_p.h" diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index 96d7a0487bf..c562b0bd6d7 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -41,7 +41,7 @@ #include #include "qnativeimage_p.h" -#include "qplatformscreen_qpa.h" +#include #include "private/qguiapplication_p.h" #include "qscreen.h" diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index cefb8edf74d..248caf7f3d0 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -42,7 +42,7 @@ #include #include "qpixmap.h" -#include "qplatformpixmap_qpa.h" +#include #include "qimagepixmapcleanuphooks_p.h" #include "qbitmap.h" @@ -63,7 +63,7 @@ #include "qthread.h" #include "qdebug.h" -# include "qplatformintegration_qpa.h" +#include #include "qpixmap_raster_p.h" #include "private/qhexstring_p.h" diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h index 95397374c66..174277f9eb4 100644 --- a/src/gui/image/qpixmap_blitter_p.h +++ b/src/gui/image/qpixmap_blitter_p.h @@ -42,7 +42,7 @@ #ifndef QPIXMAP_BLITTER_P_H #define QPIXMAP_BLITTER_P_H -#include +#include #include #ifndef QT_NO_BLITTABLE diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index 864fad42ec5..8e1a8ccc03b 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp index 66a829f5dec..c25393c72e8 100644 --- a/src/gui/image/qpixmap_win.cpp +++ b/src/gui/image/qpixmap_win.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qpixmap.h" -#include "qplatformpixmap_qpa.h" +#include #include "qpixmap_raster_p.h" #include diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp index 073c267fbe6..769cf5f90bf 100644 --- a/src/gui/image/qplatformpixmap.cpp +++ b/src/gui/image/qplatformpixmap.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qplatformpixmap_qpa.h" -#include "qplatformintegration_qpa.h" +#include "qplatformpixmap.h" +#include #include #include #include diff --git a/src/gui/image/qplatformpixmap_qpa.h b/src/gui/image/qplatformpixmap.h similarity index 100% rename from src/gui/image/qplatformpixmap_qpa.h rename to src/gui/image/qplatformpixmap.h diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 3c1b6b4e48f..525871c89bf 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -10,27 +10,27 @@ HEADERS += \ kernel/qgenericplugin_qpa.h \ kernel/qwindowsysteminterface_qpa.h \ kernel/qwindowsysteminterface_qpa_p.h \ - kernel/qplatformintegration_qpa.h \ - kernel/qplatformdrag_qpa.h \ - kernel/qplatformscreen_qpa.h \ - kernel/qplatformscreen_qpa_p.h \ - kernel/qplatforminputcontext_qpa.h \ - kernel/qplatforminputcontext_qpa_p.h \ - kernel/qplatformintegrationfactory_qpa_p.h \ - kernel/qplatformintegrationplugin_qpa.h \ - kernel/qplatformtheme_qpa.h\ - kernel/qplatformthemefactory_qpa_p.h \ - kernel/qplatformthemeplugin_qpa.h \ - kernel/qplatformwindow_qpa.h \ - kernel/qplatformcursor_qpa.h \ - kernel/qplatformclipboard_qpa.h \ - kernel/qplatformnativeinterface_qpa.h \ + kernel/qplatformintegration.h \ + kernel/qplatformdrag.h \ + kernel/qplatformscreen.h \ + kernel/qplatformscreen_p.h \ + kernel/qplatforminputcontext.h \ + kernel/qplatforminputcontext_p.h \ + kernel/qplatformintegrationfactory_p.h \ + kernel/qplatformintegrationplugin.h \ + kernel/qplatformtheme.h\ + kernel/qplatformthemefactory_p.h \ + kernel/qplatformthemeplugin.h \ + kernel/qplatformwindow.h \ + kernel/qplatformcursor.h \ + kernel/qplatformclipboard.h \ + kernel/qplatformnativeinterface.h \ kernel/qsurfaceformat.h \ kernel/qguiapplication.h \ kernel/qguiapplication_p.h \ kernel/qwindow_p.h \ kernel/qwindow.h \ - kernel/qplatformsurface_qpa.h \ + kernel/qplatformsurface.h \ kernel/qsurface.h \ kernel/qclipboard.h \ kernel/qcursor.h \ @@ -55,10 +55,10 @@ HEADERS += \ kernel/qstylehints.h \ kernel/qtouchdevice.h \ kernel/qtouchdevice_p.h \ - kernel/qplatformsharedgraphicscache_qpa.h \ - kernel/qplatformdialoghelper_qpa.h \ - kernel/qplatformservices_qpa.h \ - kernel/qplatformscreenpageflipper_qpa.h + kernel/qplatformsharedgraphicscache.h \ + kernel/qplatformdialoghelper.h \ + kernel/qplatformservices.h \ + kernel/qplatformscreenpageflipper.h SOURCES += \ kernel/qclipboard_qpa.cpp \ @@ -107,7 +107,7 @@ SOURCES += \ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { HEADERS += \ - kernel/qplatformopenglcontext_qpa.h \ + kernel/qplatformopenglcontext.h \ kernel/qopenglcontext.h \ kernel/qopenglcontext_p.h diff --git a/src/gui/kernel/qclipboard_qpa.cpp b/src/gui/kernel/qclipboard_qpa.cpp index 187e09253e0..284775c4e20 100644 --- a/src/gui/kernel/qclipboard_qpa.cpp +++ b/src/gui/kernel/qclipboard_qpa.cpp @@ -45,8 +45,8 @@ #include "qmimedata.h" #include "private/qguiapplication_p.h" -#include "qplatformclipboard_qpa.h" -#include "qplatformintegration_qpa.h" +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qcursor_qpa.cpp b/src/gui/kernel/qcursor_qpa.cpp index 1c719c839e2..cc9163fbc00 100644 --- a/src/gui/kernel/qcursor_qpa.cpp +++ b/src/gui/kernel/qcursor_qpa.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index 1ed4a96192a..81827198309 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -59,8 +59,8 @@ #include "qimagewriter.h" #include "qdebug.h" #include -#include -#include +#include +#include #include diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 27e84b71a96..631592aaced 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -42,14 +42,14 @@ #include "qguiapplication.h" #include "private/qguiapplication_p.h" -#include "private/qplatformintegrationfactory_qpa_p.h" +#include #include "private/qevent_p.h" #include "qfont.h" -#include "qplatformfontdatabase_qpa.h" -#include "qplatformwindow_qpa.h" -#include "qplatformnativeinterface_qpa.h" -#include "qplatformtheme_qpa.h" -#include "qplatformintegration_qpa.h" +#include +#include +#include +#include +#include #include #include @@ -64,14 +64,14 @@ #include #include -#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include "private/qwindowsysteminterface_qpa_p.h" @@ -79,11 +79,11 @@ #include "private/qcursor_p.h" #include "private/qdnd_p.h" -#include -#include "qplatformdrag_qpa.h" +#include +#include #ifndef QT_NO_CURSOR -#include "qplatformcursor_qpa.h" +#include #endif #include diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 78641de55b0..cb3587ba630 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -53,7 +53,7 @@ #include "private/qwindowsysteminterface_qpa_p.h" #include "private/qshortcutmap_p.h" -#include "qplatformdrag_qpa.h" +#include QT_BEGIN_HEADER diff --git a/src/gui/kernel/qinputmethod.cpp b/src/gui/kernel/qinputmethod.cpp index 0e0bc7237a3..a699938dc62 100644 --- a/src/gui/kernel/qinputmethod.cpp +++ b/src/gui/kernel/qinputmethod.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qinputmethod_p.h b/src/gui/kernel/qinputmethod_p.h index 1e55b00318b..ad3d2141c1a 100644 --- a/src/gui/kernel/qinputmethod_p.h +++ b/src/gui/kernel/qinputmethod_p.h @@ -46,8 +46,8 @@ #include #include #include -#include -#include +#include +#include #include QT_BEGIN_HEADER diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 4946a1dc183..e88d901a2ba 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -41,7 +41,7 @@ #include "qkeysequence.h" #include "qkeysequence_p.h" -#include "qplatformtheme_qpa.h" +#include #include "private/qguiapplication_p.h" #ifndef QT_NO_SHORTCUT diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 4668f9e750a..b99a4dbd046 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qplatformopenglcontext_qpa.h" -#include "qplatformintegration_qpa.h" +#include +#include #include "qopenglcontext.h" #include "qopenglcontext_p.h" #include "qwindow.h" diff --git a/src/gui/kernel/qplatformclipboard_qpa.h b/src/gui/kernel/qplatformclipboard.h similarity index 100% rename from src/gui/kernel/qplatformclipboard_qpa.h rename to src/gui/kernel/qplatformclipboard.h diff --git a/src/gui/kernel/qplatformclipboard_qpa.cpp b/src/gui/kernel/qplatformclipboard_qpa.cpp index 7273450077b..5a29606391e 100644 --- a/src/gui/kernel/qplatformclipboard_qpa.cpp +++ b/src/gui/kernel/qplatformclipboard_qpa.cpp @@ -38,7 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qplatformclipboard_qpa.h" +#include "qplatformclipboard.h" #ifndef QT_NO_CLIPBOARD diff --git a/src/gui/kernel/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor.h similarity index 99% rename from src/gui/kernel/qplatformcursor_qpa.h rename to src/gui/kernel/qplatformcursor.h index fb3e4604d24..1f339c86b78 100644 --- a/src/gui/kernel/qplatformcursor_qpa.h +++ b/src/gui/kernel/qplatformcursor.h @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include QT_BEGIN_HEADER diff --git a/src/gui/kernel/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor_qpa.cpp index 5ea080c40a7..40b7967af7c 100644 --- a/src/gui/kernel/qplatformcursor_qpa.cpp +++ b/src/gui/kernel/qplatformcursor_qpa.cpp @@ -38,13 +38,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qplatformcursor_qpa.h" +#include "qplatformcursor.h" #include #include #include #include -#include +#include #include #include diff --git a/src/gui/kernel/qplatformdialoghelper_qpa.h b/src/gui/kernel/qplatformdialoghelper.h similarity index 100% rename from src/gui/kernel/qplatformdialoghelper_qpa.h rename to src/gui/kernel/qplatformdialoghelper.h diff --git a/src/gui/kernel/qplatformdialoghelper_qpa.cpp b/src/gui/kernel/qplatformdialoghelper_qpa.cpp index f2114d17e0a..ec9906ca0e2 100644 --- a/src/gui/kernel/qplatformdialoghelper_qpa.cpp +++ b/src/gui/kernel/qplatformdialoghelper_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformdialoghelper_qpa.h" +#include "qplatformdialoghelper.h" #include #include diff --git a/src/gui/kernel/qplatformdrag_qpa.h b/src/gui/kernel/qplatformdrag.h similarity index 100% rename from src/gui/kernel/qplatformdrag_qpa.h rename to src/gui/kernel/qplatformdrag.h diff --git a/src/gui/kernel/qplatformdrag_qpa.cpp b/src/gui/kernel/qplatformdrag_qpa.cpp index d9fc3a2ab8d..8367ad8e06d 100644 --- a/src/gui/kernel/qplatformdrag_qpa.cpp +++ b/src/gui/kernel/qplatformdrag_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformdrag_qpa.h" +#include "qplatformdrag.h" #include #include diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext.h similarity index 100% rename from src/gui/kernel/qplatforminputcontext_qpa.h rename to src/gui/kernel/qplatforminputcontext.h diff --git a/src/gui/kernel/qplatforminputcontext_qpa_p.h b/src/gui/kernel/qplatforminputcontext_p.h similarity index 100% rename from src/gui/kernel/qplatforminputcontext_qpa_p.h rename to src/gui/kernel/qplatforminputcontext_p.h diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp index 53839088c56..0a8633b61d2 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.cpp +++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include +#include "qplatforminputcontext.h" #include #include #include "private/qkeymapper_p.h" -#include "private/qplatforminputcontext_qpa_p.h" +#include QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration.h similarity index 99% rename from src/gui/kernel/qplatformintegration_qpa.h rename to src/gui/kernel/qplatformintegration.h index a44f4343ef8..fb62dafc5cb 100644 --- a/src/gui/kernel/qplatformintegration_qpa.h +++ b/src/gui/kernel/qplatformintegration.h @@ -54,7 +54,7 @@ // #include -#include +#include #include QT_BEGIN_HEADER diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp index 5269d8fb246..8e4ed055766 100644 --- a/src/gui/kernel/qplatformintegration_qpa.cpp +++ b/src/gui/kernel/qplatformintegration_qpa.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "qplatformintegration_qpa.h" +#include "qplatformintegration.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa_p.h b/src/gui/kernel/qplatformintegrationfactory_p.h similarity index 100% rename from src/gui/kernel/qplatformintegrationfactory_qpa_p.h rename to src/gui/kernel/qplatformintegrationfactory_p.h diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp index a84c2433556..2092f2d0bae 100644 --- a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp +++ b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qplatformintegrationfactory_qpa_p.h" -#include +#include +#include #include "private/qfactoryloader_p.h" #include "qmutex.h" diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.h b/src/gui/kernel/qplatformintegrationplugin.h similarity index 100% rename from src/gui/kernel/qplatformintegrationplugin_qpa.h rename to src/gui/kernel/qplatformintegrationplugin.h diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp index 7bd1caa1d34..d4debd1f3a7 100644 --- a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp +++ b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformintegrationplugin_qpa.h" +#include "qplatformintegrationplugin.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface.h similarity index 100% rename from src/gui/kernel/qplatformnativeinterface_qpa.h rename to src/gui/kernel/qplatformnativeinterface.h diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp index c17eee4415f..f0bd3f0658a 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp +++ b/src/gui/kernel/qplatformnativeinterface_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformnativeinterface_qpa.h" +#include "qplatformnativeinterface.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.h b/src/gui/kernel/qplatformopenglcontext.h similarity index 100% rename from src/gui/kernel/qplatformopenglcontext_qpa.h rename to src/gui/kernel/qplatformopenglcontext.h diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.cpp b/src/gui/kernel/qplatformopenglcontext_qpa.cpp index 33adc264820..d38a5864d6c 100644 --- a/src/gui/kernel/qplatformopenglcontext_qpa.cpp +++ b/src/gui/kernel/qplatformopenglcontext_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformopenglcontext_qpa.h" +#include "qplatformopenglcontext.h" #include diff --git a/src/gui/kernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen.h similarity index 98% rename from src/gui/kernel/qplatformscreen_qpa.h rename to src/gui/kernel/qplatformscreen.h index 71d734867ec..075dfb114b9 100644 --- a/src/gui/kernel/qplatformscreen_qpa.h +++ b/src/gui/kernel/qplatformscreen.h @@ -63,7 +63,7 @@ #include #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/gui/kernel/qplatformscreen_qpa_p.h b/src/gui/kernel/qplatformscreen_p.h similarity index 100% rename from src/gui/kernel/qplatformscreen_qpa_p.h rename to src/gui/kernel/qplatformscreen_p.h diff --git a/src/gui/kernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen_qpa.cpp index a26bd25408b..6c2f98beb41 100644 --- a/src/gui/kernel/qplatformscreen_qpa.cpp +++ b/src/gui/kernel/qplatformscreen_qpa.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qplatformscreen_qpa.h" +#include "qplatformscreen.h" #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/src/gui/kernel/qplatformscreenpageflipper_qpa.h b/src/gui/kernel/qplatformscreenpageflipper.h similarity index 100% rename from src/gui/kernel/qplatformscreenpageflipper_qpa.h rename to src/gui/kernel/qplatformscreenpageflipper.h diff --git a/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp b/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp index b912c6055eb..babecb061f3 100644 --- a/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp +++ b/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformscreenpageflipper_qpa.h" +#include "qplatformscreenpageflipper.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformservices_qpa.h b/src/gui/kernel/qplatformservices.h similarity index 100% rename from src/gui/kernel/qplatformservices_qpa.h rename to src/gui/kernel/qplatformservices.h diff --git a/src/gui/kernel/qplatformservices_qpa.cpp b/src/gui/kernel/qplatformservices_qpa.cpp index 7993a82f4e7..dac9e64e406 100644 --- a/src/gui/kernel/qplatformservices_qpa.cpp +++ b/src/gui/kernel/qplatformservices_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformservices_qpa.h" +#include "qplatformservices.h" #include #include diff --git a/src/gui/kernel/qplatformsharedgraphicscache_qpa.h b/src/gui/kernel/qplatformsharedgraphicscache.h similarity index 100% rename from src/gui/kernel/qplatformsharedgraphicscache_qpa.h rename to src/gui/kernel/qplatformsharedgraphicscache.h diff --git a/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp b/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp index 539bb1458fd..a3bb8da3582 100644 --- a/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp +++ b/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformsharedgraphicscache_qpa.h" +#include "qplatformsharedgraphicscache.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformsurface_qpa.h b/src/gui/kernel/qplatformsurface.h similarity index 100% rename from src/gui/kernel/qplatformsurface_qpa.h rename to src/gui/kernel/qplatformsurface.h diff --git a/src/gui/kernel/qplatformsurface_qpa.cpp b/src/gui/kernel/qplatformsurface_qpa.cpp index 1f752fe3e21..50cdd68ab65 100644 --- a/src/gui/kernel/qplatformsurface_qpa.cpp +++ b/src/gui/kernel/qplatformsurface_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformsurface_qpa.h" +#include "qplatformsurface.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformtheme_qpa.h b/src/gui/kernel/qplatformtheme.h similarity index 100% rename from src/gui/kernel/qplatformtheme_qpa.h rename to src/gui/kernel/qplatformtheme.h diff --git a/src/gui/kernel/qplatformtheme_qpa.cpp b/src/gui/kernel/qplatformtheme_qpa.cpp index c6314825d7e..07a1d7f3659 100644 --- a/src/gui/kernel/qplatformtheme_qpa.cpp +++ b/src/gui/kernel/qplatformtheme_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformtheme_qpa.h" +#include "qplatformtheme.h" #include #include diff --git a/src/gui/kernel/qplatformthemefactory_qpa_p.h b/src/gui/kernel/qplatformthemefactory_p.h similarity index 100% rename from src/gui/kernel/qplatformthemefactory_qpa_p.h rename to src/gui/kernel/qplatformthemefactory_p.h diff --git a/src/gui/kernel/qplatformthemefactory_qpa.cpp b/src/gui/kernel/qplatformthemefactory_qpa.cpp index c023a73e7e6..8294591c4bd 100644 --- a/src/gui/kernel/qplatformthemefactory_qpa.cpp +++ b/src/gui/kernel/qplatformthemefactory_qpa.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qplatformthemefactory_qpa_p.h" -#include +#include +#include #include "private/qfactoryloader_p.h" #include "qmutex.h" diff --git a/src/gui/kernel/qplatformthemeplugin_qpa.h b/src/gui/kernel/qplatformthemeplugin.h similarity index 100% rename from src/gui/kernel/qplatformthemeplugin_qpa.h rename to src/gui/kernel/qplatformthemeplugin.h diff --git a/src/gui/kernel/qplatformthemeplugin_qpa.cpp b/src/gui/kernel/qplatformthemeplugin_qpa.cpp index da2743d6e3d..be18716b281 100644 --- a/src/gui/kernel/qplatformthemeplugin_qpa.cpp +++ b/src/gui/kernel/qplatformthemeplugin_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformthemeplugin_qpa.h" +#include "qplatformthemeplugin.h" QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow.h similarity index 97% rename from src/gui/kernel/qplatformwindow_qpa.h rename to src/gui/kernel/qplatformwindow.h index 729f35e0252..0b4c675e56c 100644 --- a/src/gui/kernel/qplatformwindow_qpa.h +++ b/src/gui/kernel/qplatformwindow.h @@ -58,8 +58,8 @@ #include #include #include -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp index b507eb4fdd8..20817361f86 100644 --- a/src/gui/kernel/qplatformwindow_qpa.cpp +++ b/src/gui/kernel/qplatformwindow_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformwindow_qpa.h" +#include "qplatformwindow.h" #include #include diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index 3546ce01dda..716caacb40c 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -42,7 +42,7 @@ #include "qscreen.h" #include "qscreen_p.h" #include "qpixmap.h" -#include "qplatformscreen_qpa.h" +#include #include diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h index c6bf37e87a4..0167384b013 100644 --- a/src/gui/kernel/qscreen_p.h +++ b/src/gui/kernel/qscreen_p.h @@ -43,7 +43,7 @@ #define QSCREEN_P_H #include -#include +#include #include diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp index 9384d34097d..a98e5fbd76e 100644 --- a/src/gui/kernel/qstylehints.cpp +++ b/src/gui/kernel/qstylehints.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 8b37fce50c3..6183b3f6ac1 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -41,11 +41,11 @@ #include "qwindow.h" -#include "qplatformwindow_qpa.h" -#include "qplatformintegration_qpa.h" +#include +#include #include "qsurfaceformat.h" #ifndef QT_NO_OPENGL -#include "qplatformopenglcontext_qpa.h" +#include #include "qopenglcontext.h" #endif #include "qscreen.h" diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index 0afd903ead6..92eaf90188f 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -43,7 +43,7 @@ #define QWINDOW_P_H #include -#include +#include #include diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface_qpa.cpp index a0b77b8208a..83cf8c338ce 100644 --- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp +++ b/src/gui/kernel/qwindowsysteminterface_qpa.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ #include "qwindowsysteminterface_qpa.h" -#include "qplatformwindow_qpa.h" +#include #include "qwindowsysteminterface_qpa_p.h" #include "private/qguiapplication_p.h" #include "private/qevent_p.h" #include "private/qtouchdevice_p.h" #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp index e4d5ff974dd..d514d714bd8 100644 --- a/src/gui/opengl/qopengltexturecache.cpp +++ b/src/gui/opengl/qopengltexturecache.cpp @@ -42,7 +42,7 @@ #include "qopengltexturecache_p.h" #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index a8f6a5bf8fb..7a20f35b337 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -33,7 +33,7 @@ HEADERS += \ painting/qstroker_p.h \ painting/qtextureglyphcache_p.h \ painting/qtransform.h \ - painting/qplatformbackingstore_qpa.h \ + painting/qplatformbackingstore.h \ painting/qpaintbuffer_p.h \ painting/qpathsimplifier_p.h diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index 63f7ba594f5..14694769a94 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -42,8 +42,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/src/gui/painting/qplatformbackingstore_qpa.h b/src/gui/painting/qplatformbackingstore.h similarity index 100% rename from src/gui/painting/qplatformbackingstore_qpa.h rename to src/gui/painting/qplatformbackingstore.h diff --git a/src/gui/painting/qplatformbackingstore_qpa.cpp b/src/gui/painting/qplatformbackingstore_qpa.cpp index 485190d301a..34cda00a6e0 100644 --- a/src/gui/painting/qplatformbackingstore_qpa.cpp +++ b/src/gui/painting/qplatformbackingstore_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include "qplatformbackingstore.h" #include #include #include diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 161bb4e23dc..ccbd335d616 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -62,7 +62,7 @@ #include #include -#include +#include #include #include diff --git a/src/gui/text/qfont_qpa.cpp b/src/gui/text/qfont_qpa.cpp index b73b03025b4..8422409cb39 100644 --- a/src/gui/text/qfont_qpa.cpp +++ b/src/gui/text/qfont_qpa.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index a1af8569926..0a56ca37422 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -50,10 +50,10 @@ #include "qfileinfo.h" #include "private/qunicodetables_p.h" #include "qfontengine_p.h" -#include "qplatformintegration_qpa.h" +#include #include -#include +#include #include #include diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp index c2a3aa97228..d7e5441931b 100644 --- a/src/gui/text/qfontdatabase_qpa.cpp +++ b/src/gui/text/qfontdatabase_qpa.cpp @@ -46,7 +46,7 @@ #include "qplatformdefs.h" #include -#include +#include #include diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp index bf0cfd14043..dcb0a4f8d1b 100644 --- a/src/gui/text/qfontengine_qpa.cpp +++ b/src/gui/text/qfontengine_qpa.cpp @@ -48,8 +48,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qplatformfontdatabase_qpa.h b/src/gui/text/qplatformfontdatabase.h similarity index 100% rename from src/gui/text/qplatformfontdatabase_qpa.h rename to src/gui/text/qplatformfontdatabase.h diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp index 632d2d89d9c..3531202eff0 100644 --- a/src/gui/text/qplatformfontdatabase_qpa.cpp +++ b/src/gui/text/qplatformfontdatabase_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformfontdatabase_qpa.h" +#include "qplatformfontdatabase.h" #include #include #include diff --git a/src/gui/text/qrawfont_qpa.cpp b/src/gui/text/qrawfont_qpa.cpp index d037d5902d3..7289450e7f9 100644 --- a/src/gui/text/qrawfont_qpa.cpp +++ b/src/gui/text/qrawfont_qpa.cpp @@ -44,8 +44,8 @@ #if !defined(QT_NO_RAWFONT) #include "qrawfont_p.h" -#include "qplatformintegration_qpa.h" -#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 6587769712b..d0dd0ed129c 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -102,7 +102,7 @@ SOURCES += \ text/qrawfont_qpa.cpp HEADERS += \ - text/qplatformfontdatabase_qpa.h + text/qplatformfontdatabase.h DEFINES += QT_NO_OPENTYPE INCLUDEPATH += ../3rdparty/harfbuzz/src diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index a941c060310..0fba6e6f3a2 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/src/gui/util/qdesktopservices.cpp @@ -52,8 +52,8 @@ #include #include #include -#include -#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index e306ea44760..d298777c30b 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -55,13 +55,13 @@ #include "gl2paintengineex/qpaintengineex_opengl2_p.h" -#include +#include #include #include #include -#include +#include #include #include #include "qcolormap.h" diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 8810b70f087..05c0d9fe39e 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -45,8 +45,8 @@ #include #include -#include -#include +#include +#include #include #include "qgl.h" diff --git a/src/platformsupport/dnd/qsimpledrag_p.h b/src/platformsupport/dnd/qsimpledrag_p.h index 72706840820..fa87f09d060 100644 --- a/src/platformsupport/dnd/qsimpledrag_p.h +++ b/src/platformsupport/dnd/qsimpledrag_p.h @@ -42,7 +42,7 @@ #ifndef QSIMPLEDRAG_H #define QSIMPLEDRAG_H -#include +#include #include diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp index 71e18203fbd..97b4571dbf7 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp @@ -43,7 +43,7 @@ #include "qeglconvenience_p.h" -#include +#include #include diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h index 75375fa7814..d48d49a696e 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h +++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h @@ -42,8 +42,8 @@ #ifndef QEGLPLATFORMCONTEXT_H #define QEGLPLATFORMCONTEXT_H -#include -#include +#include +#include #include class QEGLPlatformContext : public QPlatformOpenGLContext diff --git a/src/platformsupport/fb_base/fb_base.cpp b/src/platformsupport/fb_base/fb_base.cpp index 0cdd091df2d..516274962db 100644 --- a/src/platformsupport/fb_base/fb_base.cpp +++ b/src/platformsupport/fb_base/fb_base.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include QPlatformSoftwareCursor::QPlatformSoftwareCursor(QPlatformScreen *scr) diff --git a/src/platformsupport/fb_base/fb_base_p.h b/src/platformsupport/fb_base/fb_base_p.h index c9862c6c58b..187ae961bf4 100644 --- a/src/platformsupport/fb_base/fb_base_p.h +++ b/src/platformsupport/fb_base/fb_base_p.h @@ -46,9 +46,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include class QMouseEvent; diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index cddc08c7500..e96659d4f6a 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -42,7 +42,7 @@ #include "qbasicfontdatabase_p.h" #include -#include +#include #include #include diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h index fd6e180c751..eb4b11ca976 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h @@ -42,7 +42,7 @@ #ifndef QBASICFONTDATABASE_H #define QBASICFONTDATABASE_H -#include +#include #include #include diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 9ad9b96d150..d995ffbbad1 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -47,7 +47,7 @@ #include -#include +#include #include #include diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h index df62ddeb0bf..9859bd70824 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h @@ -42,7 +42,7 @@ #ifndef QFONTCONFIGDATABASE_H #define QFONTCONFIGDATABASE_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h index 01aed89d475..e38e01d25dc 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h @@ -42,7 +42,7 @@ #ifndef QCORETEXTFONTDATABASE_H #define QCORETEXTFONTDATABASE_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/inputcontext/inputcontext.pri b/src/platformsupport/inputcontext/inputcontext.pri index e1a44684bac..8debcd01292 100644 --- a/src/platformsupport/inputcontext/inputcontext.pri +++ b/src/platformsupport/inputcontext/inputcontext.pri @@ -1,6 +1,6 @@ HEADERS += \ - $$PWD/qplatforminputcontextplugin_qpa_p.h \ - $$PWD/qplatforminputcontextfactory_qpa_p.h + $$PWD/qplatforminputcontextplugin_p.h \ + $$PWD/qplatforminputcontextfactory_p.h SOURCES += \ $$PWD/qplatforminputcontextplugin_qpa.cpp \ $$PWD/qplatforminputcontextfactory_qpa.cpp diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h b/src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h similarity index 100% rename from src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h rename to src/platformsupport/inputcontext/qplatforminputcontextfactory_p.h diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp index ca3673f670a..6d909426a8b 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp +++ b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qplatforminputcontextfactory_qpa_p.h" -#include "qplatforminputcontextplugin_qpa_p.h" -#include +#include +#include +#include #include "private/qfactoryloader_p.h" #include "qguiapplication.h" diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h b/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h similarity index 100% rename from src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h rename to src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp index 88cd9cdf674..670bfd0de55 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp +++ b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatforminputcontextplugin_qpa_p.h" +#include "qplatforminputcontextplugin_p.h" QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h index 369e8274fd8..d6b2d0d0803 100644 --- a/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h +++ b/src/platformsupport/printersupport/genericunix/qgenericunixprintersupport_p.h @@ -42,7 +42,7 @@ #ifndef QGENERICUNIXPRINTINGSUPPORT_H #define QGENERICUNIXPRINTINGSUPPORT_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/platformsupport/services/genericunix/qgenericunixservices_p.h b/src/platformsupport/services/genericunix/qgenericunixservices_p.h index 3923a45f897..b0dbccc0996 100644 --- a/src/platformsupport/services/genericunix/qgenericunixservices_p.h +++ b/src/platformsupport/services/genericunix/qgenericunixservices_p.h @@ -42,7 +42,7 @@ #ifndef QGENERICUNIXDESKTOPSERVICES_H #define QGENERICUNIXDESKTOPSERVICES_H -#include +#include #include QT_BEGIN_HEADER diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h index cabffc02122..a1b50865edc 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h @@ -42,7 +42,7 @@ #ifndef QGENERICUNIXTHEMES_H #define QGENERICUNIXTHEMES_H -#include +#include #include #include diff --git a/src/plugins/platforminputcontexts/ibus/ibus.pro b/src/plugins/platforminputcontexts/ibus/ibus.pro index 12419343faa..0fb92f23a85 100644 --- a/src/plugins/platforminputcontexts/ibus/ibus.pro +++ b/src/plugins/platforminputcontexts/ibus/ibus.pro @@ -3,7 +3,7 @@ load(qt_plugin) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts -QT += dbus platformsupport-private +QT += dbus platformsupport-private gui-private SOURCES += $$PWD/qibusplatforminputcontext.cpp \ $$PWD/qibusproxy.cpp \ $$PWD/qibusinputcontextproxy.cpp \ diff --git a/src/plugins/platforminputcontexts/ibus/main.cpp b/src/plugins/platforminputcontexts/ibus/main.cpp index 19f032b7dfb..d841426ea70 100644 --- a/src/plugins/platforminputcontexts/ibus/main.cpp +++ b/src/plugins/platforminputcontexts/ibus/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include #include "qibusplatforminputcontext.h" diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h index 1ed4262ef65..4d9f42e8d0b 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h @@ -41,7 +41,7 @@ #ifndef QIBUSPLATFORMINPUTCONTEXT_H #define QIBUSPLATFORMINPUTCONTEXT_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforminputcontexts/maliit/main.cpp b/src/plugins/platforminputcontexts/maliit/main.cpp index 2552cc0aa6a..adeaa7bb313 100644 --- a/src/plugins/platforminputcontexts/maliit/main.cpp +++ b/src/plugins/platforminputcontexts/maliit/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include #include "qmaliitplatforminputcontext.h" diff --git a/src/plugins/platforminputcontexts/maliit/maliit.pro b/src/plugins/platforminputcontexts/maliit/maliit.pro index 445e1726376..dbcd22efcbb 100644 --- a/src/plugins/platforminputcontexts/maliit/maliit.pro +++ b/src/plugins/platforminputcontexts/maliit/maliit.pro @@ -3,7 +3,7 @@ load(qt_plugin) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforminputcontexts -QT += dbus platformsupport-private +QT += dbus platformsupport-private gui-private SOURCES += $$PWD/qmaliitplatforminputcontext.cpp \ $$PWD/serverproxy.cpp \ $$PWD/serveraddressproxy.cpp \ diff --git a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h index 26125246195..cb32feed611 100644 --- a/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h +++ b/src/plugins/platforminputcontexts/maliit/qmaliitplatforminputcontext.h @@ -41,7 +41,7 @@ #ifndef QMALIITPLATFORMINPUTCONTEXT_H #define QMALIITPLATFORMINPUTCONTEXT_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index f149a6775bc..ccd98c5b3c8 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -77,7 +77,7 @@ RESOURCES += qcocoaresources.qrc LIBS += -framework Cocoa -framework IOKit -QT += core-private gui-private widgets-private platformsupport-private printsupport +QT += core-private gui-private widgets-private platformsupport-private printsupport-private OTHER_FILES += cocoa.json target.path += $$[QT_INSTALL_PLUGINS]/platforms diff --git a/src/plugins/platforms/cocoa/main.mm b/src/plugins/platforms/cocoa/main.mm index 9857a4e1771..fc17bd3fe28 100644 --- a/src/plugins/platforms/cocoa/main.mm +++ b/src/plugins/platforms/cocoa/main.mm @@ -41,8 +41,8 @@ #include -#include -#include +#include +#include #include "qcocoaintegration.h" #include "qcocoatheme.h" diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.h b/src/plugins/platforms/cocoa/qcocoabackingstore.h index 72bb5936c03..36fb4b42ffb 100644 --- a/src/plugins/platforms/cocoa/qcocoabackingstore.h +++ b/src/plugins/platforms/cocoa/qcocoabackingstore.h @@ -47,7 +47,7 @@ #include "qcocoawindow.h" #include "qnsview.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaclipboard.h b/src/plugins/platforms/cocoa/qcocoaclipboard.h index 27505058bf4..d387ae9eb0e 100644 --- a/src/plugins/platforms/cocoa/qcocoaclipboard.h +++ b/src/plugins/platforms/cocoa/qcocoaclipboard.h @@ -42,7 +42,7 @@ #ifndef QCOCOACLIPBOARD_H #define QCOCOACLIPBOARD_H -#include +#include #include "qmacclipboard.h" #include diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h index 4b901f3ef39..8845d7fdcd6 100644 --- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h +++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h @@ -43,7 +43,7 @@ #define QCOCOACOLORDIALOGHELPER_H #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoacursor.h b/src/plugins/platforms/cocoa/qcocoacursor.h index 85892ee820f..b57d624b61d 100644 --- a/src/plugins/platforms/cocoa/qcocoacursor.h +++ b/src/plugins/platforms/cocoa/qcocoacursor.h @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h index 17df54f748b..5a0a3fa2715 100644 --- a/src/plugins/platforms/cocoa/qcocoadrag.h +++ b/src/plugins/platforms/cocoa/qcocoadrag.h @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm index a3bd4a95caf..ddaa7a762be 100644 --- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm +++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm @@ -81,8 +81,8 @@ #include "qhash.h" #include "qmutex.h" #include "qsocketnotifier.h" -#include -#include +#include +#include #include "private/qthread_p.h" #include "private/qguiapplication_p.h" #include diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h index 9768d3e6f9a..5b7af09fb8e 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h @@ -43,7 +43,7 @@ #define QCOCOAFILEDIALOGHELPER_H #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h index f9dd4357a5d..501e67deb37 100644 --- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h +++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h @@ -43,7 +43,7 @@ #define QCOCOAFONTDIALOGHELPER_H #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h index 4f80511f612..6c0fcd10771 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.h +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h @@ -43,7 +43,7 @@ #define QCOCOAGLCONTEXT_H #include -#include +#include #include #include diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm index 60590b966ec..8f8d7b84a67 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -45,7 +45,7 @@ #include #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.h b/src/plugins/platforms/cocoa/qcocoainputcontext.h index 1fda29209d6..743931193d5 100644 --- a/src/plugins/platforms/cocoa/qcocoainputcontext.h +++ b/src/plugins/platforms/cocoa/qcocoainputcontext.h @@ -42,7 +42,7 @@ #ifndef QCOCOAINPUTCONTEXT_H #define QCOCOAINPUTCONTEXT_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index a001b6234a0..da84969f003 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -51,7 +51,7 @@ #include "qcocoaservices.h" #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 0b87773deeb..b82519fd97f 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -55,7 +55,7 @@ #include "qcocoainputcontext.h" #include "qmacmime.h" -#include +#include #include #include diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h index bb4d0f9f6ca..0346eafec44 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h @@ -42,8 +42,8 @@ #ifndef QCOCOANATIVEINTERFACE_H #define QCOCOANATIVEINTERFACE_H -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index ca15b6bbfb6..df9ae236068 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -46,9 +46,9 @@ #include #include -#include "qplatformwindow_qpa.h" +#include #include "qsurfaceformat.h" -#include "qplatformopenglcontext_qpa.h" +#include #include "qopenglcontext.h" #include diff --git a/src/plugins/platforms/cocoa/qcocoaprintersupport.h b/src/plugins/platforms/cocoa/qcocoaprintersupport.h index 2309025bb33..88a83a4f4e3 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintersupport.h +++ b/src/plugins/platforms/cocoa/qcocoaprintersupport.h @@ -42,7 +42,7 @@ #ifndef QCOCOAPRINTERSUPPORT_H #define QCOCOAPRINTERSUPPORT_H -#include +#include class QCocoaPrinterSupport : public QPlatformPrinterSupport { diff --git a/src/plugins/platforms/cocoa/qcocoaservices.h b/src/plugins/platforms/cocoa/qcocoaservices.h index 022c39dc57c..e3f5b3dbf0a 100644 --- a/src/plugins/platforms/cocoa/qcocoaservices.h +++ b/src/plugins/platforms/cocoa/qcocoaservices.h @@ -42,7 +42,7 @@ #ifndef QCOCOADESKTOPSERVICES_H #define QCOCOADESKTOPSERVICES_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoasystemsettings.h b/src/plugins/platforms/cocoa/qcocoasystemsettings.h index 10cac27dcd2..5e1249759b0 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemsettings.h +++ b/src/plugins/platforms/cocoa/qcocoasystemsettings.h @@ -44,7 +44,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoatheme.h b/src/plugins/platforms/cocoa/qcocoatheme.h index 5cb6f7437d6..791f1d4a504 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.h +++ b/src/plugins/platforms/cocoa/qcocoatheme.h @@ -43,7 +43,7 @@ #define QPLATFORMTHEME_COCOA_H #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index d08bbe79ce0..f2d6ac67bbf 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -44,7 +44,7 @@ #include -#include +#include #include #include "qcocoaglcontext.h" diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 83b6534b7c7..5480b32083a 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/cocoa/qmenu_mac.h b/src/plugins/platforms/cocoa/qmenu_mac.h index d41540a3419..7a91e2d5e88 100644 --- a/src/plugins/platforms/cocoa/qmenu_mac.h +++ b/src/plugins/platforms/cocoa/qmenu_mac.h @@ -43,7 +43,7 @@ #include #include #include -#include +#include @class NSMenuItem; diff --git a/src/plugins/platforms/cocoa/qpaintengine_mac.mm b/src/plugins/platforms/cocoa/qpaintengine_mac.mm index 87f37139200..33e6e397a20 100644 --- a/src/plugins/platforms/cocoa/qpaintengine_mac.mm +++ b/src/plugins/platforms/cocoa/qpaintengine_mac.mm @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/cocoa/qprintengine_mac.mm b/src/plugins/platforms/cocoa/qprintengine_mac.mm index e432b12e672..921dd2f78fd 100644 --- a/src/plugins/platforms/cocoa/qprintengine_mac.mm +++ b/src/plugins/platforms/cocoa/qprintengine_mac.mm @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include "qcocoaautoreleasepool.h" diff --git a/src/plugins/platforms/directfb/main.cpp b/src/plugins/platforms/directfb/main.cpp index 26bdd719ca3..86af1372496 100644 --- a/src/plugins/platforms/directfb/main.cpp +++ b/src/plugins/platforms/directfb/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qdirectfbintegration.h" #include "qdirectfb_egl.h" diff --git a/src/plugins/platforms/directfb/qdirectfb_egl.cpp b/src/plugins/platforms/directfb/qdirectfb_egl.cpp index ac9142c0f4b..f595cc4286a 100644 --- a/src/plugins/platforms/directfb/qdirectfb_egl.cpp +++ b/src/plugins/platforms/directfb/qdirectfb_egl.cpp @@ -45,7 +45,7 @@ #include "qdirectfbeglhooks.h" #include -#include +#include #include #include diff --git a/src/plugins/platforms/directfb/qdirectfbbackingstore.h b/src/plugins/platforms/directfb/qdirectfbbackingstore.h index 327329a563a..63ce626f06e 100644 --- a/src/plugins/platforms/directfb/qdirectfbbackingstore.h +++ b/src/plugins/platforms/directfb/qdirectfbbackingstore.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSURFACE_DIRECTFB_H #define QWINDOWSURFACE_DIRECTFB_H -#include +#include #include #include diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.h b/src/plugins/platforms/directfb/qdirectfbcursor.h index f28e225dc73..64133901d78 100644 --- a/src/plugins/platforms/directfb/qdirectfbcursor.h +++ b/src/plugins/platforms/directfb/qdirectfbcursor.h @@ -42,7 +42,7 @@ #ifndef QDIRECTFBCURSOR_H #define QDIRECTFBCURSOR_H -#include +#include #include #include "qdirectfbconvenience.h" diff --git a/src/plugins/platforms/directfb/qdirectfbeglhooks.h b/src/plugins/platforms/directfb/qdirectfbeglhooks.h index d0711b62dd9..96bce3b3e8f 100644 --- a/src/plugins/platforms/directfb/qdirectfbeglhooks.h +++ b/src/plugins/platforms/directfb/qdirectfbeglhooks.h @@ -42,7 +42,7 @@ #ifndef QDIRECTFBEGL_HOOKS_H #define QDIRECTFBEGL_HOOKS_H -#include "qplatformintegration_qpa.h" +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/directfb/qdirectfbglcontext.h b/src/plugins/platforms/directfb/qdirectfbglcontext.h index 7aac12c2f93..3e684ceef93 100644 --- a/src/plugins/platforms/directfb/qdirectfbglcontext.h +++ b/src/plugins/platforms/directfb/qdirectfbglcontext.h @@ -42,7 +42,7 @@ #ifndef QDIRECTFBGLCONTEXT_H #define QDIRECTFBGLCONTEXT_H -#include +#include #include "qdirectfbconvenience.h" diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp index d167c465bec..834e7dace7c 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp +++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.h b/src/plugins/platforms/directfb/qdirectfbintegration.h index 56d785e00fc..c959ae5a337 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.h +++ b/src/plugins/platforms/directfb/qdirectfbintegration.h @@ -45,7 +45,7 @@ #include "qdirectfbinput.h" #include "qdirectfbscreen.h" -#include +#include #include #include diff --git a/src/plugins/platforms/directfb/qdirectfbscreen.h b/src/plugins/platforms/directfb/qdirectfbscreen.h index 85352390882..6e2aa0d9bf5 100644 --- a/src/plugins/platforms/directfb/qdirectfbscreen.h +++ b/src/plugins/platforms/directfb/qdirectfbscreen.h @@ -45,7 +45,7 @@ #include "qdirectfbconvenience.h" #include "qdirectfbcursor.h" -#include +#include #include diff --git a/src/plugins/platforms/directfb/qdirectfbwindow.h b/src/plugins/platforms/directfb/qdirectfbwindow.h index e0206b5d026..bc9e4d9c4ee 100644 --- a/src/plugins/platforms/directfb/qdirectfbwindow.h +++ b/src/plugins/platforms/directfb/qdirectfbwindow.h @@ -42,7 +42,7 @@ #ifndef QDIRECTFBWINDOW_H #define QDIRECTFBWINDOW_H -#include +#include #include "qdirectfbconvenience.h" #include "qdirectfbinput.h" diff --git a/src/plugins/platforms/eglfs/main.cpp b/src/plugins/platforms/eglfs/main.cpp index 2ca2199619e..4565b79610b 100644 --- a/src/plugins/platforms/eglfs/main.cpp +++ b/src/plugins/platforms/eglfs/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qeglfsintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/qeglfsbackingstore.h b/src/plugins/platforms/eglfs/qeglfsbackingstore.h index f723bca685b..e9808b7f954 100644 --- a/src/plugins/platforms/eglfs/qeglfsbackingstore.h +++ b/src/plugins/platforms/eglfs/qeglfsbackingstore.h @@ -42,7 +42,7 @@ #ifndef QEGLFSBACKINGSTORE_H #define QEGLFSBACKINGSTORE_H -#include +#include #include #include diff --git a/src/plugins/platforms/eglfs/qeglfshooks.h b/src/plugins/platforms/eglfs/qeglfshooks.h index a56c80261b2..c6ea209a6fe 100644 --- a/src/plugins/platforms/eglfs/qeglfshooks.h +++ b/src/plugins/platforms/eglfs/qeglfshooks.h @@ -42,7 +42,7 @@ #ifndef QEGLFSHOOKS_H #define QEGLFSHOOKS_H -#include "qplatformintegration_qpa.h" +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/qeglfsintegration.cpp index 9b7d9246f96..7025aed4a8b 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/qeglfsintegration.cpp @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/plugins/platforms/eglfs/qeglfsintegration.h b/src/plugins/platforms/eglfs/qeglfsintegration.h index eea36a489d5..b7cb715a9c8 100644 --- a/src/plugins/platforms/eglfs/qeglfsintegration.h +++ b/src/plugins/platforms/eglfs/qeglfsintegration.h @@ -44,8 +44,8 @@ #include "qeglfsscreen.h" -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.h b/src/plugins/platforms/eglfs/qeglfsscreen.h index 66e600d7c2a..8c67bf1956e 100644 --- a/src/plugins/platforms/eglfs/qeglfsscreen.h +++ b/src/plugins/platforms/eglfs/qeglfsscreen.h @@ -42,7 +42,7 @@ #ifndef QEGLFSSCREEN_H #define QEGLFSSCREEN_H -#include +#include #include diff --git a/src/plugins/platforms/eglfs/qeglfswindow.h b/src/plugins/platforms/eglfs/qeglfswindow.h index 7f40c78550d..3e7a68953a2 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.h +++ b/src/plugins/platforms/eglfs/qeglfswindow.h @@ -45,7 +45,7 @@ #include "qeglfsintegration.h" #include "qeglfsscreen.h" -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/kms/main.cpp b/src/plugins/platforms/kms/main.cpp index 422fc5fba66..c1baaf3a4e9 100644 --- a/src/plugins/platforms/kms/main.cpp +++ b/src/plugins/platforms/kms/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qkmsintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/kms/qkmsbackingstore.h b/src/plugins/platforms/kms/qkmsbackingstore.h index ab276fa753c..59d9c9ad943 100644 --- a/src/plugins/platforms/kms/qkmsbackingstore.h +++ b/src/plugins/platforms/kms/qkmsbackingstore.h @@ -42,7 +42,7 @@ #ifndef QBACKINGSTORE_KMS_H #define QBACKINGSTORE_KMS_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/kms/qkmscontext.h b/src/plugins/platforms/kms/qkmscontext.h index 6378780f347..32223ada515 100644 --- a/src/plugins/platforms/kms/qkmscontext.h +++ b/src/plugins/platforms/kms/qkmscontext.h @@ -42,7 +42,7 @@ #ifndef QKMSCONTEXT_H #define QKMSCONTEXT_H -#include +#include #define EGL_EGLEXT_PROTOTYPES 1 #include diff --git a/src/plugins/platforms/kms/qkmscursor.h b/src/plugins/platforms/kms/qkmscursor.h index f6e1176a365..c0734eb68a3 100644 --- a/src/plugins/platforms/kms/qkmscursor.h +++ b/src/plugins/platforms/kms/qkmscursor.h @@ -42,7 +42,7 @@ #ifndef QKMSCURSOR_H #define QKMSCURSOR_H -#include +#include #define EGL_EGLEXT_PROTOTYPES 1 diff --git a/src/plugins/platforms/kms/qkmsintegration.h b/src/plugins/platforms/kms/qkmsintegration.h index 03fc5080a68..93b3084e9be 100644 --- a/src/plugins/platforms/kms/qkmsintegration.h +++ b/src/plugins/platforms/kms/qkmsintegration.h @@ -42,8 +42,8 @@ #ifndef QPLATFORMINTEGRATION_KMS_H #define QPLATFORMINTEGRATION_KMS_H -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/kms/qkmsnativeinterface.h b/src/plugins/platforms/kms/qkmsnativeinterface.h index 77a95732505..20949becba0 100644 --- a/src/plugins/platforms/kms/qkmsnativeinterface.h +++ b/src/plugins/platforms/kms/qkmsnativeinterface.h @@ -44,7 +44,7 @@ #include "qkmsscreen.h" -#include +#include class QKmsNativeInterface : public QPlatformNativeInterface { diff --git a/src/plugins/platforms/kms/qkmsscreen.h b/src/plugins/platforms/kms/qkmsscreen.h index 058314a515c..e8e6bda22d7 100644 --- a/src/plugins/platforms/kms/qkmsscreen.h +++ b/src/plugins/platforms/kms/qkmsscreen.h @@ -42,7 +42,7 @@ #ifndef QKMSSCREEN_H #define QKMSSCREEN_H -#include +#include #include "qkmsbuffermanager.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/kms/qkmswindow.h b/src/plugins/platforms/kms/qkmswindow.h index 2a7839681f8..c9b3c2692fa 100644 --- a/src/plugins/platforms/kms/qkmswindow.h +++ b/src/plugins/platforms/kms/qkmswindow.h @@ -42,7 +42,7 @@ #ifndef QKMSWINDOW_H #define QKMSWINDOW_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/linuxfb/main.cpp b/src/plugins/platforms/linuxfb/main.cpp index 13397005342..f670b6f5d41 100644 --- a/src/plugins/platforms/linuxfb/main.cpp +++ b/src/plugins/platforms/linuxfb/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qlinuxfbintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h index 3c8f03374af..200cd81bd41 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h @@ -42,7 +42,7 @@ #ifndef QGRAPHICSSYSTEM_LINUXFB_H #define QGRAPHICSSYSTEM_LINUXFB_H -#include +#include #include "../fb_base/fb_base.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/main.cpp b/src/plugins/platforms/minimal/main.cpp index 8a6e8fb4b09..9ac75e10506 100644 --- a/src/plugins/platforms/minimal/main.cpp +++ b/src/plugins/platforms/minimal/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ -#include +#include #include "qminimalintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.cpp b/src/plugins/platforms/minimal/qminimalbackingstore.cpp index 5336dbf3bd2..d47633e6735 100644 --- a/src/plugins/platforms/minimal/qminimalbackingstore.cpp +++ b/src/plugins/platforms/minimal/qminimalbackingstore.cpp @@ -43,7 +43,7 @@ #include "qminimalbackingstore.h" #include "qscreen.h" #include -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.h b/src/plugins/platforms/minimal/qminimalbackingstore.h index 375edaa2f33..ff670f5eb26 100644 --- a/src/plugins/platforms/minimal/qminimalbackingstore.h +++ b/src/plugins/platforms/minimal/qminimalbackingstore.h @@ -42,8 +42,8 @@ #ifndef QBACKINGSTORE_MINIMAL_H #define QBACKINGSTORE_MINIMAL_H -#include -#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index 874f270f426..3ad5f6e309b 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -49,7 +49,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h index 2b345e009e8..7d9db08f3d7 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.h +++ b/src/plugins/platforms/minimal/qminimalintegration.h @@ -42,8 +42,8 @@ #ifndef QPLATFORMINTEGRATION_MINIMAL_H #define QPLATFORMINTEGRATION_MINIMAL_H -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/main.cpp b/src/plugins/platforms/openwfd/main.cpp index 4e583e9b2dd..0d9508da6ca 100644 --- a/src/plugins/platforms/openwfd/main.cpp +++ b/src/plugins/platforms/openwfd/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qopenwfdintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/qopenwfdbackingstore.h b/src/plugins/platforms/openwfd/qopenwfdbackingstore.h index 4002fd8ffc9..84caa81f974 100644 --- a/src/plugins/platforms/openwfd/qopenwfdbackingstore.h +++ b/src/plugins/platforms/openwfd/qopenwfdbackingstore.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDBACKINGSTORE_H #define QOPENWFDBACKINGSTORE_H -#include +#include #include class QOpenWFDBackingStore : public QPlatformBackingStore diff --git a/src/plugins/platforms/openwfd/qopenwfdglcontext.h b/src/plugins/platforms/openwfd/qopenwfdglcontext.h index d353eddbb08..7a613cc8a79 100644 --- a/src/plugins/platforms/openwfd/qopenwfdglcontext.h +++ b/src/plugins/platforms/openwfd/qopenwfdglcontext.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDGLCONTEXT_H #define QOPENWFDGLCONTEXT_H -#include +#include #include "qopenwfddevice.h" diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.h b/src/plugins/platforms/openwfd/qopenwfdintegration.h index 5737dbb00e8..7b6a95497f5 100644 --- a/src/plugins/platforms/openwfd/qopenwfdintegration.h +++ b/src/plugins/platforms/openwfd/qopenwfdintegration.h @@ -42,8 +42,8 @@ #ifndef QOPENWFDINTEGRATION_H #define QOPENWFDINTEGRATION_H -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h index 955fca7d41c..f4ccfe5958e 100644 --- a/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h +++ b/src/plugins/platforms/openwfd/qopenwfdnativeinterface.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDNATIVEINTERFACE_H #define QOPENWFDNATIVEINTERFACE_H -#include +#include #include diff --git a/src/plugins/platforms/openwfd/qopenwfdscreen.h b/src/plugins/platforms/openwfd/qopenwfdscreen.h index 8993205a162..ff4a83f6637 100644 --- a/src/plugins/platforms/openwfd/qopenwfdscreen.h +++ b/src/plugins/platforms/openwfd/qopenwfdscreen.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDSCREEN_H #define QOPENWFDSCREEN_H -#include +#include #include "qopenwfdoutputbuffer.h" diff --git a/src/plugins/platforms/openwfd/qopenwfdwindow.h b/src/plugins/platforms/openwfd/qopenwfdwindow.h index ca531b07aee..9f777b3c4aa 100644 --- a/src/plugins/platforms/openwfd/qopenwfdwindow.h +++ b/src/plugins/platforms/openwfd/qopenwfdwindow.h @@ -42,7 +42,7 @@ #ifndef QOPENWFDWINDOW_H #define QOPENWFDWINDOW_H -#include +#include #include #include "qopenwfdport.h" diff --git a/src/plugins/platforms/qnx/main.h b/src/plugins/platforms/qnx/main.h index cc2cfdd0007..4033a291211 100644 --- a/src/plugins/platforms/qnx/main.h +++ b/src/plugins/platforms/qnx/main.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxclipboard.h b/src/plugins/platforms/qnx/qqnxclipboard.h index c9ceff41f66..7a9d7c31213 100644 --- a/src/plugins/platforms/qnx/qqnxclipboard.h +++ b/src/plugins/platforms/qnx/qqnxclipboard.h @@ -43,7 +43,7 @@ #define QQNXCLIPBOARD_H #ifndef QT_NO_CLIPBOARD -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxglbackingstore.h b/src/plugins/platforms/qnx/qqnxglbackingstore.h index b694079f37a..78ee58f2156 100644 --- a/src/plugins/platforms/qnx/qqnxglbackingstore.h +++ b/src/plugins/platforms/qnx/qqnxglbackingstore.h @@ -42,7 +42,7 @@ #ifndef QQNXGLBACKINGSTORE_H #define QQNXGLBACKINGSTORE_H -#include +#include #include #include diff --git a/src/plugins/platforms/qnx/qqnxglcontext.h b/src/plugins/platforms/qnx/qqnxglcontext.h index ee8d61ce00d..8b587e7eb84 100644 --- a/src/plugins/platforms/qnx/qqnxglcontext.h +++ b/src/plugins/platforms/qnx/qqnxglcontext.h @@ -42,7 +42,7 @@ #ifndef QQNXGLCONTEXT_H #define QQNXGLCONTEXT_H -#include +#include #include #include diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h index 5f7d95bc4a6..f6f0f60204d 100644 --- a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h +++ b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h @@ -42,11 +42,11 @@ #ifndef QQNXINPUTCONTEXT_H #define QQNXINPUTCONTEXT_H -#include +#include #include #include -#include +#include #include "imf/imf_client.h" #include "imf/input_control.h" diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h b/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h index d73c5136b58..93512b26e59 100644 --- a/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h +++ b/src/plugins/platforms/qnx/qqnxinputcontext_noimf.h @@ -43,8 +43,8 @@ #define QQNXINPUTCONTEXT_H #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp index 73d8cb2007b..dd1a6f8b7e3 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.cpp +++ b/src/plugins/platforms/qnx/qqnxintegration.cpp @@ -79,7 +79,7 @@ #include "private/qgenericunixeventdispatcher_p.h" #endif -#include +#include #include #if !defined(QT_NO_OPENGL) diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h index a3c476f16e6..e0da8cc5f24 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.h +++ b/src/plugins/platforms/qnx/qqnxintegration.h @@ -42,7 +42,7 @@ #ifndef QQNXINTEGRATION_H #define QQNXINTEGRATION_H -#include +#include #include diff --git a/src/plugins/platforms/qnx/qqnxnativeinterface.h b/src/plugins/platforms/qnx/qqnxnativeinterface.h index ec896d40fae..f176b0a5381 100644 --- a/src/plugins/platforms/qnx/qqnxnativeinterface.h +++ b/src/plugins/platforms/qnx/qqnxnativeinterface.h @@ -42,7 +42,7 @@ #ifndef QQNXNATIVEINTERFACE_H #define QQNXNATIVEINTERFACE_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxrasterbackingstore.h b/src/plugins/platforms/qnx/qqnxrasterbackingstore.h index 7a7f211e9a4..6a559492e12 100644 --- a/src/plugins/platforms/qnx/qqnxrasterbackingstore.h +++ b/src/plugins/platforms/qnx/qqnxrasterbackingstore.h @@ -42,7 +42,7 @@ #ifndef QQNXRASTERWINDOWSURFACE_H #define QQNXRASTERWINDOWSURFACE_H -#include +#include #include diff --git a/src/plugins/platforms/qnx/qqnxscreen.h b/src/plugins/platforms/qnx/qqnxscreen.h index 78166613239..4a13946ec3f 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.h +++ b/src/plugins/platforms/qnx/qqnxscreen.h @@ -42,7 +42,7 @@ #ifndef QBBSCREEN_H #define QBBSCREEN_H -#include +#include #include "qqnxrootwindow.h" diff --git a/src/plugins/platforms/qnx/qqnxservices.h b/src/plugins/platforms/qnx/qqnxservices.h index fe7c014047f..e9fc7cf2e56 100644 --- a/src/plugins/platforms/qnx/qqnxservices.h +++ b/src/plugins/platforms/qnx/qqnxservices.h @@ -42,7 +42,7 @@ #ifndef QQNXSERVICES_H #define QQNXSERVICES_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qnx/qqnxwindow.h b/src/plugins/platforms/qnx/qqnxwindow.h index 2ea7bbca511..50b9a423f51 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.h +++ b/src/plugins/platforms/qnx/qqnxwindow.h @@ -42,7 +42,7 @@ #ifndef QQNXWINDOW_H #define QQNXWINDOW_H -#include +#include #include "qqnxbuffer.h" diff --git a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp index 17ee6eb82c7..6f2a601c500 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp +++ b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h index 3366c32daae..67aaa5b9937 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h +++ b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.h @@ -44,7 +44,7 @@ #include "../qtwindowsglobal.h" #include "../qwindowscontext.h" -#include +#include #include diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp index 5003d9effd6..fafe624e4b5 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp +++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/plugins/platforms/windows/main.cpp b/src/plugins/platforms/windows/main.cpp index 9f6ce99836e..5404d916799 100644 --- a/src/plugins/platforms/windows/main.cpp +++ b/src/plugins/platforms/windows/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ -#include +#include #include #include "qwindowsintegration.h" diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.h b/src/plugins/platforms/windows/qwindowsbackingstore.h index 14ce6c34383..75b6e5f736f 100644 --- a/src/plugins/platforms/windows/qwindowsbackingstore.h +++ b/src/plugins/platforms/windows/qwindowsbackingstore.h @@ -44,7 +44,7 @@ #include "qtwindows_additional.h" -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsclipboard.h b/src/plugins/platforms/windows/qwindowsclipboard.h index 643c785e8ba..00c975eae64 100644 --- a/src/plugins/platforms/windows/qwindowsclipboard.h +++ b/src/plugins/platforms/windows/qwindowsclipboard.h @@ -44,7 +44,7 @@ #include "qwindowsinternalmimedata.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 4d284e05915..3a2113520d0 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -55,7 +55,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/windows/qwindowscursor.h b/src/plugins/platforms/windows/qwindowscursor.h index 61c43dc4d26..c1bccde46c0 100644 --- a/src/plugins/platforms/windows/qwindowscursor.h +++ b/src/plugins/platforms/windows/qwindowscursor.h @@ -44,7 +44,7 @@ #include "qtwindows_additional.h" -#include +#include #include #include diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.h b/src/plugins/platforms/windows/qwindowsdialoghelpers.h index 909ce5984e2..285c58dc5f2 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.h +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.h @@ -43,8 +43,8 @@ #define QWINDOWSDIALOGHELPER_H #include "qtwindows_additional.h" -#include -#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsdrag.h b/src/plugins/platforms/windows/qwindowsdrag.h index 7b629bacccc..867093ab602 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.h +++ b/src/plugins/platforms/windows/qwindowsdrag.h @@ -44,7 +44,7 @@ #include "qwindowsinternalmimedata.h" -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.h b/src/plugins/platforms/windows/qwindowsfontdatabase.h index f442f492aad..6441e79177a 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSFONTDATABASE_H #define QWINDOWSFONTDATABASE_H -#include +#include #include #include "qtwindows_additional.h" diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index f16a0ca73d9..607dabc9664 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h index a0489e2d028..b83a57d13ad 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.h +++ b/src/plugins/platforms/windows/qwindowsglcontext.h @@ -45,7 +45,7 @@ #include "array.h" #include "qtwindows_additional.h" -#include +#include #include #include diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.h b/src/plugins/platforms/windows/qwindowsinputcontext.h index 610bad08dd1..134dfdbd2e5 100644 --- a/src/plugins/platforms/windows/qwindowsinputcontext.h +++ b/src/plugins/platforms/windows/qwindowsinputcontext.h @@ -44,7 +44,7 @@ #include "qtwindows_additional.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 45f6ecf652f..69ae653f5b0 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -60,7 +60,7 @@ #include "accessible/qwindowsaccessibility.h" #endif -#include +#include #include #include #include diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index 84bbf6103a8..76393be4023 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/src/plugins/platforms/windows/qwindowsintegration.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSINTEGRATION_H #define QWINDOWSINTEGRATION_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h index 5b9a50b2abf..56e9ab304eb 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.h +++ b/src/plugins/platforms/windows/qwindowsscreen.h @@ -47,7 +47,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsservices.h b/src/plugins/platforms/windows/qwindowsservices.h index d979ed1af13..c9954b5257c 100644 --- a/src/plugins/platforms/windows/qwindowsservices.h +++ b/src/plugins/platforms/windows/qwindowsservices.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSDESKTOPSERVICES_H #define QWINDOWSDESKTOPSERVICES_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowstheme.h b/src/plugins/platforms/windows/qwindowstheme.h index 7515a13a72d..223a98caf53 100644 --- a/src/plugins/platforms/windows/qwindowstheme.h +++ b/src/plugins/platforms/windows/qwindowstheme.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSTHEME_H #define QWINDOWSTHEME_H -#include +#include #include #include "qtwindows_additional.h" diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index badc2297184..87c22c76d1e 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -45,7 +45,7 @@ #include "qtwindows_additional.h" #include "qwindowscursor.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/main.cpp b/src/plugins/platforms/xcb/main.cpp index 50c5a1a0178..4474a474fd6 100644 --- a/src/plugins/platforms/xcb/main.cpp +++ b/src/plugins/platforms/xcb/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qxcbintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qdri2context.h b/src/plugins/platforms/xcb/qdri2context.h index d0a1b469a9e..8945744b22f 100644 --- a/src/plugins/platforms/xcb/qdri2context.h +++ b/src/plugins/platforms/xcb/qdri2context.h @@ -42,7 +42,7 @@ #ifndef QDRI2CONTEXT_H #define QDRI2CONTEXT_H -#include +#include struct xcb_dri2_dri2_buffer_t; diff --git a/src/plugins/platforms/xcb/qglxintegration.h b/src/plugins/platforms/xcb/qglxintegration.h index dce9193eba5..8d114b75dbf 100644 --- a/src/plugins/platforms/xcb/qglxintegration.h +++ b/src/plugins/platforms/xcb/qglxintegration.h @@ -45,7 +45,7 @@ #include "qxcbwindow.h" #include "qxcbscreen.h" -#include +#include #include #include diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.h b/src/plugins/platforms/xcb/qxcbbackingstore.h index e02c6eb15bb..b66a27470e4 100644 --- a/src/plugins/platforms/xcb/qxcbbackingstore.h +++ b/src/plugins/platforms/xcb/qxcbbackingstore.h @@ -42,7 +42,7 @@ #ifndef QXCBBACKINGSTORE_H #define QXCBBACKINGSTORE_H -#include +#include #include diff --git a/src/plugins/platforms/xcb/qxcbclipboard.h b/src/plugins/platforms/xcb/qxcbclipboard.h index a43518e80b6..1b3f12b2796 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.h +++ b/src/plugins/platforms/xcb/qxcbclipboard.h @@ -42,7 +42,7 @@ #ifndef QXCBCLIPBOARD_H #define QXCBCLIPBOARD_H -#include +#include #include #include #include diff --git a/src/plugins/platforms/xcb/qxcbcursor.h b/src/plugins/platforms/xcb/qxcbcursor.h index da243424d59..80fb88b39d5 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.h +++ b/src/plugins/platforms/xcb/qxcbcursor.h @@ -42,7 +42,7 @@ #ifndef QXCBCURSOR_H #define QXCBCURSOR_H -#include +#include #include "qxcbscreen.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbdrag.h b/src/plugins/platforms/xcb/qxcbdrag.h index 710a07a5a4d..2f74b3eaf7d 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.h +++ b/src/plugins/platforms/xcb/qxcbdrag.h @@ -42,7 +42,7 @@ #ifndef QXCBDRAG_H #define QXCBDRAG_H -#include +#include #include #include #include diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 2d3971de694..8dba6e1464a 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -68,9 +68,9 @@ #include #endif -#include +#include #include -#include +#include #if defined(XCB_USE_GLX) #include "qglxintegration.h" @@ -82,7 +82,7 @@ #include #include #ifndef QT_NO_ACCESSIBILITY -#include +#include #endif QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h index 6170232d1e0..b2245e4de02 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.h +++ b/src/plugins/platforms/xcb/qxcbintegration.h @@ -42,8 +42,8 @@ #ifndef QXCBINTEGRATION_H #define QXCBINTEGRATION_H -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp index ef98f82e977..9bd4c9ccdfa 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -49,8 +49,8 @@ #include #include -#include -#include +#include +#include #ifndef XK_ISO_Left_Tab #define XK_ISO_Left_Tab 0xFE20 diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h index c6835ff9e03..354ef767996 100644 --- a/src/plugins/platforms/xcb/qxcbnativeinterface.h +++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h @@ -42,7 +42,7 @@ #ifndef QXCBNATIVEINTERFACE_H #define QXCBNATIVEINTERFACE_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h index ac4ecb1c8de..ba3f4aff8d4 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -42,7 +42,7 @@ #ifndef QXCBSCREEN_H #define QXCBSCREEN_H -#include +#include #include #include diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index ffce2f3956d..2355043c567 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -50,7 +50,7 @@ #include "qxcbkeyboard.h" #include "qxcbwmsupport.h" -#include +#include #ifdef XCB_USE_DRI2 #include "qdri2context.h" @@ -87,7 +87,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index 523dd559c1c..0b82196c27b 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -42,7 +42,7 @@ #ifndef QXCBWINDOW_H #define QXCBWINDOW_H -#include +#include #include #include diff --git a/src/plugins/printsupport/cocoa/cocoa.pro b/src/plugins/printsupport/cocoa/cocoa.pro index 353094cbae2..477715a8e23 100644 --- a/src/plugins/printsupport/cocoa/cocoa.pro +++ b/src/plugins/printsupport/cocoa/cocoa.pro @@ -2,7 +2,7 @@ TARGET = cocoaprintersupport load(qt_plugin) DESTDIR = $$QT.gui.plugins/printsupport -QT += printsupport +QT += gui-private printsupport-private LIBS += -framework Cocoa SOURCES += main.cpp diff --git a/src/plugins/printsupport/cocoa/main.cpp b/src/plugins/printsupport/cocoa/main.cpp index bc8f2e072c8..12918974f37 100644 --- a/src/plugins/printsupport/cocoa/main.cpp +++ b/src/plugins/printsupport/cocoa/main.cpp @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/printsupport/windows/main.cpp b/src/plugins/printsupport/windows/main.cpp index e29705a8a7e..7ddb89212b0 100644 --- a/src/plugins/printsupport/windows/main.cpp +++ b/src/plugins/printsupport/windows/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ -#include +#include #include #include "qwindowsprintersupport.h" diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.h b/src/plugins/printsupport/windows/qwindowsprintersupport.h index 35d794aaea8..be8758a1bdb 100644 --- a/src/plugins/printsupport/windows/qwindowsprintersupport.h +++ b/src/plugins/printsupport/windows/qwindowsprintersupport.h @@ -43,7 +43,7 @@ #define WINDOWSPRINTERSUPPORT_H #include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm index 1dded4f9057..3e84423fd8d 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm +++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm @@ -46,7 +46,7 @@ #include "qpagesetupdialog.h" #include "qabstractpagesetupdialog_p.h" -#include +#include #include QT_USE_NAMESPACE diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp index 9d7387edbac..cb69d0400ff 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp @@ -47,7 +47,7 @@ #include "../kernel/qprintengine_win_p.h" #include "qabstractpagesetupdialog_p.h" #include "qprinter.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index d7c9f565452..10d9f877a0c 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -6,8 +6,8 @@ HEADERS += \ $$PWD/qprinter_p.h \ $$PWD/qprinterinfo.h \ $$PWD/qprinterinfo_p.h \ - $$PWD/qplatformprintplugin_qpa.h \ - $$PWD/qplatformprintersupport_qpa.h + $$PWD/qplatformprintplugin.h \ + $$PWD/qplatformprintersupport.h SOURCES += \ $$PWD/qpaintengine_alpha.cpp \ diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.h b/src/printsupport/kernel/qplatformprintersupport.h similarity index 100% rename from src/printsupport/kernel/qplatformprintersupport_qpa.h rename to src/printsupport/kernel/qplatformprintersupport.h diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp index 1ed28b8090a..9c0c3f131c9 100644 --- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp +++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformprintersupport_qpa.h" +#include "qplatformprintersupport.h" #include diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp index 2c87fcc5e64..ec068d87d1d 100644 --- a/src/printsupport/kernel/qplatformprintplugin.cpp +++ b/src/printsupport/kernel/qplatformprintplugin.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformprintplugin_qpa.h" +#include "qplatformprintplugin.h" #include "private/qfactoryloader_p.h" QT_BEGIN_NAMESPACE diff --git a/src/printsupport/kernel/qplatformprintplugin_qpa.h b/src/printsupport/kernel/qplatformprintplugin.h similarity index 100% rename from src/printsupport/kernel/qplatformprintplugin_qpa.h rename to src/printsupport/kernel/qplatformprintplugin.h diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 37d2b27d157..3c079e24f3e 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 66825508497..4929b3308e1 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -52,8 +52,8 @@ #ifndef QT_NO_PRINTER -#include "qplatformprintplugin_qpa.h" -#include +#include +#include #include #if defined(Q_WS_X11) diff --git a/src/printsupport/kernel/qprinterinfo.cpp b/src/printsupport/kernel/qprinterinfo.cpp index 8d498a7e595..3d0ba7f31da 100644 --- a/src/printsupport/kernel/qprinterinfo.cpp +++ b/src/printsupport/kernel/qprinterinfo.cpp @@ -30,8 +30,8 @@ #ifndef QT_NO_PRINTER -#include "qplatformprintplugin_qpa.h" -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index 34ce374750e..825813cc29d 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -777,16 +777,6 @@ QT_CLASS_LIB(QWidgetItem, QtWidgets, qlayoutitem.h) QT_CLASS_LIB(QWidgetItemV2, QtWidgets, qlayoutitem.h) QT_CLASS_LIB(QPalette, QtGui, qpalette.h) QT_CLASS_LIB(QColorGroup, QtWidgets, qpalette.h) -QT_CLASS_LIB(QPlatformCursorImage, QtGui, qplatformcursor_qpa.h) -QT_CLASS_LIB(QPlatformCursorPrivate, QtGui, qplatformcursor_qpa.h) -QT_CLASS_LIB(QPlatformCursor, QtGui, qplatformcursor_qpa.h) -QT_CLASS_LIB(QPlatformOpenGLContext, QtGui, qplatformopenglcontext_qpa.h) -QT_CLASS_LIB(QPlatformIntegration, QtGui, qplatformintegration_qpa.h) -QT_CLASS_LIB(QPlatformIntegrationFactoryInterface, QtGui, qplatformintegrationplugin_qpa.h) -QT_CLASS_LIB(QPlatformIntegrationPlugin, QtGui, qplatformintegrationplugin_qpa.h) -QT_CLASS_LIB(QPlatformScreen, QtGui, qplatformscreen_qpa.h) -QT_CLASS_LIB(QPlatformWindow, QtGui, qplatformwindow_qpa.h) -QT_CLASS_LIB(QPlatformWindowFormat, QtGui, qplatformwindowformat_qpa.h) QT_CLASS_LIB(QSessionManager, QtGui, qsessionmanager.h) QT_CLASS_LIB(QShortcut, QtWidgets, qshortcut.h) QT_CLASS_LIB(QSizePolicy, QtWidgets, qsizepolicy.h) @@ -915,8 +905,6 @@ QT_CLASS_LIB(QFontInfo, QtGui, qfontinfo.h) QT_CLASS_LIB(QFontMetrics, QtGui, qfontmetrics.h) QT_CLASS_LIB(QFontMetricsF, QtGui, qfontmetrics.h) QT_CLASS_LIB(QGlyphs, QtGui, qglyphs.h) -QT_CLASS_LIB(QSupportedWritingSystems, QtGui, qplatformfontdatabase_qpa.h) -QT_CLASS_LIB(QPlatformFontDatabase, QtGui, qplatformfontdatabase_qpa.h) QT_CLASS_LIB(QStaticText, QtGui, qstatictext.h) QT_CLASS_LIB(QSyntaxHighlighter, QtGui, qsyntaxhighlighter.h) QT_CLASS_LIB(QTextCursor, QtGui, qtextcursor.h) diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 718d64bd27f..82a7b1a30d7 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -52,10 +52,10 @@ #include "qwhatsthis.h" #include "qmenu.h" #include "qcursor.h" -#include "qplatformtheme_qpa.h" +#include #include "private/qdialog_p.h" #include "private/qguiapplication_p.h" -#include "qplatformtheme_qpa.h" +#include #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h index c40a885f86c..8c53d6a404f 100644 --- a/src/widgets/dialogs/qdialog_p.h +++ b/src/widgets/dialogs/qdialog_p.h @@ -58,7 +58,7 @@ #include "QtCore/qpointer.h" #include "QtWidgets/qdialog.h" #include "QtWidgets/qpushbutton.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h index 75a9045d2b4..e7b0e91340c 100644 --- a/src/widgets/dialogs/qfontdialog_p.h +++ b/src/widgets/dialogs/qfontdialog_p.h @@ -57,7 +57,7 @@ #include "private/qdialog_p.h" #include "qfontdatabase.h" #include "qfontdialog.h" -#include "qplatformdialoghelper_qpa.h" +#include #include "qsharedpointer.h" #ifndef QT_NO_FONTDIALOG diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 92915b1bb1b..784748fe737 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -67,7 +67,7 @@ #ifdef Q_OS_WIN # include -# include +#include #endif QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index 49450be75b5..3e0aedcabc2 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -45,7 +45,7 @@ #include "qwizard_win_p.h" #include #include -#include "qplatformnativeinterface_qpa.h" +#include #include "qwizard.h" #include "qpaintengine.h" #include "qapplication.h" diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index bd9f4510f7a..a9bb7271b35 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -44,7 +44,7 @@ #ifndef QT_NO_ITEMVIEWS #include #include -#include +#include #include #include #include diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp index 119692531fd..5732f65f32f 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.cpp +++ b/src/widgets/itemviews/qstyleditemdelegate.cpp @@ -44,7 +44,7 @@ #ifndef QT_NO_ITEMVIEWS #include #include -#include +#include #include #include #include diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index 97430babd34..9e3d82ea122 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -42,7 +42,7 @@ HEADERS += \ kernel/qsoftkeymanager_common_p.h \ kernel/qdesktopwidget_qpa_p.h \ kernel/qwidgetwindow_qpa_p.h \ - kernel/qplatformmenu_qpa.h + kernel/qplatformmenu.h SOURCES += \ kernel/qaction.cpp \ diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 734c737e84f..369f9b9063a 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include "private/qkeymapper_p.h" @@ -92,7 +92,7 @@ #include "qgesture.h" #include "private/qgesturemanager_p.h" #include "private/qguiapplication_p.h" -#include "qplatformfontdatabase_qpa.h" +#include #ifndef QT_NO_LIBRARY #include "qlibrary.h" #endif diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index b1f510c5a5d..9e92a6d1217 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -61,7 +61,7 @@ #include "QtGui/qregion.h" #include "QtGui/qwindow.h" #include "qwidget.h" -#include "QtGui/qplatformnativeinterface_qpa.h" +#include #include "QtCore/qmutex.h" #include "QtCore/qtranslator.h" #include "QtCore/qbasictimer.h" @@ -72,7 +72,7 @@ #include #include #include "private/qwindowsysteminterface_qpa_p.h" -#include "QtGui/qplatformintegration_qpa.h" +#include #include "private/qguiapplication_p.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp index 0651d5bf447..998f06cd159 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -52,15 +52,15 @@ #include "private/qevent_p.h" #include "qgenericpluginfactory_qpa.h" -#include "private/qplatformintegrationfactory_qpa_p.h" +#include #include -#include -#include +#include +#include #include #include #include "private/qwindowsysteminterface_qpa_p.h" -#include +#include #include "qdesktopwidget_qpa_p.h" #include "qwidgetwindow_qpa_p.h" diff --git a/src/widgets/kernel/qiconloader.cpp b/src/widgets/kernel/qiconloader.cpp index e1828fd1f11..38cee3e51f0 100644 --- a/src/widgets/kernel/qiconloader.cpp +++ b/src/widgets/kernel/qiconloader.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/widgets/kernel/qplatformmenu_qpa.h b/src/widgets/kernel/qplatformmenu.h similarity index 100% rename from src/widgets/kernel/qplatformmenu_qpa.h rename to src/widgets/kernel/qplatformmenu.h diff --git a/src/widgets/kernel/qplatformmenu_qpa.cpp b/src/widgets/kernel/qplatformmenu_qpa.cpp index 95a70d9dcd8..f28560e560b 100644 --- a/src/widgets/kernel/qplatformmenu_qpa.cpp +++ b/src/widgets/kernel/qplatformmenu_qpa.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qplatformmenu_qpa.h" +#include "qplatformmenu.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 5df69be0207..907a29f3fb3 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -55,7 +55,7 @@ #include "qcursor.h" #include "qbitmap.h" #include "qtextdocument.h" -#include "qplatformtheme_qpa.h" +#include #include "private/qtextdocumentlayout_p.h" #include "qtoolbutton.h" #include "qdebug.h" diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 9abba543902..dcd052a94ee 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -67,7 +67,7 @@ # include "qtoolbar.h" # include #endif -#include "qplatformwindow_qpa.h" +#include #include "private/qwidgetwindow_qpa_p.h" #include "qpainter.h" #include "qtooltip.h" diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index a8175455b2a..97cf9216917 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -47,12 +47,12 @@ #include "private/qwidgetwindow_qpa_p.h" #include "private/qapplication_p.h" #include "QtWidgets/qdesktopwidget.h" -#include "QtGui/qplatformwindow_qpa.h" +#include #include "QtGui/qsurfaceformat.h" -#include "QtGui/qplatformopenglcontext_qpa.h" +#include #include "QtGui/private/qwindow_p.h" -#include +#include #include #include diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index b2b1d3fec59..3de94a8f177 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 05bd90abef2..662f0e2a608 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -100,7 +100,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp index 6fce426dd3b..bcb24db6637 100644 --- a/src/widgets/styles/qwindowsvistastyle.cpp +++ b/src/widgets/styles/qwindowsvistastyle.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #if !defined(QT_NO_STYLE_WINDOWSVISTA) || defined(QT_PLUGIN) diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp index 18f138010b8..18a28bc5567 100644 --- a/src/widgets/styles/qwindowsxpstyle.cpp +++ b/src/widgets/styles/qwindowsxpstyle.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/widgets/util/qsystemtrayicon_win.cpp b/src/widgets/util/qsystemtrayicon_win.cpp index fa72e791bad..84becf4a706 100644 --- a/src/widgets/util/qsystemtrayicon_win.cpp +++ b/src/widgets/util/qsystemtrayicon_win.cpp @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index 174c39d1f6a..e58d0d9315a 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index bea40610761..6a8e7b4641a 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -43,7 +43,7 @@ #ifndef QT_NO_COMBOBOX #include -#include +#include #include #include #include diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 2abd4ceef71..5dc26f6ee85 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -49,7 +49,7 @@ #include "qtimer.h" #include "qlayout.h" #include "qpainter.h" -#include "qplatformtheme_qpa.h" +#include #include "qapplication.h" #include "qdesktopwidget.h" #ifndef QT_NO_ACCESSIBILITY @@ -71,7 +71,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index d637a9be8fb..692fd19050b 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -61,7 +61,7 @@ #include "QtCore/qbasictimer.h" #include "private/qwidget_p.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index c9818e056c8..11ae61fb90e 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include "private/qguiapplication_p.h" #ifndef QT_NO_MENUBAR diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 017cbee219a..6347593efe0 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -46,7 +46,7 @@ #include "qabstractitemview.h" #include "qclipboard.h" #include -#include +#include #include #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" diff --git a/sync.profile b/sync.profile index cc681b0ebec..362118aefae 100644 --- a/sync.profile +++ b/sync.profile @@ -68,6 +68,82 @@ "QtConcurrent" => "$basedir/src/modules/qt_concurrent.pri", "QtPlatformSupport" => "$basedir/src/modules/qt_platformsupport.pri", ); +%deprecatedheaders = ( + "QtGui" => { + "qplatformaccessibility_qpa.h" => "qpa/qplatformaccessibility.h", + "QPlatformAccessibility" => "qpa/qplatformaccessibility.h", + "qplatformbackingstore_qpa.h" => "qpa/qplatformbackingstore.h", + "QPlatformBackingStore" => "qpa/qplatformbackingstore.h", + "qplatformclipboard_qpa.h" => "qpa/qplatformclipboard.h", + "QPlatformClipboard" => "qpa/qplatformclipboard.h", + "QPlatformColorDialogHelper" => "qpa/qplatformdialoghelper.h", + "qplatformcursor_qpa.h" => "qpa/qplatformcursor.h", + "QPlatformCursor" => "qpa/qplatformcursor.h", + "QPlatformCursorImage" => "qpa/qplatformcursor.h", + "QPlatformCursorPrivate" => "qpa/qplatformcursor.h", + "qplatformdrag_qpa.h" => "qpa/qplatformdrag.h", + "QPlatformDrag" => "qpa/qplatformdrag.h", + "QPlatformDragQtResponse" => "qpa/qplatformdrag.h", + "QPlatformDropQtResponse" => "qpa/qplatformdrag.h", + "qplatformdialoghelper_qpa.h" => "qpa/qplatformdialoghelper.h", + "QPlatformDialogHelper" => "qpa/qplatformdialoghelper.h", + "QPlatformFileDialogHelper" => "qpa/qplatformdialoghelper.h", + "qplatformfontdatabase_qpa.h" => "qpa/qplatformfontdatabase.h", + "QPlatformFontDatabase" => "qpa/qplatformfontdatabase.h", + "qplatforminputcontext_qpa.h" => "qpa/qplatforminputcontext.h", + "QPlatformInputContext" => "qpa/qplatforminputcontext.h", + "qplatforminputcontext_qpa_p.h" => "qpa/qplatforminputcontext_p.h", + "qplatformintegration_qpa.h" => "qpa/qplatformintegration.h", + "QPlatformIntegration" => "qpa/qplatformintegration.h", + "qplatformintegrationfactory_qpa_p.h" => "qpa/qplatformintegrationfactory_p.h", + "QPlatformIntegrationFactory" => "qpa/qplatformintegrationfactory_p.h", + "qplatformintegrationplugin_qpa.h" => "qpa/qplatformintegrationplugin.h", + "QPlatformIntegrationPlugin" => "qpa/qplatformintegrationplugin.h", + "qplatformnativeinterface_qpa.h" => "qpa/qplatformnativeinterface.h", + "QPlatformNativeInterface" => "qpa/qplatformnativeinterface.h", + "qplatformopenglcontext_qpa.h" => "qpa/qplatformopenglcontext.h", + "QPlatformOpenGLContext" => "qpa/qplatformopenglcontext.h", + "qplatformpixmap_qpa.h" => "qpa/qplatformpixmap.h", + "QPlatformPixmap" => "qpa/qplatformpixmap.h", + "qplatformscreen_qpa.h" => "qpa/qplatformscreen.h", + "QPlatformScreen" => "qpa/qplatformscreen.h", + "qplatformscreen_qpa_p.h" => "qpa/qplatformscreen_p.h", + "QPlatformScreenBuffer" => "qpa/qplatformscreenpageflipper.h", + "qplatformscreenpageflipper_qpa.h" => "qpa/qplatformscreenpageflipper.h", + "QPlatformScreenPageFlipper" => "qpa/qplatformscreenpageflipper.h", + "qplatformservices_qpa.h" => "qpa/qplatformservices.h", + "QPlatformServices" => "qpa/qplatformservices.h", + "qplatformsharedgraphicscache_qpa.h" => "qpa/qplatformsharedgraphicscache.h", + "QPlatformSharedGraphicsCache" => "qpa/qplatformsharedgraphicscache.h", + "qplatformsurface_qpa.h" => "qpa/qplatformsurface.h", + "QPlatformSurface" => "qpa/qplatformsurface.h", + "qplatformtheme_qpa.h" => "qpa/qplatformtheme.h", + "QPlatformTheme" => "qpa/qplatformtheme.h", + "qplatformthemefactory_qpa_p.h" => "qpa/qplatformthemefactory_p.h", + "qplatformthemeplugin_qpa.h" => "qpa/qplatformthemeplugin.h", + "QPlatformThemePlugin" => "qpa/qplatformthemeplugin.h", + "qplatformwindow_qpa.h" => "qpa/qplatformwindow.h", + "QPlatformWindow" => "qpa/qplatformwindow.h" + }, + "QtWidgets" => { + "qplatformmenu_qpa.h" => "qpa/qplatformmenu.h", + "QPlatformMenu" => "qpa/qplatformmenu.h", + "QPlatformMenuAction" => "qpa/qplatformmenu.h", + "QPlatformMenuBar" => "qpa/qplatformmenu.h" + }, + "QtPrintSupport" => { + "qplatformprintersupport_qpa.h" => "qpa/qplatformprintersupport.h", + "QPlatformPrinterSupport" => "qpa/qplatformprintersupport.h", + "QPlatformPrinterSupportPlugin" => "XXXXXXXXXXXXXXXXXXXX", + "qplatformprintplugin_qpa.h" => "qpa/qplatformprintplugin.h", + "QPlatformPrintPlugin" => "qpa/qplatformprintplugin.h" + }, + "QtPlatformSupport" => { + "qplatforminputcontextfactory_qpa_p.h" => "qpa/qplatforminputcontextfactory_p.h", + "qplatforminputcontextplugin_qpa_p.h" => "qpa/qplatforminputcontextplugin_p.h", + "QPlatformInputContextPlugin" => "qpa/qplatforminputcontextplugin_p.h" + } +); %explicitheaders = ( "QtCore" => { "QVariantHash" => "qvariant.h", diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index c7652e445f1..eeac5646894 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -50,8 +50,8 @@ #include #include -#include -#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 cfe26d23e74..5bbd4958da3 100644 --- a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp +++ b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include "../../../shared/platforminputcontext.h" class InputItem : public QObject diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp index 588584545c1..766352f9180 100644 --- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp index 051e26f4af1..5da44dfbfa0 100644 --- a/tests/auto/opengl/qgl/tst_qgl.cpp +++ b/tests/auto/opengl/qgl/tst_qgl.cpp @@ -55,7 +55,7 @@ #include #ifdef QT_BUILD_INTERNAL -#include +#include #include #include #include diff --git a/tests/auto/other/languagechange/tst_languagechange.cpp b/tests/auto/other/languagechange/tst_languagechange.cpp index 663f2ef7983..38f58fdcdac 100644 --- a/tests/auto/other/languagechange/tst_languagechange.cpp +++ b/tests/auto/other/languagechange/tst_languagechange.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/auto/shared/platforminputcontext.h b/tests/auto/shared/platforminputcontext.h index 2049ec7d614..b7f7e2b8269 100644 --- a/tests/auto/shared/platforminputcontext.h +++ b/tests/auto/shared/platforminputcontext.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include class PlatformInputContext : public QPlatformInputContext { diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index 1d391a1c092..6c91bb7a359 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) #include diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index be649db9d80..a6330aac178 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -57,7 +57,7 @@ #if defined(Q_OS_WIN) || defined(Q_OS_WINCE) # include # include -# include +#include #endif // Q_OS_WIN #if defined(Q_OS_WIN) || defined(Q_OS_WINCE) diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp index 51123af9537..71f655b1975 100644 --- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp +++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include class tst_QAction : public QObject diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 6e88c6e74eb..710b81779a5 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -83,8 +83,8 @@ #ifdef Q_OS_WIN # include # include -# include -# include +#include +#include static HWND winHandleOf(const QWidget *w) { diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 90b5a888051..18a8666f26e 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -44,7 +44,7 @@ #include "qcombobox.h" #include #include -#include +#include #include #include diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 22e05a8871e..91827eca6df 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -48,7 +48,7 @@ #include "qvalidator.h" #include "qcompleter.h" #include "qstandarditemmodel.h" -#include "qplatformtheme_qpa.h" +#include #include "qstylehints.h" #include