summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-05-04 14:37:50 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-05-04 14:39:19 +0200
commitbd8d12b7f68ea8aa05a86cc9ed65dd660a6b075d (patch)
treea2da73cfac60aa2b86fee223b5c28d813dcc69cd
parentdc0f9f02a5c390f4a7919db4c32d22cebaf71d1c (diff)
downloadqtbase-bd8d12b7f68ea8aa05a86cc9ed65dd660a6b075d.tar.gz
move platform specific files out of the way
Keep the files as reference to implement the lighthouse plugins, but move them away from the main directory hierachy as they won't be part of Qt5 in any case.
-rw-r--r--src/gui/platforms/mac/qapplication_mac.mm (renamed from src/gui/kernel/qapplication_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qclipboard_mac.cpp (renamed from src/gui/guikernel/qclipboard_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qcocoaapplication_mac.mm (renamed from src/gui/kernel/qcocoaapplication_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qcocoaapplication_mac_p.h (renamed from src/gui/kernel/qcocoaapplication_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qcocoaapplicationdelegate_mac.mm (renamed from src/gui/kernel/qcocoaapplicationdelegate_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qcocoaapplicationdelegate_mac_p.h (renamed from src/gui/kernel/qcocoaapplicationdelegate_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qcocoaintrospection_mac.mm (renamed from src/gui/kernel/qcocoaintrospection_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qcocoaintrospection_p.h (renamed from src/gui/kernel/qcocoaintrospection_p.h)0
-rw-r--r--src/gui/platforms/mac/qcocoamenuloader_mac.mm (renamed from src/gui/kernel/qcocoamenuloader_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qcocoamenuloader_mac_p.h (renamed from src/gui/kernel/qcocoamenuloader_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qcocoapanel_mac.mm (renamed from src/gui/kernel/qcocoapanel_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qcocoapanel_mac_p.h (renamed from src/gui/kernel/qcocoapanel_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qcocoasharedwindowmethods_mac_p.h (renamed from src/gui/kernel/qcocoasharedwindowmethods_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qcocoaview_mac.mm (renamed from src/gui/kernel/qcocoaview_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qcocoaview_mac_p.h (renamed from src/gui/kernel/qcocoaview_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qcocoawindow_mac.mm (renamed from src/gui/kernel/qcocoawindow_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qcocoawindow_mac_p.h (renamed from src/gui/kernel/qcocoawindow_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qcocoawindowcustomthemeframe_mac.mm (renamed from src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qcocoawindowcustomthemeframe_mac_p.h (renamed from src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qcocoawindowdelegate_mac.mm (renamed from src/gui/kernel/qcocoawindowdelegate_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qcocoawindowdelegate_mac_p.h (renamed from src/gui/kernel/qcocoawindowdelegate_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qcolormap_mac.cpp (renamed from src/gui/painting/qcolormap_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qcursor_mac.mm (renamed from src/gui/guikernel/qcursor_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qdesktopwidget_mac.mm (renamed from src/gui/kernel/qdesktopwidget_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qdesktopwidget_mac_p.h (renamed from src/gui/kernel/qdesktopwidget_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qdnd_mac.mm (renamed from src/gui/guikernel/qdnd_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qeventdispatcher_mac.mm (renamed from src/gui/guikernel/qeventdispatcher_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qeventdispatcher_mac_p.h (renamed from src/gui/guikernel/qeventdispatcher_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qfont_mac.cpp (renamed from src/gui/text/qfont_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qfontdatabase_mac.cpp (renamed from src/gui/text/qfontdatabase_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qfontengine_coretext.mm (renamed from src/gui/text/qfontengine_coretext.mm)0
-rw-r--r--src/gui/platforms/mac/qfontengine_coretext_p.h (renamed from src/gui/text/qfontengine_coretext_p.h)0
-rw-r--r--src/gui/platforms/mac/qfontengine_mac.mm (renamed from src/gui/text/qfontengine_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qfontengine_mac_p.h (renamed from src/gui/text/qfontengine_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qkeymapper_mac.cpp (renamed from src/gui/guikernel/qkeymapper_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qmacdefines_mac.h (renamed from src/gui/kernel/qmacdefines_mac.h)0
-rw-r--r--src/gui/platforms/mac/qmacgesturerecognizer_mac.mm (renamed from src/gui/kernel/qmacgesturerecognizer_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qmacgesturerecognizer_mac_p.h (renamed from src/gui/kernel/qmacgesturerecognizer_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qmime_mac.cpp (renamed from src/gui/guikernel/qmime_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qmultitouch_mac.mm (renamed from src/gui/kernel/qmultitouch_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qmultitouch_mac_p.h (renamed from src/gui/kernel/qmultitouch_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qnsframeview_mac_p.h (renamed from src/gui/kernel/qnsframeview_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qnsthemeframe_mac_p.h (renamed from src/gui/kernel/qnsthemeframe_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qnstitledframe_mac_p.h (renamed from src/gui/kernel/qnstitledframe_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qpaintdevice_mac.cpp (renamed from src/gui/painting/qpaintdevice_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qpaintengine_mac.cpp (renamed from src/gui/painting/qpaintengine_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qpaintengine_mac_p.h (renamed from src/gui/painting/qpaintengine_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qpixmap_mac.cpp (renamed from src/gui/image/qpixmap_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qpixmap_mac_p.h (renamed from src/gui/image/qpixmap_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qprintengine_mac.mm (renamed from src/gui/painting/qprintengine_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qprintengine_mac_p.h (renamed from src/gui/painting/qprintengine_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qprinterinfo_mac.cpp (renamed from src/gui/painting/qprinterinfo_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qrawfont_mac.cpp (renamed from src/gui/text/qrawfont_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qregion_mac.cpp (renamed from src/gui/painting/qregion_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qsound_mac.mm (renamed from src/gui/kernel/qsound_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qt_cocoa_helpers_mac.mm (renamed from src/gui/kernel/qt_cocoa_helpers_mac.mm)0
-rw-r--r--src/gui/platforms/mac/qt_cocoa_helpers_mac_p.h (renamed from src/gui/kernel/qt_cocoa_helpers_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qt_mac.cpp (renamed from src/gui/kernel/qt_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qt_mac_p.h (renamed from src/gui/kernel/qt_mac_p.h)0
-rw-r--r--src/gui/platforms/mac/qtextengine_mac.cpp (renamed from src/gui/text/qtextengine_mac.cpp)0
-rw-r--r--src/gui/platforms/mac/qwidget_mac.mm (renamed from src/gui/kernel/qwidget_mac.mm)0
-rw-r--r--src/gui/platforms/s60/qapplication_s60.cpp (renamed from src/gui/kernel/qapplication_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qclipboard_s60.cpp (renamed from src/gui/guikernel/qclipboard_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qcolormap_s60.cpp (renamed from src/gui/painting/qcolormap_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qcursor_s60.cpp (renamed from src/gui/guikernel/qcursor_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qdesktopwidget_s60.cpp (renamed from src/gui/kernel/qdesktopwidget_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qdnd_s60.cpp (renamed from src/gui/guikernel/qdnd_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qeventdispatcher_s60.cpp (renamed from src/gui/guikernel/qeventdispatcher_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qeventdispatcher_s60_p.h (renamed from src/gui/guikernel/qeventdispatcher_s60_p.h)0
-rw-r--r--src/gui/platforms/s60/qfont_s60.cpp (renamed from src/gui/text/qfont_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qfontdatabase_s60.cpp (renamed from src/gui/text/qfontdatabase_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qfontengine_s60.cpp (renamed from src/gui/text/qfontengine_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qfontengine_s60_p.h (renamed from src/gui/text/qfontengine_s60_p.h)0
-rw-r--r--src/gui/platforms/s60/qkeymapper_s60.cpp (renamed from src/gui/guikernel/qkeymapper_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qpaintengine_s60.cpp (renamed from src/gui/painting/qpaintengine_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qpaintengine_s60_p.h (renamed from src/gui/painting/qpaintengine_s60_p.h)0
-rw-r--r--src/gui/platforms/s60/qpixmap_s60.cpp (renamed from src/gui/image/qpixmap_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qpixmap_s60_p.h (renamed from src/gui/image/qpixmap_s60_p.h)0
-rw-r--r--src/gui/platforms/s60/qregion_s60.cpp (renamed from src/gui/painting/qregion_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qsoftkeymanager_s60.cpp (renamed from src/gui/kernel/qsoftkeymanager_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qsoftkeymanager_s60_p.h (renamed from src/gui/kernel/qsoftkeymanager_s60_p.h)0
-rw-r--r--src/gui/platforms/s60/qsound_s60.cpp (renamed from src/gui/kernel/qsound_s60.cpp)0
-rw-r--r--src/gui/platforms/s60/qt_s60_p.h (renamed from src/gui/kernel/qt_s60_p.h)0
-rw-r--r--src/gui/platforms/s60/qwidget_s60.cpp (renamed from src/gui/kernel/qwidget_s60.cpp)0
-rw-r--r--src/gui/platforms/win/qapplication_win.cpp (renamed from src/gui/kernel/qapplication_win.cpp)0
-rw-r--r--src/gui/platforms/win/qclipboard_win.cpp (renamed from src/gui/guikernel/qclipboard_win.cpp)0
-rw-r--r--src/gui/platforms/win/qcolormap_win.cpp (renamed from src/gui/painting/qcolormap_win.cpp)0
-rw-r--r--src/gui/platforms/win/qcursor_win.cpp (renamed from src/gui/guikernel/qcursor_win.cpp)0
-rw-r--r--src/gui/platforms/win/qdesktopwidget_win.cpp (renamed from src/gui/kernel/qdesktopwidget_win.cpp)0
-rw-r--r--src/gui/platforms/win/qdnd_win.cpp (renamed from src/gui/guikernel/qdnd_win.cpp)0
-rw-r--r--src/gui/platforms/win/qfont_win.cpp (renamed from src/gui/text/qfont_win.cpp)0
-rw-r--r--src/gui/platforms/win/qfontdatabase_win.cpp (renamed from src/gui/text/qfontdatabase_win.cpp)0
-rw-r--r--src/gui/platforms/win/qfontengine_win.cpp (renamed from src/gui/text/qfontengine_win.cpp)0
-rw-r--r--src/gui/platforms/win/qfontengine_win_p.h (renamed from src/gui/text/qfontengine_win_p.h)0
-rw-r--r--src/gui/platforms/win/qguifunctions_wince.cpp (renamed from src/gui/kernel/qguifunctions_wince.cpp)0
-rw-r--r--src/gui/platforms/win/qguifunctions_wince.h (renamed from src/gui/kernel/qguifunctions_wince.h)0
-rw-r--r--src/gui/platforms/win/qkeymapper_win.cpp (renamed from src/gui/guikernel/qkeymapper_win.cpp)0
-rw-r--r--src/gui/platforms/win/qmime_win.cpp (renamed from src/gui/guikernel/qmime_win.cpp)0
-rw-r--r--src/gui/platforms/win/qole_win.cpp (renamed from src/gui/guikernel/qole_win.cpp)0
-rw-r--r--src/gui/platforms/win/qpaintdevice_win.cpp (renamed from src/gui/painting/qpaintdevice_win.cpp)0
-rw-r--r--src/gui/platforms/win/qpixmap_win.cpp (renamed from src/gui/image/qpixmap_win.cpp)0
-rw-r--r--src/gui/platforms/win/qprintengine_win.cpp (renamed from src/gui/painting/qprintengine_win.cpp)0
-rw-r--r--src/gui/platforms/win/qprintengine_win_p.h (renamed from src/gui/painting/qprintengine_win_p.h)0
-rw-r--r--src/gui/platforms/win/qprinterinfo_win.cpp (renamed from src/gui/painting/qprinterinfo_win.cpp)0
-rw-r--r--src/gui/platforms/win/qrawfont_win.cpp (renamed from src/gui/text/qrawfont_win.cpp)0
-rw-r--r--src/gui/platforms/win/qregion_win.cpp (renamed from src/gui/painting/qregion_win.cpp)0
-rw-r--r--src/gui/platforms/win/qsound_win.cpp (renamed from src/gui/kernel/qsound_win.cpp)0
-rw-r--r--src/gui/platforms/win/qwidget_win.cpp (renamed from src/gui/kernel/qwidget_win.cpp)0
-rw-r--r--src/gui/platforms/win/qwidget_wince.cpp (renamed from src/gui/kernel/qwidget_wince.cpp)0
-rw-r--r--src/gui/platforms/win/qwindowdefs_win.h (renamed from src/gui/guikernel/qwindowdefs_win.h)0
-rw-r--r--src/gui/platforms/win/qwinnativepangesturerecognizer_win.cpp (renamed from src/gui/kernel/qwinnativepangesturerecognizer_win.cpp)0
-rw-r--r--src/gui/platforms/win/qwinnativepangesturerecognizer_win_p.h (renamed from src/gui/kernel/qwinnativepangesturerecognizer_win_p.h)0
-rw-r--r--src/gui/platforms/x11/qapplication_x11.cpp (renamed from src/gui/kernel/qapplication_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qclipboard_x11.cpp (renamed from src/gui/guikernel/qclipboard_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qcolormap_x11.cpp (renamed from src/gui/painting/qcolormap_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qcursor_x11.cpp (renamed from src/gui/guikernel/qcursor_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qdesktopwidget_x11.cpp (renamed from src/gui/kernel/qdesktopwidget_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qdnd_x11.cpp (renamed from src/gui/guikernel/qdnd_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qeventdispatcher_x11.cpp (renamed from src/gui/guikernel/qeventdispatcher_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qeventdispatcher_x11_p.h (renamed from src/gui/guikernel/qeventdispatcher_x11_p.h)0
-rw-r--r--src/gui/platforms/x11/qfont_x11.cpp (renamed from src/gui/text/qfont_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qfontdatabase_x11.cpp (renamed from src/gui/text/qfontdatabase_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qfontengine_x11.cpp (renamed from src/gui/text/qfontengine_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qfontengine_x11_p.h (renamed from src/gui/text/qfontengine_x11_p.h)0
-rw-r--r--src/gui/platforms/x11/qkde.cpp (renamed from src/gui/kernel/qkde.cpp)0
-rw-r--r--src/gui/platforms/x11/qkde_p.h (renamed from src/gui/kernel/qkde_p.h)0
-rw-r--r--src/gui/platforms/x11/qkeymapper_x11.cpp (renamed from src/gui/guikernel/qkeymapper_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qkeymapper_x11_p.cpp (renamed from src/gui/guikernel/qkeymapper_x11_p.cpp)0
-rw-r--r--src/gui/platforms/x11/qmotifdnd_x11.cpp (renamed from src/gui/guikernel/qmotifdnd_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qpaintdevice_x11.cpp (renamed from src/gui/painting/qpaintdevice_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qpaintengine_x11.cpp (renamed from src/gui/painting/qpaintengine_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qpaintengine_x11_p.h (renamed from src/gui/painting/qpaintengine_x11_p.h)0
-rw-r--r--src/gui/platforms/x11/qpixmap_x11.cpp (renamed from src/gui/image/qpixmap_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qpixmap_x11_p.h (renamed from src/gui/image/qpixmap_x11_p.h)0
-rw-r--r--src/gui/platforms/x11/qregion_x11.cpp (renamed from src/gui/painting/qregion_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qsound_x11.cpp (renamed from src/gui/kernel/qsound_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qt_x11_p.h (renamed from src/gui/kernel/qt_x11_p.h)0
-rw-r--r--src/gui/platforms/x11/qwidget_x11.cpp (renamed from src/gui/kernel/qwidget_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qwidgetcreate_x11.cpp (renamed from src/gui/kernel/qwidgetcreate_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qx11embed_x11.cpp (renamed from src/gui/kernel/qx11embed_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qx11embed_x11.h (renamed from src/gui/kernel/qx11embed_x11.h)0
-rw-r--r--src/gui/platforms/x11/qx11info_x11.cpp (renamed from src/gui/kernel/qx11info_x11.cpp)0
-rw-r--r--src/gui/platforms/x11/qx11info_x11.h (renamed from src/gui/kernel/qx11info_x11.h)0
143 files changed, 0 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/platforms/mac/qapplication_mac.mm
index f607a72e92..f607a72e92 100644
--- a/src/gui/kernel/qapplication_mac.mm
+++ b/src/gui/platforms/mac/qapplication_mac.mm
diff --git a/src/gui/guikernel/qclipboard_mac.cpp b/src/gui/platforms/mac/qclipboard_mac.cpp
index 4a8bc56e41..4a8bc56e41 100644
--- a/src/gui/guikernel/qclipboard_mac.cpp
+++ b/src/gui/platforms/mac/qclipboard_mac.cpp
diff --git a/src/gui/kernel/qcocoaapplication_mac.mm b/src/gui/platforms/mac/qcocoaapplication_mac.mm
index 872f31dec7..872f31dec7 100644
--- a/src/gui/kernel/qcocoaapplication_mac.mm
+++ b/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
index 0c3f5e442d..0c3f5e442d 100644
--- a/src/gui/kernel/qcocoaapplication_mac_p.h
+++ b/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
index 77cd8902c3..77cd8902c3 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/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
index 714c046f48..714c046f48 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac_p.h
+++ b/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
index 70c893aeec..70c893aeec 100644
--- a/src/gui/kernel/qcocoaintrospection_mac.mm
+++ b/src/gui/platforms/mac/qcocoaintrospection_mac.mm
diff --git a/src/gui/kernel/qcocoaintrospection_p.h b/src/gui/platforms/mac/qcocoaintrospection_p.h
index 1c7d6ac13c..1c7d6ac13c 100644
--- a/src/gui/kernel/qcocoaintrospection_p.h
+++ b/src/gui/platforms/mac/qcocoaintrospection_p.h
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/platforms/mac/qcocoamenuloader_mac.mm
index 71ff011069..71ff011069 100644
--- a/src/gui/kernel/qcocoamenuloader_mac.mm
+++ b/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
index cfcc7e00c6..cfcc7e00c6 100644
--- a/src/gui/kernel/qcocoamenuloader_mac_p.h
+++ b/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
index 67a12e25f8..67a12e25f8 100644
--- a/src/gui/kernel/qcocoapanel_mac.mm
+++ b/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
index 542615903e..542615903e 100644
--- a/src/gui/kernel/qcocoapanel_mac_p.h
+++ b/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
index ee1115bd4e..ee1115bd4e 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/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
index e885d1552c..e885d1552c 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/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
index cc79b6705b..cc79b6705b 100644
--- a/src/gui/kernel/qcocoaview_mac_p.h
+++ b/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
index 6e5023aaca..6e5023aaca 100644
--- a/src/gui/kernel/qcocoawindow_mac.mm
+++ b/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
index d567cab244..d567cab244 100644
--- a/src/gui/kernel/qcocoawindow_mac_p.h
+++ b/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
index b761934c01..b761934c01 100644
--- a/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm
+++ b/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
index 09b40875f6..09b40875f6 100644
--- a/src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h
+++ b/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
index 1faf068a12..1faf068a12 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac.mm
+++ b/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
index 638ce2df9a..638ce2df9a 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac_p.h
+++ b/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
index 28589f41b8..28589f41b8 100644
--- a/src/gui/painting/qcolormap_mac.cpp
+++ b/src/gui/platforms/mac/qcolormap_mac.cpp
diff --git a/src/gui/guikernel/qcursor_mac.mm b/src/gui/platforms/mac/qcursor_mac.mm
index 0afa3ee4f0..0afa3ee4f0 100644
--- a/src/gui/guikernel/qcursor_mac.mm
+++ b/src/gui/platforms/mac/qcursor_mac.mm
diff --git a/src/gui/kernel/qdesktopwidget_mac.mm b/src/gui/platforms/mac/qdesktopwidget_mac.mm
index 0b529c9843..0b529c9843 100644
--- a/src/gui/kernel/qdesktopwidget_mac.mm
+++ b/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
index ac638ea7d8..ac638ea7d8 100644
--- a/src/gui/kernel/qdesktopwidget_mac_p.h
+++ b/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
index 3af2ba007c..3af2ba007c 100644
--- a/src/gui/guikernel/qdnd_mac.mm
+++ b/src/gui/platforms/mac/qdnd_mac.mm
diff --git a/src/gui/guikernel/qeventdispatcher_mac.mm b/src/gui/platforms/mac/qeventdispatcher_mac.mm
index 677a7368b4..677a7368b4 100644
--- a/src/gui/guikernel/qeventdispatcher_mac.mm
+++ b/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
index 12fcafbb01..12fcafbb01 100644
--- a/src/gui/guikernel/qeventdispatcher_mac_p.h
+++ b/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
index daf68c03ea..daf68c03ea 100644
--- a/src/gui/text/qfont_mac.cpp
+++ b/src/gui/platforms/mac/qfont_mac.cpp
diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/platforms/mac/qfontdatabase_mac.cpp
index 5ba236b5f7..5ba236b5f7 100644
--- a/src/gui/text/qfontdatabase_mac.cpp
+++ b/src/gui/platforms/mac/qfontdatabase_mac.cpp
diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/platforms/mac/qfontengine_coretext.mm
index d4df2183ed..d4df2183ed 100644
--- a/src/gui/text/qfontengine_coretext.mm
+++ b/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
index bb80a9b2f3..bb80a9b2f3 100644
--- a/src/gui/text/qfontengine_coretext_p.h
+++ b/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
index 9f094ad7d1..9f094ad7d1 100644
--- a/src/gui/text/qfontengine_mac.mm
+++ b/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
index 292ea98d9a..292ea98d9a 100644
--- a/src/gui/text/qfontengine_mac_p.h
+++ b/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
index d3bbf89711..d3bbf89711 100644
--- a/src/gui/guikernel/qkeymapper_mac.cpp
+++ b/src/gui/platforms/mac/qkeymapper_mac.cpp
diff --git a/src/gui/kernel/qmacdefines_mac.h b/src/gui/platforms/mac/qmacdefines_mac.h
index d6ccb93593..d6ccb93593 100644
--- a/src/gui/kernel/qmacdefines_mac.h
+++ b/src/gui/platforms/mac/qmacdefines_mac.h
diff --git a/src/gui/kernel/qmacgesturerecognizer_mac.mm b/src/gui/platforms/mac/qmacgesturerecognizer_mac.mm
index 6a4f0bb445..6a4f0bb445 100644
--- a/src/gui/kernel/qmacgesturerecognizer_mac.mm
+++ b/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
index 465f6a2ac8..465f6a2ac8 100644
--- a/src/gui/kernel/qmacgesturerecognizer_mac_p.h
+++ b/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
index d6f6222c23..d6f6222c23 100644
--- a/src/gui/guikernel/qmime_mac.cpp
+++ b/src/gui/platforms/mac/qmime_mac.cpp
diff --git a/src/gui/kernel/qmultitouch_mac.mm b/src/gui/platforms/mac/qmultitouch_mac.mm
index d9e845a01c..d9e845a01c 100644
--- a/src/gui/kernel/qmultitouch_mac.mm
+++ b/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
index 16be930d0a..16be930d0a 100644
--- a/src/gui/kernel/qmultitouch_mac_p.h
+++ b/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
index 6ec3f64efa..6ec3f64efa 100644
--- a/src/gui/kernel/qnsframeview_mac_p.h
+++ b/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
index 2cb4916c06..2cb4916c06 100644
--- a/src/gui/kernel/qnsthemeframe_mac_p.h
+++ b/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
index 4eb5332194..4eb5332194 100644
--- a/src/gui/kernel/qnstitledframe_mac_p.h
+++ b/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
index 245408a0b0..245408a0b0 100644
--- a/src/gui/painting/qpaintdevice_mac.cpp
+++ b/src/gui/platforms/mac/qpaintdevice_mac.cpp
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/platforms/mac/qpaintengine_mac.cpp
index c6d061dea8..c6d061dea8 100644
--- a/src/gui/painting/qpaintengine_mac.cpp
+++ b/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
index 3e71d6ca6b..3e71d6ca6b 100644
--- a/src/gui/painting/qpaintengine_mac_p.h
+++ b/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
index 72e2aa6e04..72e2aa6e04 100644
--- a/src/gui/image/qpixmap_mac.cpp
+++ b/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
index 307e38aceb..307e38aceb 100644
--- a/src/gui/image/qpixmap_mac_p.h
+++ b/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
index 1dce30301f..1dce30301f 100644
--- a/src/gui/painting/qprintengine_mac.mm
+++ b/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
index 511705d26f..511705d26f 100644
--- a/src/gui/painting/qprintengine_mac_p.h
+++ b/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
index b24ab70267..b24ab70267 100644
--- a/src/gui/painting/qprinterinfo_mac.cpp
+++ b/src/gui/platforms/mac/qprinterinfo_mac.cpp
diff --git a/src/gui/text/qrawfont_mac.cpp b/src/gui/platforms/mac/qrawfont_mac.cpp
index 1ed4185a5d..1ed4185a5d 100644
--- a/src/gui/text/qrawfont_mac.cpp
+++ b/src/gui/platforms/mac/qrawfont_mac.cpp
diff --git a/src/gui/painting/qregion_mac.cpp b/src/gui/platforms/mac/qregion_mac.cpp
index 50fd783df4..50fd783df4 100644
--- a/src/gui/painting/qregion_mac.cpp
+++ b/src/gui/platforms/mac/qregion_mac.cpp
diff --git a/src/gui/kernel/qsound_mac.mm b/src/gui/platforms/mac/qsound_mac.mm
index 5a9af135b0..5a9af135b0 100644
--- a/src/gui/kernel/qsound_mac.mm
+++ b/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
index 32123ee682..32123ee682 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/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
index a49753ae2f..a49753ae2f 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/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
index 046bcf6a54..046bcf6a54 100644
--- a/src/gui/kernel/qt_mac.cpp
+++ b/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
index b2bb804ff0..b2bb804ff0 100644
--- a/src/gui/kernel/qt_mac_p.h
+++ b/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
index 2c6e579b45..2c6e579b45 100644
--- a/src/gui/text/qtextengine_mac.cpp
+++ b/src/gui/platforms/mac/qtextengine_mac.cpp
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/platforms/mac/qwidget_mac.mm
index 354f05ba10..354f05ba10 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/platforms/mac/qwidget_mac.mm
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/platforms/s60/qapplication_s60.cpp
index 408c3b5883..408c3b5883 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/platforms/s60/qapplication_s60.cpp
diff --git a/src/gui/guikernel/qclipboard_s60.cpp b/src/gui/platforms/s60/qclipboard_s60.cpp
index 0dafae0996..0dafae0996 100644
--- a/src/gui/guikernel/qclipboard_s60.cpp
+++ b/src/gui/platforms/s60/qclipboard_s60.cpp
diff --git a/src/gui/painting/qcolormap_s60.cpp b/src/gui/platforms/s60/qcolormap_s60.cpp
index 2c634db8a5..2c634db8a5 100644
--- a/src/gui/painting/qcolormap_s60.cpp
+++ b/src/gui/platforms/s60/qcolormap_s60.cpp
diff --git a/src/gui/guikernel/qcursor_s60.cpp b/src/gui/platforms/s60/qcursor_s60.cpp
index 8dfe87ef81..8dfe87ef81 100644
--- a/src/gui/guikernel/qcursor_s60.cpp
+++ b/src/gui/platforms/s60/qcursor_s60.cpp
diff --git a/src/gui/kernel/qdesktopwidget_s60.cpp b/src/gui/platforms/s60/qdesktopwidget_s60.cpp
index 62a4d40eba..62a4d40eba 100644
--- a/src/gui/kernel/qdesktopwidget_s60.cpp
+++ b/src/gui/platforms/s60/qdesktopwidget_s60.cpp
diff --git a/src/gui/guikernel/qdnd_s60.cpp b/src/gui/platforms/s60/qdnd_s60.cpp
index a9847a98f8..a9847a98f8 100644
--- a/src/gui/guikernel/qdnd_s60.cpp
+++ b/src/gui/platforms/s60/qdnd_s60.cpp
diff --git a/src/gui/guikernel/qeventdispatcher_s60.cpp b/src/gui/platforms/s60/qeventdispatcher_s60.cpp
index 2d92c89c07..2d92c89c07 100644
--- a/src/gui/guikernel/qeventdispatcher_s60.cpp
+++ b/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
index 7c5a8d03d4..7c5a8d03d4 100644
--- a/src/gui/guikernel/qeventdispatcher_s60_p.h
+++ b/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
index 114191d765..114191d765 100644
--- a/src/gui/text/qfont_s60.cpp
+++ b/src/gui/platforms/s60/qfont_s60.cpp
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/platforms/s60/qfontdatabase_s60.cpp
index 1db4a7d359..1db4a7d359 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/platforms/s60/qfontdatabase_s60.cpp
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/platforms/s60/qfontengine_s60.cpp
index e9b54e350f..e9b54e350f 100644
--- a/src/gui/text/qfontengine_s60.cpp
+++ b/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
index c0eeef5264..c0eeef5264 100644
--- a/src/gui/text/qfontengine_s60_p.h
+++ b/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
index 08cfae0d2d..08cfae0d2d 100644
--- a/src/gui/guikernel/qkeymapper_s60.cpp
+++ b/src/gui/platforms/s60/qkeymapper_s60.cpp
diff --git a/src/gui/painting/qpaintengine_s60.cpp b/src/gui/platforms/s60/qpaintengine_s60.cpp
index ca303be03d..ca303be03d 100644
--- a/src/gui/painting/qpaintengine_s60.cpp
+++ b/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
index a62bdac97c..a62bdac97c 100644
--- a/src/gui/painting/qpaintengine_s60_p.h
+++ b/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
index c8aa003ffa..c8aa003ffa 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/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
index c440bbc33a..c440bbc33a 100644
--- a/src/gui/image/qpixmap_s60_p.h
+++ b/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
index eafff1b965..eafff1b965 100644
--- a/src/gui/painting/qregion_s60.cpp
+++ b/src/gui/platforms/s60/qregion_s60.cpp
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/platforms/s60/qsoftkeymanager_s60.cpp
index 79ed91af5b..79ed91af5b 100644
--- a/src/gui/kernel/qsoftkeymanager_s60.cpp
+++ b/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
index 9cb3787cb8..9cb3787cb8 100644
--- a/src/gui/kernel/qsoftkeymanager_s60_p.h
+++ b/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
index acc5c2a56f..acc5c2a56f 100644
--- a/src/gui/kernel/qsound_s60.cpp
+++ b/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
index 8aba53a168..8aba53a168 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/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
index e28a75a6ab..e28a75a6ab 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/platforms/s60/qwidget_s60.cpp
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/platforms/win/qapplication_win.cpp
index 72a05afbd0..72a05afbd0 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/platforms/win/qapplication_win.cpp
diff --git a/src/gui/guikernel/qclipboard_win.cpp b/src/gui/platforms/win/qclipboard_win.cpp
index ea41165b9c..ea41165b9c 100644
--- a/src/gui/guikernel/qclipboard_win.cpp
+++ b/src/gui/platforms/win/qclipboard_win.cpp
diff --git a/src/gui/painting/qcolormap_win.cpp b/src/gui/platforms/win/qcolormap_win.cpp
index 1773f717c0..1773f717c0 100644
--- a/src/gui/painting/qcolormap_win.cpp
+++ b/src/gui/platforms/win/qcolormap_win.cpp
diff --git a/src/gui/guikernel/qcursor_win.cpp b/src/gui/platforms/win/qcursor_win.cpp
index 8a9362ebfc..8a9362ebfc 100644
--- a/src/gui/guikernel/qcursor_win.cpp
+++ b/src/gui/platforms/win/qcursor_win.cpp
diff --git a/src/gui/kernel/qdesktopwidget_win.cpp b/src/gui/platforms/win/qdesktopwidget_win.cpp
index d57b355ef4..d57b355ef4 100644
--- a/src/gui/kernel/qdesktopwidget_win.cpp
+++ b/src/gui/platforms/win/qdesktopwidget_win.cpp
diff --git a/src/gui/guikernel/qdnd_win.cpp b/src/gui/platforms/win/qdnd_win.cpp
index 176e3cef7f..176e3cef7f 100644
--- a/src/gui/guikernel/qdnd_win.cpp
+++ b/src/gui/platforms/win/qdnd_win.cpp
diff --git a/src/gui/text/qfont_win.cpp b/src/gui/platforms/win/qfont_win.cpp
index 3ef761bfa5..3ef761bfa5 100644
--- a/src/gui/text/qfont_win.cpp
+++ b/src/gui/platforms/win/qfont_win.cpp
diff --git a/src/gui/text/qfontdatabase_win.cpp b/src/gui/platforms/win/qfontdatabase_win.cpp
index 05b7509bf6..05b7509bf6 100644
--- a/src/gui/text/qfontdatabase_win.cpp
+++ b/src/gui/platforms/win/qfontdatabase_win.cpp
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/platforms/win/qfontengine_win.cpp
index 54d7ec2980..54d7ec2980 100644
--- a/src/gui/text/qfontengine_win.cpp
+++ b/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
index 114149d61f..114149d61f 100644
--- a/src/gui/text/qfontengine_win_p.h
+++ b/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
index bb4ed11589..bb4ed11589 100644
--- a/src/gui/kernel/qguifunctions_wince.cpp
+++ b/src/gui/platforms/win/qguifunctions_wince.cpp
diff --git a/src/gui/kernel/qguifunctions_wince.h b/src/gui/platforms/win/qguifunctions_wince.h
index 2e14de0693..2e14de0693 100644
--- a/src/gui/kernel/qguifunctions_wince.h
+++ b/src/gui/platforms/win/qguifunctions_wince.h
diff --git a/src/gui/guikernel/qkeymapper_win.cpp b/src/gui/platforms/win/qkeymapper_win.cpp
index 92fa582617..92fa582617 100644
--- a/src/gui/guikernel/qkeymapper_win.cpp
+++ b/src/gui/platforms/win/qkeymapper_win.cpp
diff --git a/src/gui/guikernel/qmime_win.cpp b/src/gui/platforms/win/qmime_win.cpp
index feb8b78eca..feb8b78eca 100644
--- a/src/gui/guikernel/qmime_win.cpp
+++ b/src/gui/platforms/win/qmime_win.cpp
diff --git a/src/gui/guikernel/qole_win.cpp b/src/gui/platforms/win/qole_win.cpp
index 24e2d5b292..24e2d5b292 100644
--- a/src/gui/guikernel/qole_win.cpp
+++ b/src/gui/platforms/win/qole_win.cpp
diff --git a/src/gui/painting/qpaintdevice_win.cpp b/src/gui/platforms/win/qpaintdevice_win.cpp
index 3dbe97492a..3dbe97492a 100644
--- a/src/gui/painting/qpaintdevice_win.cpp
+++ b/src/gui/platforms/win/qpaintdevice_win.cpp
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/platforms/win/qpixmap_win.cpp
index 9c14ac7726..9c14ac7726 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/platforms/win/qpixmap_win.cpp
diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/platforms/win/qprintengine_win.cpp
index 07d66f5bd0..07d66f5bd0 100644
--- a/src/gui/painting/qprintengine_win.cpp
+++ b/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
index b4d0670e7b..b4d0670e7b 100644
--- a/src/gui/painting/qprintengine_win_p.h
+++ b/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
index 2c4014d8dc..2c4014d8dc 100644
--- a/src/gui/painting/qprinterinfo_win.cpp
+++ b/src/gui/platforms/win/qprinterinfo_win.cpp
diff --git a/src/gui/text/qrawfont_win.cpp b/src/gui/platforms/win/qrawfont_win.cpp
index d8acf57431..d8acf57431 100644
--- a/src/gui/text/qrawfont_win.cpp
+++ b/src/gui/platforms/win/qrawfont_win.cpp
diff --git a/src/gui/painting/qregion_win.cpp b/src/gui/platforms/win/qregion_win.cpp
index 3466b62cbd..3466b62cbd 100644
--- a/src/gui/painting/qregion_win.cpp
+++ b/src/gui/platforms/win/qregion_win.cpp
diff --git a/src/gui/kernel/qsound_win.cpp b/src/gui/platforms/win/qsound_win.cpp
index c11482d608..c11482d608 100644
--- a/src/gui/kernel/qsound_win.cpp
+++ b/src/gui/platforms/win/qsound_win.cpp
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/platforms/win/qwidget_win.cpp
index a02c5ba008..a02c5ba008 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/platforms/win/qwidget_win.cpp
diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/platforms/win/qwidget_wince.cpp
index 7676182ef0..7676182ef0 100644
--- a/src/gui/kernel/qwidget_wince.cpp
+++ b/src/gui/platforms/win/qwidget_wince.cpp
diff --git a/src/gui/guikernel/qwindowdefs_win.h b/src/gui/platforms/win/qwindowdefs_win.h
index a4dd38410c..a4dd38410c 100644
--- a/src/gui/guikernel/qwindowdefs_win.h
+++ b/src/gui/platforms/win/qwindowdefs_win.h
diff --git a/src/gui/kernel/qwinnativepangesturerecognizer_win.cpp b/src/gui/platforms/win/qwinnativepangesturerecognizer_win.cpp
index 0d13bafc0c..0d13bafc0c 100644
--- a/src/gui/kernel/qwinnativepangesturerecognizer_win.cpp
+++ b/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
index 6d23e41ce3..6d23e41ce3 100644
--- a/src/gui/kernel/qwinnativepangesturerecognizer_win_p.h
+++ b/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
index 20542ea328..20542ea328 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/platforms/x11/qapplication_x11.cpp
diff --git a/src/gui/guikernel/qclipboard_x11.cpp b/src/gui/platforms/x11/qclipboard_x11.cpp
index d566c86e04..d566c86e04 100644
--- a/src/gui/guikernel/qclipboard_x11.cpp
+++ b/src/gui/platforms/x11/qclipboard_x11.cpp
diff --git a/src/gui/painting/qcolormap_x11.cpp b/src/gui/platforms/x11/qcolormap_x11.cpp
index 05eefa455b..05eefa455b 100644
--- a/src/gui/painting/qcolormap_x11.cpp
+++ b/src/gui/platforms/x11/qcolormap_x11.cpp
diff --git a/src/gui/guikernel/qcursor_x11.cpp b/src/gui/platforms/x11/qcursor_x11.cpp
index d0ed98e1fe..d0ed98e1fe 100644
--- a/src/gui/guikernel/qcursor_x11.cpp
+++ b/src/gui/platforms/x11/qcursor_x11.cpp
diff --git a/src/gui/kernel/qdesktopwidget_x11.cpp b/src/gui/platforms/x11/qdesktopwidget_x11.cpp
index b0f12903a1..b0f12903a1 100644
--- a/src/gui/kernel/qdesktopwidget_x11.cpp
+++ b/src/gui/platforms/x11/qdesktopwidget_x11.cpp
diff --git a/src/gui/guikernel/qdnd_x11.cpp b/src/gui/platforms/x11/qdnd_x11.cpp
index 9ff1543e51..9ff1543e51 100644
--- a/src/gui/guikernel/qdnd_x11.cpp
+++ b/src/gui/platforms/x11/qdnd_x11.cpp
diff --git a/src/gui/guikernel/qeventdispatcher_x11.cpp b/src/gui/platforms/x11/qeventdispatcher_x11.cpp
index 110786a378..110786a378 100644
--- a/src/gui/guikernel/qeventdispatcher_x11.cpp
+++ b/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
index cfdd2a5fa6..cfdd2a5fa6 100644
--- a/src/gui/guikernel/qeventdispatcher_x11_p.h
+++ b/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
index c72a5fade5..c72a5fade5 100644
--- a/src/gui/text/qfont_x11.cpp
+++ b/src/gui/platforms/x11/qfont_x11.cpp
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/platforms/x11/qfontdatabase_x11.cpp
index 0c0c4c8343..0c0c4c8343 100644
--- a/src/gui/text/qfontdatabase_x11.cpp
+++ b/src/gui/platforms/x11/qfontdatabase_x11.cpp
diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/platforms/x11/qfontengine_x11.cpp
index 4260b85b11..4260b85b11 100644
--- a/src/gui/text/qfontengine_x11.cpp
+++ b/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
index d7eb39daaa..d7eb39daaa 100644
--- a/src/gui/text/qfontengine_x11_p.h
+++ b/src/gui/platforms/x11/qfontengine_x11_p.h
diff --git a/src/gui/kernel/qkde.cpp b/src/gui/platforms/x11/qkde.cpp
index 7d333feb9a..7d333feb9a 100644
--- a/src/gui/kernel/qkde.cpp
+++ b/src/gui/platforms/x11/qkde.cpp
diff --git a/src/gui/kernel/qkde_p.h b/src/gui/platforms/x11/qkde_p.h
index 4e108f6e9e..4e108f6e9e 100644
--- a/src/gui/kernel/qkde_p.h
+++ b/src/gui/platforms/x11/qkde_p.h
diff --git a/src/gui/guikernel/qkeymapper_x11.cpp b/src/gui/platforms/x11/qkeymapper_x11.cpp
index 5383bfd456..5383bfd456 100644
--- a/src/gui/guikernel/qkeymapper_x11.cpp
+++ b/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
index 2dbe1e77a4..2dbe1e77a4 100644
--- a/src/gui/guikernel/qkeymapper_x11_p.cpp
+++ b/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
index eef4cc470b..eef4cc470b 100644
--- a/src/gui/guikernel/qmotifdnd_x11.cpp
+++ b/src/gui/platforms/x11/qmotifdnd_x11.cpp
diff --git a/src/gui/painting/qpaintdevice_x11.cpp b/src/gui/platforms/x11/qpaintdevice_x11.cpp
index 690dea99d7..690dea99d7 100644
--- a/src/gui/painting/qpaintdevice_x11.cpp
+++ b/src/gui/platforms/x11/qpaintdevice_x11.cpp
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/platforms/x11/qpaintengine_x11.cpp
index 1256996491..1256996491 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/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
index 897c69f122..897c69f122 100644
--- a/src/gui/painting/qpaintengine_x11_p.h
+++ b/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
index bc468cb7ec..bc468cb7ec 100644
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/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
index eb8e5819ad..eb8e5819ad 100644
--- a/src/gui/image/qpixmap_x11_p.h
+++ b/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
index ef4e844bfa..ef4e844bfa 100644
--- a/src/gui/painting/qregion_x11.cpp
+++ b/src/gui/platforms/x11/qregion_x11.cpp
diff --git a/src/gui/kernel/qsound_x11.cpp b/src/gui/platforms/x11/qsound_x11.cpp
index 12c06f0aa1..12c06f0aa1 100644
--- a/src/gui/kernel/qsound_x11.cpp
+++ b/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
index 69079cfaad..69079cfaad 100644
--- a/src/gui/kernel/qt_x11_p.h
+++ b/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
index 5ece7d65c6..5ece7d65c6 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/platforms/x11/qwidget_x11.cpp
diff --git a/src/gui/kernel/qwidgetcreate_x11.cpp b/src/gui/platforms/x11/qwidgetcreate_x11.cpp
index 16bd6abf9a..16bd6abf9a 100644
--- a/src/gui/kernel/qwidgetcreate_x11.cpp
+++ b/src/gui/platforms/x11/qwidgetcreate_x11.cpp
diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/platforms/x11/qx11embed_x11.cpp
index 49a819469e..49a819469e 100644
--- a/src/gui/kernel/qx11embed_x11.cpp
+++ b/src/gui/platforms/x11/qx11embed_x11.cpp
diff --git a/src/gui/kernel/qx11embed_x11.h b/src/gui/platforms/x11/qx11embed_x11.h
index 30929f7ba9..30929f7ba9 100644
--- a/src/gui/kernel/qx11embed_x11.h
+++ b/src/gui/platforms/x11/qx11embed_x11.h
diff --git a/src/gui/kernel/qx11info_x11.cpp b/src/gui/platforms/x11/qx11info_x11.cpp
index f52443befc..f52443befc 100644
--- a/src/gui/kernel/qx11info_x11.cpp
+++ b/src/gui/platforms/x11/qx11info_x11.cpp
diff --git a/src/gui/kernel/qx11info_x11.h b/src/gui/platforms/x11/qx11info_x11.h
index ece85740d2..ece85740d2 100644
--- a/src/gui/kernel/qx11info_x11.h
+++ b/src/gui/platforms/x11/qx11info_x11.h