diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/platforms/mac/qapplication_mac.mm
similarity index 100%
rename from src/gui/kernel/qapplication_mac.mm
rename to src/gui/platforms/mac/qapplication_mac.mm
diff --git a/src/gui/guikernel/qclipboard_mac.cpp b/src/gui/platforms/mac/qclipboard_mac.cpp
similarity index 100%
rename from src/gui/guikernel/qclipboard_mac.cpp
rename to src/gui/platforms/mac/qclipboard_mac.cpp
diff --git a/src/gui/kernel/qcocoaapplication_mac.mm b/src/gui/platforms/mac/qcocoaapplication_mac.mm
similarity index 100%
rename from src/gui/kernel/qcocoaapplication_mac.mm
rename to src/gui/platforms/mac/qcocoaapplication_mac.mm
diff --git a/src/gui/kernel/qcocoaapplication_mac_p.h b/src/gui/platforms/mac/qcocoaapplication_mac_p.h
similarity index 100%
rename from src/gui/kernel/qcocoaapplication_mac_p.h
rename to src/gui/platforms/mac/qcocoaapplication_mac_p.h
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/platforms/mac/qcocoaapplicationdelegate_mac.mm
similarity index 100%
rename from src/gui/kernel/qcocoaapplicationdelegate_mac.mm
rename to src/gui/platforms/mac/qcocoaapplicationdelegate_mac.mm
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac_p.h b/src/gui/platforms/mac/qcocoaapplicationdelegate_mac_p.h
similarity index 100%
rename from src/gui/kernel/qcocoaapplicationdelegate_mac_p.h
rename to src/gui/platforms/mac/qcocoaapplicationdelegate_mac_p.h
diff --git a/src/gui/kernel/qcocoaintrospection_mac.mm b/src/gui/platforms/mac/qcocoaintrospection_mac.mm
similarity index 100%
rename from src/gui/kernel/qcocoaintrospection_mac.mm
rename to src/gui/platforms/mac/qcocoaintrospection_mac.mm
diff --git a/src/gui/kernel/qcocoaintrospection_p.h b/src/gui/platforms/mac/qcocoaintrospection_p.h
similarity index 100%
rename from src/gui/kernel/qcocoaintrospection_p.h
rename to src/gui/platforms/mac/qcocoaintrospection_p.h
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/platforms/mac/qcocoamenuloader_mac.mm
similarity index 100%
rename from src/gui/kernel/qcocoamenuloader_mac.mm
rename to src/gui/platforms/mac/qcocoamenuloader_mac.mm
diff --git a/src/gui/kernel/qcocoamenuloader_mac_p.h b/src/gui/platforms/mac/qcocoamenuloader_mac_p.h
similarity index 100%
rename from src/gui/kernel/qcocoamenuloader_mac_p.h
rename to src/gui/platforms/mac/qcocoamenuloader_mac_p.h
diff --git a/src/gui/kernel/qcocoapanel_mac.mm b/src/gui/platforms/mac/qcocoapanel_mac.mm
similarity index 100%
rename from src/gui/kernel/qcocoapanel_mac.mm
rename to src/gui/platforms/mac/qcocoapanel_mac.mm
diff --git a/src/gui/kernel/qcocoapanel_mac_p.h b/src/gui/platforms/mac/qcocoapanel_mac_p.h
similarity index 100%
rename from src/gui/kernel/qcocoapanel_mac_p.h
rename to src/gui/platforms/mac/qcocoapanel_mac_p.h
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/platforms/mac/qcocoasharedwindowmethods_mac_p.h
similarity index 100%
rename from src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
rename to src/gui/platforms/mac/qcocoasharedwindowmethods_mac_p.h
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/platforms/mac/qcocoaview_mac.mm
similarity index 100%
rename from src/gui/kernel/qcocoaview_mac.mm
rename to src/gui/platforms/mac/qcocoaview_mac.mm
diff --git a/src/gui/kernel/qcocoaview_mac_p.h b/src/gui/platforms/mac/qcocoaview_mac_p.h
similarity index 100%
rename from src/gui/kernel/qcocoaview_mac_p.h
rename to src/gui/platforms/mac/qcocoaview_mac_p.h
diff --git a/src/gui/kernel/qcocoawindow_mac.mm b/src/gui/platforms/mac/qcocoawindow_mac.mm
similarity index 100%
rename from src/gui/kernel/qcocoawindow_mac.mm
rename to src/gui/platforms/mac/qcocoawindow_mac.mm
diff --git a/src/gui/kernel/qcocoawindow_mac_p.h b/src/gui/platforms/mac/qcocoawindow_mac_p.h
similarity index 100%
rename from src/gui/kernel/qcocoawindow_mac_p.h
rename to src/gui/platforms/mac/qcocoawindow_mac_p.h
diff --git a/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm b/src/gui/platforms/mac/qcocoawindowcustomthemeframe_mac.mm
similarity index 100%
rename from src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm
rename to src/gui/platforms/mac/qcocoawindowcustomthemeframe_mac.mm
diff --git a/src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h b/src/gui/platforms/mac/qcocoawindowcustomthemeframe_mac_p.h
similarity index 100%
rename from src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h
rename to src/gui/platforms/mac/qcocoawindowcustomthemeframe_mac_p.h
diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/platforms/mac/qcocoawindowdelegate_mac.mm
similarity index 100%
rename from src/gui/kernel/qcocoawindowdelegate_mac.mm
rename to src/gui/platforms/mac/qcocoawindowdelegate_mac.mm
diff --git a/src/gui/kernel/qcocoawindowdelegate_mac_p.h b/src/gui/platforms/mac/qcocoawindowdelegate_mac_p.h
similarity index 100%
rename from src/gui/kernel/qcocoawindowdelegate_mac_p.h
rename to src/gui/platforms/mac/qcocoawindowdelegate_mac_p.h
diff --git a/src/gui/painting/qcolormap_mac.cpp b/src/gui/platforms/mac/qcolormap_mac.cpp
similarity index 100%
rename from src/gui/painting/qcolormap_mac.cpp
rename to src/gui/platforms/mac/qcolormap_mac.cpp
diff --git a/src/gui/guikernel/qcursor_mac.mm b/src/gui/platforms/mac/qcursor_mac.mm
similarity index 100%
rename from src/gui/guikernel/qcursor_mac.mm
rename to src/gui/platforms/mac/qcursor_mac.mm
diff --git a/src/gui/kernel/qdesktopwidget_mac.mm b/src/gui/platforms/mac/qdesktopwidget_mac.mm
similarity index 100%
rename from src/gui/kernel/qdesktopwidget_mac.mm
rename to src/gui/platforms/mac/qdesktopwidget_mac.mm
diff --git a/src/gui/kernel/qdesktopwidget_mac_p.h b/src/gui/platforms/mac/qdesktopwidget_mac_p.h
similarity index 100%
rename from src/gui/kernel/qdesktopwidget_mac_p.h
rename to src/gui/platforms/mac/qdesktopwidget_mac_p.h
diff --git a/src/gui/guikernel/qdnd_mac.mm b/src/gui/platforms/mac/qdnd_mac.mm
similarity index 100%
rename from src/gui/guikernel/qdnd_mac.mm
rename to src/gui/platforms/mac/qdnd_mac.mm
diff --git a/src/gui/guikernel/qeventdispatcher_mac.mm b/src/gui/platforms/mac/qeventdispatcher_mac.mm
similarity index 100%
rename from src/gui/guikernel/qeventdispatcher_mac.mm
rename to src/gui/platforms/mac/qeventdispatcher_mac.mm
diff --git a/src/gui/guikernel/qeventdispatcher_mac_p.h b/src/gui/platforms/mac/qeventdispatcher_mac_p.h
similarity index 100%
rename from src/gui/guikernel/qeventdispatcher_mac_p.h
rename to src/gui/platforms/mac/qeventdispatcher_mac_p.h
diff --git a/src/gui/text/qfont_mac.cpp b/src/gui/platforms/mac/qfont_mac.cpp
similarity index 100%
rename from src/gui/text/qfont_mac.cpp
rename to src/gui/platforms/mac/qfont_mac.cpp
diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/platforms/mac/qfontdatabase_mac.cpp
similarity index 100%
rename from src/gui/text/qfontdatabase_mac.cpp
rename to src/gui/platforms/mac/qfontdatabase_mac.cpp
diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/platforms/mac/qfontengine_coretext.mm
similarity index 100%
rename from src/gui/text/qfontengine_coretext.mm
rename to src/gui/platforms/mac/qfontengine_coretext.mm
diff --git a/src/gui/text/qfontengine_coretext_p.h b/src/gui/platforms/mac/qfontengine_coretext_p.h
similarity index 100%
rename from src/gui/text/qfontengine_coretext_p.h
rename to src/gui/platforms/mac/qfontengine_coretext_p.h
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/platforms/mac/qfontengine_mac.mm
similarity index 100%
rename from src/gui/text/qfontengine_mac.mm
rename to src/gui/platforms/mac/qfontengine_mac.mm
diff --git a/src/gui/text/qfontengine_mac_p.h b/src/gui/platforms/mac/qfontengine_mac_p.h
similarity index 100%
rename from src/gui/text/qfontengine_mac_p.h
rename to src/gui/platforms/mac/qfontengine_mac_p.h
diff --git a/src/gui/guikernel/qkeymapper_mac.cpp b/src/gui/platforms/mac/qkeymapper_mac.cpp
similarity index 100%
rename from src/gui/guikernel/qkeymapper_mac.cpp
rename to src/gui/platforms/mac/qkeymapper_mac.cpp
diff --git a/src/gui/kernel/qmacdefines_mac.h b/src/gui/platforms/mac/qmacdefines_mac.h
similarity index 100%
rename from src/gui/kernel/qmacdefines_mac.h
rename to src/gui/platforms/mac/qmacdefines_mac.h
diff --git a/src/gui/kernel/qmacgesturerecognizer_mac.mm b/src/gui/platforms/mac/qmacgesturerecognizer_mac.mm
similarity index 100%
rename from src/gui/kernel/qmacgesturerecognizer_mac.mm
rename to src/gui/platforms/mac/qmacgesturerecognizer_mac.mm
diff --git a/src/gui/kernel/qmacgesturerecognizer_mac_p.h b/src/gui/platforms/mac/qmacgesturerecognizer_mac_p.h
similarity index 100%
rename from src/gui/kernel/qmacgesturerecognizer_mac_p.h
rename to src/gui/platforms/mac/qmacgesturerecognizer_mac_p.h
diff --git a/src/gui/guikernel/qmime_mac.cpp b/src/gui/platforms/mac/qmime_mac.cpp
similarity index 100%
rename from src/gui/guikernel/qmime_mac.cpp
rename to src/gui/platforms/mac/qmime_mac.cpp
diff --git a/src/gui/kernel/qmultitouch_mac.mm b/src/gui/platforms/mac/qmultitouch_mac.mm
similarity index 100%
rename from src/gui/kernel/qmultitouch_mac.mm
rename to src/gui/platforms/mac/qmultitouch_mac.mm
diff --git a/src/gui/kernel/qmultitouch_mac_p.h b/src/gui/platforms/mac/qmultitouch_mac_p.h
similarity index 100%
rename from src/gui/kernel/qmultitouch_mac_p.h
rename to src/gui/platforms/mac/qmultitouch_mac_p.h
diff --git a/src/gui/kernel/qnsframeview_mac_p.h b/src/gui/platforms/mac/qnsframeview_mac_p.h
similarity index 100%
rename from src/gui/kernel/qnsframeview_mac_p.h
rename to src/gui/platforms/mac/qnsframeview_mac_p.h
diff --git a/src/gui/kernel/qnsthemeframe_mac_p.h b/src/gui/platforms/mac/qnsthemeframe_mac_p.h
similarity index 100%
rename from src/gui/kernel/qnsthemeframe_mac_p.h
rename to src/gui/platforms/mac/qnsthemeframe_mac_p.h
diff --git a/src/gui/kernel/qnstitledframe_mac_p.h b/src/gui/platforms/mac/qnstitledframe_mac_p.h
similarity index 100%
rename from src/gui/kernel/qnstitledframe_mac_p.h
rename to src/gui/platforms/mac/qnstitledframe_mac_p.h
diff --git a/src/gui/painting/qpaintdevice_mac.cpp b/src/gui/platforms/mac/qpaintdevice_mac.cpp
similarity index 100%
rename from src/gui/painting/qpaintdevice_mac.cpp
rename to src/gui/platforms/mac/qpaintdevice_mac.cpp
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/platforms/mac/qpaintengine_mac.cpp
similarity index 100%
rename from src/gui/painting/qpaintengine_mac.cpp
rename to src/gui/platforms/mac/qpaintengine_mac.cpp
diff --git a/src/gui/painting/qpaintengine_mac_p.h b/src/gui/platforms/mac/qpaintengine_mac_p.h
similarity index 100%
rename from src/gui/painting/qpaintengine_mac_p.h
rename to src/gui/platforms/mac/qpaintengine_mac_p.h
diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/platforms/mac/qpixmap_mac.cpp
similarity index 100%
rename from src/gui/image/qpixmap_mac.cpp
rename to src/gui/platforms/mac/qpixmap_mac.cpp
diff --git a/src/gui/image/qpixmap_mac_p.h b/src/gui/platforms/mac/qpixmap_mac_p.h
similarity index 100%
rename from src/gui/image/qpixmap_mac_p.h
rename to src/gui/platforms/mac/qpixmap_mac_p.h
diff --git a/src/gui/painting/qprintengine_mac.mm b/src/gui/platforms/mac/qprintengine_mac.mm
similarity index 100%
rename from src/gui/painting/qprintengine_mac.mm
rename to src/gui/platforms/mac/qprintengine_mac.mm
diff --git a/src/gui/painting/qprintengine_mac_p.h b/src/gui/platforms/mac/qprintengine_mac_p.h
similarity index 100%
rename from src/gui/painting/qprintengine_mac_p.h
rename to src/gui/platforms/mac/qprintengine_mac_p.h
diff --git a/src/gui/painting/qprinterinfo_mac.cpp b/src/gui/platforms/mac/qprinterinfo_mac.cpp
similarity index 100%
rename from src/gui/painting/qprinterinfo_mac.cpp
rename to src/gui/platforms/mac/qprinterinfo_mac.cpp
diff --git a/src/gui/text/qrawfont_mac.cpp b/src/gui/platforms/mac/qrawfont_mac.cpp
similarity index 100%
rename from src/gui/text/qrawfont_mac.cpp
rename to src/gui/platforms/mac/qrawfont_mac.cpp
diff --git a/src/gui/painting/qregion_mac.cpp b/src/gui/platforms/mac/qregion_mac.cpp
similarity index 100%
rename from src/gui/painting/qregion_mac.cpp
rename to src/gui/platforms/mac/qregion_mac.cpp
diff --git a/src/gui/kernel/qsound_mac.mm b/src/gui/platforms/mac/qsound_mac.mm
similarity index 100%
rename from src/gui/kernel/qsound_mac.mm
rename to src/gui/platforms/mac/qsound_mac.mm
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/platforms/mac/qt_cocoa_helpers_mac.mm
similarity index 100%
rename from src/gui/kernel/qt_cocoa_helpers_mac.mm
rename to src/gui/platforms/mac/qt_cocoa_helpers_mac.mm
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/platforms/mac/qt_cocoa_helpers_mac_p.h
similarity index 100%
rename from src/gui/kernel/qt_cocoa_helpers_mac_p.h
rename to src/gui/platforms/mac/qt_cocoa_helpers_mac_p.h
diff --git a/src/gui/kernel/qt_mac.cpp b/src/gui/platforms/mac/qt_mac.cpp
similarity index 100%
rename from src/gui/kernel/qt_mac.cpp
rename to src/gui/platforms/mac/qt_mac.cpp
diff --git a/src/gui/kernel/qt_mac_p.h b/src/gui/platforms/mac/qt_mac_p.h
similarity index 100%
rename from src/gui/kernel/qt_mac_p.h
rename to src/gui/platforms/mac/qt_mac_p.h
diff --git a/src/gui/text/qtextengine_mac.cpp b/src/gui/platforms/mac/qtextengine_mac.cpp
similarity index 100%
rename from src/gui/text/qtextengine_mac.cpp
rename to src/gui/platforms/mac/qtextengine_mac.cpp
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/platforms/mac/qwidget_mac.mm
similarity index 100%
rename from src/gui/kernel/qwidget_mac.mm
rename to src/gui/platforms/mac/qwidget_mac.mm
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/platforms/s60/qapplication_s60.cpp
similarity index 100%
rename from src/gui/kernel/qapplication_s60.cpp
rename to src/gui/platforms/s60/qapplication_s60.cpp
diff --git a/src/gui/guikernel/qclipboard_s60.cpp b/src/gui/platforms/s60/qclipboard_s60.cpp
similarity index 100%
rename from src/gui/guikernel/qclipboard_s60.cpp
rename to src/gui/platforms/s60/qclipboard_s60.cpp
diff --git a/src/gui/painting/qcolormap_s60.cpp b/src/gui/platforms/s60/qcolormap_s60.cpp
similarity index 100%
rename from src/gui/painting/qcolormap_s60.cpp
rename to src/gui/platforms/s60/qcolormap_s60.cpp
diff --git a/src/gui/guikernel/qcursor_s60.cpp b/src/gui/platforms/s60/qcursor_s60.cpp
similarity index 100%
rename from src/gui/guikernel/qcursor_s60.cpp
rename to src/gui/platforms/s60/qcursor_s60.cpp
diff --git a/src/gui/kernel/qdesktopwidget_s60.cpp b/src/gui/platforms/s60/qdesktopwidget_s60.cpp
similarity index 100%
rename from src/gui/kernel/qdesktopwidget_s60.cpp
rename to src/gui/platforms/s60/qdesktopwidget_s60.cpp
diff --git a/src/gui/guikernel/qdnd_s60.cpp b/src/gui/platforms/s60/qdnd_s60.cpp
similarity index 100%
rename from src/gui/guikernel/qdnd_s60.cpp
rename to src/gui/platforms/s60/qdnd_s60.cpp
diff --git a/src/gui/guikernel/qeventdispatcher_s60.cpp b/src/gui/platforms/s60/qeventdispatcher_s60.cpp
similarity index 100%
rename from src/gui/guikernel/qeventdispatcher_s60.cpp
rename to src/gui/platforms/s60/qeventdispatcher_s60.cpp
diff --git a/src/gui/guikernel/qeventdispatcher_s60_p.h b/src/gui/platforms/s60/qeventdispatcher_s60_p.h
similarity index 100%
rename from src/gui/guikernel/qeventdispatcher_s60_p.h
rename to src/gui/platforms/s60/qeventdispatcher_s60_p.h
diff --git a/src/gui/text/qfont_s60.cpp b/src/gui/platforms/s60/qfont_s60.cpp
similarity index 100%
rename from src/gui/text/qfont_s60.cpp
rename to src/gui/platforms/s60/qfont_s60.cpp
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/platforms/s60/qfontdatabase_s60.cpp
similarity index 100%
rename from src/gui/text/qfontdatabase_s60.cpp
rename to src/gui/platforms/s60/qfontdatabase_s60.cpp
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/platforms/s60/qfontengine_s60.cpp
similarity index 100%
rename from src/gui/text/qfontengine_s60.cpp
rename to src/gui/platforms/s60/qfontengine_s60.cpp
diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/platforms/s60/qfontengine_s60_p.h
similarity index 100%
rename from src/gui/text/qfontengine_s60_p.h
rename to src/gui/platforms/s60/qfontengine_s60_p.h
diff --git a/src/gui/guikernel/qkeymapper_s60.cpp b/src/gui/platforms/s60/qkeymapper_s60.cpp
similarity index 100%
rename from src/gui/guikernel/qkeymapper_s60.cpp
rename to src/gui/platforms/s60/qkeymapper_s60.cpp
diff --git a/src/gui/painting/qpaintengine_s60.cpp b/src/gui/platforms/s60/qpaintengine_s60.cpp
similarity index 100%
rename from src/gui/painting/qpaintengine_s60.cpp
rename to src/gui/platforms/s60/qpaintengine_s60.cpp
diff --git a/src/gui/painting/qpaintengine_s60_p.h b/src/gui/platforms/s60/qpaintengine_s60_p.h
similarity index 100%
rename from src/gui/painting/qpaintengine_s60_p.h
rename to src/gui/platforms/s60/qpaintengine_s60_p.h
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/platforms/s60/qpixmap_s60.cpp
similarity index 100%
rename from src/gui/image/qpixmap_s60.cpp
rename to src/gui/platforms/s60/qpixmap_s60.cpp
diff --git a/src/gui/image/qpixmap_s60_p.h b/src/gui/platforms/s60/qpixmap_s60_p.h
similarity index 100%
rename from src/gui/image/qpixmap_s60_p.h
rename to src/gui/platforms/s60/qpixmap_s60_p.h
diff --git a/src/gui/painting/qregion_s60.cpp b/src/gui/platforms/s60/qregion_s60.cpp
similarity index 100%
rename from src/gui/painting/qregion_s60.cpp
rename to src/gui/platforms/s60/qregion_s60.cpp
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/platforms/s60/qsoftkeymanager_s60.cpp
similarity index 100%
rename from src/gui/kernel/qsoftkeymanager_s60.cpp
rename to src/gui/platforms/s60/qsoftkeymanager_s60.cpp
diff --git a/src/gui/kernel/qsoftkeymanager_s60_p.h b/src/gui/platforms/s60/qsoftkeymanager_s60_p.h
similarity index 100%
rename from src/gui/kernel/qsoftkeymanager_s60_p.h
rename to src/gui/platforms/s60/qsoftkeymanager_s60_p.h
diff --git a/src/gui/kernel/qsound_s60.cpp b/src/gui/platforms/s60/qsound_s60.cpp
similarity index 100%
rename from src/gui/kernel/qsound_s60.cpp
rename to src/gui/platforms/s60/qsound_s60.cpp
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/platforms/s60/qt_s60_p.h
similarity index 100%
rename from src/gui/kernel/qt_s60_p.h
rename to src/gui/platforms/s60/qt_s60_p.h
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/platforms/s60/qwidget_s60.cpp
similarity index 100%
rename from src/gui/kernel/qwidget_s60.cpp
rename to src/gui/platforms/s60/qwidget_s60.cpp
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/platforms/win/qapplication_win.cpp
similarity index 100%
rename from src/gui/kernel/qapplication_win.cpp
rename to src/gui/platforms/win/qapplication_win.cpp
diff --git a/src/gui/guikernel/qclipboard_win.cpp b/src/gui/platforms/win/qclipboard_win.cpp
similarity index 100%
rename from src/gui/guikernel/qclipboard_win.cpp
rename to src/gui/platforms/win/qclipboard_win.cpp
diff --git a/src/gui/painting/qcolormap_win.cpp b/src/gui/platforms/win/qcolormap_win.cpp
similarity index 100%
rename from src/gui/painting/qcolormap_win.cpp
rename to src/gui/platforms/win/qcolormap_win.cpp
diff --git a/src/gui/guikernel/qcursor_win.cpp b/src/gui/platforms/win/qcursor_win.cpp
similarity index 100%
rename from src/gui/guikernel/qcursor_win.cpp
rename to src/gui/platforms/win/qcursor_win.cpp
diff --git a/src/gui/kernel/qdesktopwidget_win.cpp b/src/gui/platforms/win/qdesktopwidget_win.cpp
similarity index 100%
rename from src/gui/kernel/qdesktopwidget_win.cpp
rename to src/gui/platforms/win/qdesktopwidget_win.cpp
diff --git a/src/gui/guikernel/qdnd_win.cpp b/src/gui/platforms/win/qdnd_win.cpp
similarity index 100%
rename from src/gui/guikernel/qdnd_win.cpp
rename to src/gui/platforms/win/qdnd_win.cpp
diff --git a/src/gui/text/qfont_win.cpp b/src/gui/platforms/win/qfont_win.cpp
similarity index 100%
rename from src/gui/text/qfont_win.cpp
rename to src/gui/platforms/win/qfont_win.cpp
diff --git a/src/gui/text/qfontdatabase_win.cpp b/src/gui/platforms/win/qfontdatabase_win.cpp
similarity index 100%
rename from src/gui/text/qfontdatabase_win.cpp
rename to src/gui/platforms/win/qfontdatabase_win.cpp
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/platforms/win/qfontengine_win.cpp
similarity index 100%
rename from src/gui/text/qfontengine_win.cpp
rename to src/gui/platforms/win/qfontengine_win.cpp
diff --git a/src/gui/text/qfontengine_win_p.h b/src/gui/platforms/win/qfontengine_win_p.h
similarity index 100%
rename from src/gui/text/qfontengine_win_p.h
rename to src/gui/platforms/win/qfontengine_win_p.h
diff --git a/src/gui/kernel/qguifunctions_wince.cpp b/src/gui/platforms/win/qguifunctions_wince.cpp
similarity index 100%
rename from src/gui/kernel/qguifunctions_wince.cpp
rename to src/gui/platforms/win/qguifunctions_wince.cpp
diff --git a/src/gui/kernel/qguifunctions_wince.h b/src/gui/platforms/win/qguifunctions_wince.h
similarity index 100%
rename from src/gui/kernel/qguifunctions_wince.h
rename to src/gui/platforms/win/qguifunctions_wince.h
diff --git a/src/gui/guikernel/qkeymapper_win.cpp b/src/gui/platforms/win/qkeymapper_win.cpp
similarity index 100%
rename from src/gui/guikernel/qkeymapper_win.cpp
rename to src/gui/platforms/win/qkeymapper_win.cpp
diff --git a/src/gui/guikernel/qmime_win.cpp b/src/gui/platforms/win/qmime_win.cpp
similarity index 100%
rename from src/gui/guikernel/qmime_win.cpp
rename to src/gui/platforms/win/qmime_win.cpp
diff --git a/src/gui/guikernel/qole_win.cpp b/src/gui/platforms/win/qole_win.cpp
similarity index 100%
rename from src/gui/guikernel/qole_win.cpp
rename to src/gui/platforms/win/qole_win.cpp
diff --git a/src/gui/painting/qpaintdevice_win.cpp b/src/gui/platforms/win/qpaintdevice_win.cpp
similarity index 100%
rename from src/gui/painting/qpaintdevice_win.cpp
rename to src/gui/platforms/win/qpaintdevice_win.cpp
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/platforms/win/qpixmap_win.cpp
similarity index 100%
rename from src/gui/image/qpixmap_win.cpp
rename to src/gui/platforms/win/qpixmap_win.cpp
diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/platforms/win/qprintengine_win.cpp
similarity index 100%
rename from src/gui/painting/qprintengine_win.cpp
rename to src/gui/platforms/win/qprintengine_win.cpp
diff --git a/src/gui/painting/qprintengine_win_p.h b/src/gui/platforms/win/qprintengine_win_p.h
similarity index 100%
rename from src/gui/painting/qprintengine_win_p.h
rename to src/gui/platforms/win/qprintengine_win_p.h
diff --git a/src/gui/painting/qprinterinfo_win.cpp b/src/gui/platforms/win/qprinterinfo_win.cpp
similarity index 100%
rename from src/gui/painting/qprinterinfo_win.cpp
rename to src/gui/platforms/win/qprinterinfo_win.cpp
diff --git a/src/gui/text/qrawfont_win.cpp b/src/gui/platforms/win/qrawfont_win.cpp
similarity index 100%
rename from src/gui/text/qrawfont_win.cpp
rename to src/gui/platforms/win/qrawfont_win.cpp
diff --git a/src/gui/painting/qregion_win.cpp b/src/gui/platforms/win/qregion_win.cpp
similarity index 100%
rename from src/gui/painting/qregion_win.cpp
rename to src/gui/platforms/win/qregion_win.cpp
diff --git a/src/gui/kernel/qsound_win.cpp b/src/gui/platforms/win/qsound_win.cpp
similarity index 100%
rename from src/gui/kernel/qsound_win.cpp
rename to src/gui/platforms/win/qsound_win.cpp
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/platforms/win/qwidget_win.cpp
similarity index 100%
rename from src/gui/kernel/qwidget_win.cpp
rename to src/gui/platforms/win/qwidget_win.cpp
diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/platforms/win/qwidget_wince.cpp
similarity index 100%
rename from src/gui/kernel/qwidget_wince.cpp
rename to src/gui/platforms/win/qwidget_wince.cpp
diff --git a/src/gui/guikernel/qwindowdefs_win.h b/src/gui/platforms/win/qwindowdefs_win.h
similarity index 100%
rename from src/gui/guikernel/qwindowdefs_win.h
rename to src/gui/platforms/win/qwindowdefs_win.h
diff --git a/src/gui/kernel/qwinnativepangesturerecognizer_win.cpp b/src/gui/platforms/win/qwinnativepangesturerecognizer_win.cpp
similarity index 100%
rename from src/gui/kernel/qwinnativepangesturerecognizer_win.cpp
rename to src/gui/platforms/win/qwinnativepangesturerecognizer_win.cpp
diff --git a/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h b/src/gui/platforms/win/qwinnativepangesturerecognizer_win_p.h
similarity index 100%
rename from src/gui/kernel/qwinnativepangesturerecognizer_win_p.h
rename to src/gui/platforms/win/qwinnativepangesturerecognizer_win_p.h
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/platforms/x11/qapplication_x11.cpp
similarity index 100%
rename from src/gui/kernel/qapplication_x11.cpp
rename to src/gui/platforms/x11/qapplication_x11.cpp
diff --git a/src/gui/guikernel/qclipboard_x11.cpp b/src/gui/platforms/x11/qclipboard_x11.cpp
similarity index 100%
rename from src/gui/guikernel/qclipboard_x11.cpp
rename to src/gui/platforms/x11/qclipboard_x11.cpp
diff --git a/src/gui/painting/qcolormap_x11.cpp b/src/gui/platforms/x11/qcolormap_x11.cpp
similarity index 100%
rename from src/gui/painting/qcolormap_x11.cpp
rename to src/gui/platforms/x11/qcolormap_x11.cpp
diff --git a/src/gui/guikernel/qcursor_x11.cpp b/src/gui/platforms/x11/qcursor_x11.cpp
similarity index 100%
rename from src/gui/guikernel/qcursor_x11.cpp
rename to src/gui/platforms/x11/qcursor_x11.cpp
diff --git a/src/gui/kernel/qdesktopwidget_x11.cpp b/src/gui/platforms/x11/qdesktopwidget_x11.cpp
similarity index 100%
rename from src/gui/kernel/qdesktopwidget_x11.cpp
rename to src/gui/platforms/x11/qdesktopwidget_x11.cpp
diff --git a/src/gui/guikernel/qdnd_x11.cpp b/src/gui/platforms/x11/qdnd_x11.cpp
similarity index 100%
rename from src/gui/guikernel/qdnd_x11.cpp
rename to src/gui/platforms/x11/qdnd_x11.cpp
diff --git a/src/gui/guikernel/qeventdispatcher_x11.cpp b/src/gui/platforms/x11/qeventdispatcher_x11.cpp
similarity index 100%
rename from src/gui/guikernel/qeventdispatcher_x11.cpp
rename to src/gui/platforms/x11/qeventdispatcher_x11.cpp
diff --git a/src/gui/guikernel/qeventdispatcher_x11_p.h b/src/gui/platforms/x11/qeventdispatcher_x11_p.h
similarity index 100%
rename from src/gui/guikernel/qeventdispatcher_x11_p.h
rename to src/gui/platforms/x11/qeventdispatcher_x11_p.h
diff --git a/src/gui/text/qfont_x11.cpp b/src/gui/platforms/x11/qfont_x11.cpp
similarity index 100%
rename from src/gui/text/qfont_x11.cpp
rename to src/gui/platforms/x11/qfont_x11.cpp
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/platforms/x11/qfontdatabase_x11.cpp
similarity index 100%
rename from src/gui/text/qfontdatabase_x11.cpp
rename to src/gui/platforms/x11/qfontdatabase_x11.cpp
diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/platforms/x11/qfontengine_x11.cpp
similarity index 100%
rename from src/gui/text/qfontengine_x11.cpp
rename to src/gui/platforms/x11/qfontengine_x11.cpp
diff --git a/src/gui/text/qfontengine_x11_p.h b/src/gui/platforms/x11/qfontengine_x11_p.h
similarity index 100%
rename from src/gui/text/qfontengine_x11_p.h
rename to src/gui/platforms/x11/qfontengine_x11_p.h
diff --git a/src/gui/kernel/qkde.cpp b/src/gui/platforms/x11/qkde.cpp
similarity index 100%
rename from src/gui/kernel/qkde.cpp
rename to src/gui/platforms/x11/qkde.cpp
diff --git a/src/gui/kernel/qkde_p.h b/src/gui/platforms/x11/qkde_p.h
similarity index 100%
rename from src/gui/kernel/qkde_p.h
rename to src/gui/platforms/x11/qkde_p.h
diff --git a/src/gui/guikernel/qkeymapper_x11.cpp b/src/gui/platforms/x11/qkeymapper_x11.cpp
similarity index 100%
rename from src/gui/guikernel/qkeymapper_x11.cpp
rename to src/gui/platforms/x11/qkeymapper_x11.cpp
diff --git a/src/gui/guikernel/qkeymapper_x11_p.cpp b/src/gui/platforms/x11/qkeymapper_x11_p.cpp
similarity index 100%
rename from src/gui/guikernel/qkeymapper_x11_p.cpp
rename to src/gui/platforms/x11/qkeymapper_x11_p.cpp
diff --git a/src/gui/guikernel/qmotifdnd_x11.cpp b/src/gui/platforms/x11/qmotifdnd_x11.cpp
similarity index 100%
rename from src/gui/guikernel/qmotifdnd_x11.cpp
rename to src/gui/platforms/x11/qmotifdnd_x11.cpp
diff --git a/src/gui/painting/qpaintdevice_x11.cpp b/src/gui/platforms/x11/qpaintdevice_x11.cpp
similarity index 100%
rename from src/gui/painting/qpaintdevice_x11.cpp
rename to src/gui/platforms/x11/qpaintdevice_x11.cpp
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/platforms/x11/qpaintengine_x11.cpp
similarity index 100%
rename from src/gui/painting/qpaintengine_x11.cpp
rename to src/gui/platforms/x11/qpaintengine_x11.cpp
diff --git a/src/gui/painting/qpaintengine_x11_p.h b/src/gui/platforms/x11/qpaintengine_x11_p.h
similarity index 100%
rename from src/gui/painting/qpaintengine_x11_p.h
rename to src/gui/platforms/x11/qpaintengine_x11_p.h
diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/platforms/x11/qpixmap_x11.cpp
similarity index 100%
rename from src/gui/image/qpixmap_x11.cpp
rename to src/gui/platforms/x11/qpixmap_x11.cpp
diff --git a/src/gui/image/qpixmap_x11_p.h b/src/gui/platforms/x11/qpixmap_x11_p.h
similarity index 100%
rename from src/gui/image/qpixmap_x11_p.h
rename to src/gui/platforms/x11/qpixmap_x11_p.h
diff --git a/src/gui/painting/qregion_x11.cpp b/src/gui/platforms/x11/qregion_x11.cpp
similarity index 100%
rename from src/gui/painting/qregion_x11.cpp
rename to src/gui/platforms/x11/qregion_x11.cpp
diff --git a/src/gui/kernel/qsound_x11.cpp b/src/gui/platforms/x11/qsound_x11.cpp
similarity index 100%
rename from src/gui/kernel/qsound_x11.cpp
rename to src/gui/platforms/x11/qsound_x11.cpp
diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/platforms/x11/qt_x11_p.h
similarity index 100%
rename from src/gui/kernel/qt_x11_p.h
rename to src/gui/platforms/x11/qt_x11_p.h
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/platforms/x11/qwidget_x11.cpp
similarity index 100%
rename from src/gui/kernel/qwidget_x11.cpp
rename to src/gui/platforms/x11/qwidget_x11.cpp
diff --git a/src/gui/kernel/qwidgetcreate_x11.cpp b/src/gui/platforms/x11/qwidgetcreate_x11.cpp
similarity index 100%
rename from src/gui/kernel/qwidgetcreate_x11.cpp
rename to src/gui/platforms/x11/qwidgetcreate_x11.cpp
diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/platforms/x11/qx11embed_x11.cpp
similarity index 100%
rename from src/gui/kernel/qx11embed_x11.cpp
rename to src/gui/platforms/x11/qx11embed_x11.cpp
diff --git a/src/gui/kernel/qx11embed_x11.h b/src/gui/platforms/x11/qx11embed_x11.h
similarity index 100%
rename from src/gui/kernel/qx11embed_x11.h
rename to src/gui/platforms/x11/qx11embed_x11.h
diff --git a/src/gui/kernel/qx11info_x11.cpp b/src/gui/platforms/x11/qx11info_x11.cpp
similarity index 100%
rename from src/gui/kernel/qx11info_x11.cpp
rename to src/gui/platforms/x11/qx11info_x11.cpp
diff --git a/src/gui/kernel/qx11info_x11.h b/src/gui/platforms/x11/qx11info_x11.h
similarity index 100%
rename from src/gui/kernel/qx11info_x11.h
rename to src/gui/platforms/x11/qx11info_x11.h