From f67b8df3ebdba2d398b9cce686b7c644adffff08 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 7 May 2011 00:02:01 +0200
Subject: [PATCH] library split
---
src/gui/gui.pro | 44 ----
src/gui/guikernel/qplatformcursor_qpa.cpp | 1 -
src/gui/guikernel/qt_gui_pch.h | 81 +++++++
src/gui/painting/qpaintdevice_qpa.cpp | 2 +-
src/modules/qt_widgets.pri | 14 ++
src/src.pro | 5 +-
src/{gui => widgets}/QtGui.dynlist | 0
.../accessible/accessible.pri | 0
.../accessible/qaccessible.cpp | 0
src/{gui => widgets}/accessible/qaccessible.h | 0
.../accessible/qaccessible2.cpp | 0
.../accessible/qaccessible2.h | 0
.../accessible/qaccessible_mac.mm | 0
.../accessible/qaccessible_mac_carbon.cpp | 0
.../accessible/qaccessible_mac_cocoa.mm | 0
.../accessible/qaccessible_mac_p.h | 0
.../accessible/qaccessible_unix.cpp | 0
.../accessible/qaccessible_win.cpp | 0
.../accessible/qaccessiblebridge.cpp | 0
.../accessible/qaccessiblebridge.h | 0
.../accessible/qaccessibleobject.cpp | 0
.../accessible/qaccessibleobject.h | 0
.../accessible/qaccessibleplugin.cpp | 0
.../accessible/qaccessibleplugin.h | 0
.../accessible/qaccessiblewidget.cpp | 0
.../accessible/qaccessiblewidget.h | 0
src/{gui => widgets}/animation/animation.pri | 0
.../animation/qguivariantanimation.cpp | 0
src/{gui => widgets}/dialogs/dialogs.pri | 0
.../dialogs/images/fit-page-24.png | Bin
.../dialogs/images/fit-page-32.png | Bin
.../dialogs/images/fit-width-24.png | Bin
.../dialogs/images/fit-width-32.png | Bin
.../dialogs/images/go-first-24.png | Bin
.../dialogs/images/go-first-32.png | Bin
.../dialogs/images/go-last-24.png | Bin
.../dialogs/images/go-last-32.png | Bin
.../dialogs/images/go-next-24.png | Bin
.../dialogs/images/go-next-32.png | Bin
.../dialogs/images/go-previous-24.png | Bin
.../dialogs/images/go-previous-32.png | Bin
.../dialogs/images/layout-landscape-24.png | Bin
.../dialogs/images/layout-landscape-32.png | Bin
.../dialogs/images/layout-portrait-24.png | Bin
.../dialogs/images/layout-portrait-32.png | Bin
.../dialogs/images/page-setup-24.png | Bin
.../dialogs/images/page-setup-32.png | Bin
.../dialogs/images/print-24.png | Bin
.../dialogs/images/print-32.png | Bin
.../dialogs/images/qtlogo-64.png | Bin
.../dialogs/images/status-color.png | Bin
.../dialogs/images/status-gray-scale.png | Bin
.../dialogs/images/view-page-multi-24.png | Bin
.../dialogs/images/view-page-multi-32.png | Bin
.../dialogs/images/view-page-one-24.png | Bin
.../dialogs/images/view-page-one-32.png | Bin
.../dialogs/images/view-page-sided-24.png | Bin
.../dialogs/images/view-page-sided-32.png | Bin
.../dialogs/images/zoom-in-24.png | Bin
.../dialogs/images/zoom-in-32.png | Bin
.../dialogs/images/zoom-out-24.png | Bin
.../dialogs/images/zoom-out-32.png | Bin
.../dialogs/qabstractpagesetupdialog.cpp | 0
.../dialogs/qabstractpagesetupdialog.h | 0
.../dialogs/qabstractpagesetupdialog_p.h | 0
.../dialogs/qabstractprintdialog.cpp | 0
.../dialogs/qabstractprintdialog.h | 0
.../dialogs/qabstractprintdialog_p.h | 0
src/{gui => widgets}/dialogs/qcolordialog.cpp | 0
src/{gui => widgets}/dialogs/qcolordialog.h | 0
.../dialogs/qcolordialog_mac.mm | 0
src/{gui => widgets}/dialogs/qcolordialog_p.h | 0
.../dialogs/qcolordialog_symbian.cpp | 0
src/{gui => widgets}/dialogs/qdialog.cpp | 0
src/{gui => widgets}/dialogs/qdialog.h | 0
src/{gui => widgets}/dialogs/qdialog_p.h | 0
.../dialogs/qdialogsbinarycompat_win.cpp | 0
.../dialogs/qerrormessage.cpp | 0
src/{gui => widgets}/dialogs/qerrormessage.h | 0
src/{gui => widgets}/dialogs/qfiledialog.cpp | 0
src/{gui => widgets}/dialogs/qfiledialog.h | 0
src/{gui => widgets}/dialogs/qfiledialog.ui | 0
.../dialogs/qfiledialog_embedded.ui | 0
.../dialogs/qfiledialog_mac.mm | 0
src/{gui => widgets}/dialogs/qfiledialog_p.h | 0
.../dialogs/qfiledialog_symbian.cpp | 0
.../dialogs/qfiledialog_win.cpp | 0
.../dialogs/qfiledialog_win_p.h | 0
.../dialogs/qfileinfogatherer.cpp | 0
.../dialogs/qfileinfogatherer_p.h | 0
.../dialogs/qfilesystemmodel.cpp | 0
.../dialogs/qfilesystemmodel.h | 0
.../dialogs/qfilesystemmodel_p.h | 0
src/{gui => widgets}/dialogs/qfontdialog.cpp | 0
src/{gui => widgets}/dialogs/qfontdialog.h | 0
.../dialogs/qfontdialog_mac.mm | 0
src/{gui => widgets}/dialogs/qfontdialog_p.h | 0
src/{gui => widgets}/dialogs/qfscompleter_p.h | 0
src/{gui => widgets}/dialogs/qinputdialog.cpp | 0
src/{gui => widgets}/dialogs/qinputdialog.h | 0
src/{gui => widgets}/dialogs/qmessagebox.cpp | 0
src/{gui => widgets}/dialogs/qmessagebox.h | 0
src/{gui => widgets}/dialogs/qmessagebox.qrc | 0
.../dialogs/qnspanelproxy_mac.mm | 0
.../dialogs/qpagesetupdialog.cpp | 0
.../dialogs/qpagesetupdialog.h | 0
.../dialogs/qpagesetupdialog_mac.mm | 0
.../dialogs/qpagesetupdialog_unix.cpp | 0
.../dialogs/qpagesetupdialog_unix_p.h | 0
.../dialogs/qpagesetupdialog_win.cpp | 0
.../dialogs/qpagesetupwidget.ui | 0
src/{gui => widgets}/dialogs/qprintdialog.h | 0
.../dialogs/qprintdialog.qdoc | 0
src/{gui => widgets}/dialogs/qprintdialog.qrc | 0
.../dialogs/qprintdialog_mac.mm | 0
.../dialogs/qprintdialog_unix.cpp | 0
.../dialogs/qprintdialog_win.cpp | 0
.../dialogs/qprintpreviewdialog.cpp | 0
.../dialogs/qprintpreviewdialog.h | 0
.../dialogs/qprintpropertieswidget.ui | 0
.../dialogs/qprintsettingsoutput.ui | 0
src/{gui => widgets}/dialogs/qprintwidget.ui | 0
.../dialogs/qprogressdialog.cpp | 0
.../dialogs/qprogressdialog.h | 0
src/{gui => widgets}/dialogs/qsidebar.cpp | 0
src/{gui => widgets}/dialogs/qsidebar_p.h | 0
src/{gui => widgets}/dialogs/qwizard.cpp | 0
src/{gui => widgets}/dialogs/qwizard.h | 0
src/{gui => widgets}/dialogs/qwizard_win.cpp | 0
src/{gui => widgets}/dialogs/qwizard_win_p.h | 0
src/{gui => widgets}/effects/effects.pri | 0
.../effects/qgraphicseffect.cpp | 0
.../effects/qgraphicseffect.h | 0
.../effects/qgraphicseffect_p.h | 0
.../effects/qpixmapfilter.cpp | 0
.../effects/qpixmapfilter_p.h | 0
.../graphicsview/graphicsview.pri | 0
src/{gui => widgets}/graphicsview/qgraph_p.h | 0
.../graphicsview/qgraphicsanchorlayout.cpp | 0
.../graphicsview/qgraphicsanchorlayout.h | 0
.../graphicsview/qgraphicsanchorlayout_p.cpp | 0
.../graphicsview/qgraphicsanchorlayout_p.h | 0
.../graphicsview/qgraphicsgridlayout.cpp | 0
.../graphicsview/qgraphicsgridlayout.h | 0
.../graphicsview/qgraphicsitem.cpp | 0
.../graphicsview/qgraphicsitem.h | 0
.../graphicsview/qgraphicsitem_p.h | 0
.../graphicsview/qgraphicsitemanimation.cpp | 0
.../graphicsview/qgraphicsitemanimation.h | 0
.../graphicsview/qgraphicslayout.cpp | 0
.../graphicsview/qgraphicslayout.h | 0
.../graphicsview/qgraphicslayout_p.cpp | 0
.../graphicsview/qgraphicslayout_p.h | 0
.../graphicsview/qgraphicslayoutitem.cpp | 0
.../graphicsview/qgraphicslayoutitem.h | 0
.../graphicsview/qgraphicslayoutitem_p.h | 0
.../graphicsview/qgraphicslinearlayout.cpp | 0
.../graphicsview/qgraphicslinearlayout.h | 0
.../graphicsview/qgraphicsproxywidget.cpp | 0
.../graphicsview/qgraphicsproxywidget.h | 0
.../graphicsview/qgraphicsproxywidget_p.h | 0
.../graphicsview/qgraphicsscene.cpp | 0
.../graphicsview/qgraphicsscene.h | 0
.../graphicsview/qgraphicsscene_bsp.cpp | 0
.../graphicsview/qgraphicsscene_bsp_p.h | 0
.../graphicsview/qgraphicsscene_p.h | 0
.../qgraphicsscenebsptreeindex.cpp | 0
.../qgraphicsscenebsptreeindex_p.h | 0
.../graphicsview/qgraphicssceneevent.cpp | 0
.../graphicsview/qgraphicssceneevent.h | 0
.../graphicsview/qgraphicssceneindex.cpp | 0
.../graphicsview/qgraphicssceneindex_p.h | 0
.../qgraphicsscenelinearindex.cpp | 0
.../qgraphicsscenelinearindex_p.h | 0
.../graphicsview/qgraphicstransform.cpp | 0
.../graphicsview/qgraphicstransform.h | 0
.../graphicsview/qgraphicstransform_p.h | 0
.../graphicsview/qgraphicsview.cpp | 0
.../graphicsview/qgraphicsview.h | 0
.../graphicsview/qgraphicsview_p.h | 0
.../graphicsview/qgraphicswidget.cpp | 0
.../graphicsview/qgraphicswidget.h | 0
.../graphicsview/qgraphicswidget_p.cpp | 0
.../graphicsview/qgraphicswidget_p.h | 0
.../graphicsview/qgridlayoutengine.cpp | 0
.../graphicsview/qgridlayoutengine_p.h | 0
.../graphicsview/qsimplex_p.cpp | 0
.../graphicsview/qsimplex_p.h | 0
.../inputmethod/inputmethod.pri | 0
.../inputmethod/qcoefepinputcontext_p.h | 0
.../inputmethod/qcoefepinputcontext_s60.cpp | 0
.../inputmethod/qinputcontext.cpp | 0
.../inputmethod/qinputcontext.h | 0
.../inputmethod/qinputcontext_p.h | 0
.../inputmethod/qinputcontextfactory.cpp | 0
.../inputmethod/qinputcontextfactory.h | 0
.../inputmethod/qinputcontextplugin.cpp | 0
.../inputmethod/qinputcontextplugin.h | 0
.../inputmethod/qmacinputcontext_mac.cpp | 0
.../inputmethod/qmacinputcontext_p.h | 0
.../inputmethod/qwininputcontext_p.h | 0
.../inputmethod/qwininputcontext_win.cpp | 0
.../inputmethod/qximinputcontext_p.h | 0
.../inputmethod/qximinputcontext_x11.cpp | 0
src/{gui => widgets}/itemviews/itemviews.pri | 0
.../itemviews/qabstractitemdelegate.cpp | 0
.../itemviews/qabstractitemdelegate.h | 0
.../itemviews/qabstractitemview.cpp | 0
.../itemviews/qabstractitemview.h | 0
.../itemviews/qabstractitemview_p.h | 0
.../itemviews/qabstractproxymodel.cpp | 0
.../itemviews/qabstractproxymodel.h | 0
.../itemviews/qabstractproxymodel_p.h | 0
src/{gui => widgets}/itemviews/qbsptree.cpp | 0
src/{gui => widgets}/itemviews/qbsptree_p.h | 0
.../itemviews/qcolumnview.cpp | 0
src/{gui => widgets}/itemviews/qcolumnview.h | 0
.../itemviews/qcolumnview_p.h | 0
.../itemviews/qcolumnviewgrip.cpp | 0
.../itemviews/qcolumnviewgrip_p.h | 0
.../itemviews/qdatawidgetmapper.cpp | 0
.../itemviews/qdatawidgetmapper.h | 0
src/{gui => widgets}/itemviews/qdirmodel.cpp | 0
src/{gui => widgets}/itemviews/qdirmodel.h | 0
.../itemviews/qfileiconprovider.cpp | 0
.../itemviews/qfileiconprovider.h | 0
.../itemviews/qheaderview.cpp | 0
src/{gui => widgets}/itemviews/qheaderview.h | 0
.../itemviews/qheaderview_p.h | 0
.../itemviews/qitemdelegate.cpp | 0
.../itemviews/qitemdelegate.h | 0
.../itemviews/qitemeditorfactory.cpp | 0
.../itemviews/qitemeditorfactory.h | 0
.../itemviews/qitemeditorfactory_p.h | 0
.../itemviews/qitemselectionmodel.cpp | 0
.../itemviews/qitemselectionmodel.h | 0
.../itemviews/qitemselectionmodel_p.h | 0
src/{gui => widgets}/itemviews/qlistview.cpp | 0
src/{gui => widgets}/itemviews/qlistview.h | 0
src/{gui => widgets}/itemviews/qlistview_p.h | 0
.../itemviews/qlistwidget.cpp | 0
src/{gui => widgets}/itemviews/qlistwidget.h | 0
.../itemviews/qlistwidget_p.h | 0
.../itemviews/qproxymodel.cpp | 0
src/{gui => widgets}/itemviews/qproxymodel.h | 0
.../itemviews/qproxymodel_p.h | 0
.../itemviews/qsortfilterproxymodel.cpp | 0
.../itemviews/qsortfilterproxymodel.h | 0
.../itemviews/qstandarditemmodel.cpp | 0
.../itemviews/qstandarditemmodel.h | 0
.../itemviews/qstandarditemmodel_p.h | 0
.../itemviews/qstringlistmodel.cpp | 0
.../itemviews/qstringlistmodel.h | 0
.../itemviews/qstyleditemdelegate.cpp | 0
.../itemviews/qstyleditemdelegate.h | 0
src/{gui => widgets}/itemviews/qtableview.cpp | 0
src/{gui => widgets}/itemviews/qtableview.h | 0
src/{gui => widgets}/itemviews/qtableview_p.h | 0
.../itemviews/qtablewidget.cpp | 0
src/{gui => widgets}/itemviews/qtablewidget.h | 0
.../itemviews/qtablewidget_p.h | 0
src/{gui => widgets}/itemviews/qtreeview.cpp | 0
src/{gui => widgets}/itemviews/qtreeview.h | 0
src/{gui => widgets}/itemviews/qtreeview_p.h | 0
.../itemviews/qtreewidget.cpp | 0
src/{gui => widgets}/itemviews/qtreewidget.h | 0
.../itemviews/qtreewidget_p.h | 0
.../itemviews/qtreewidgetitemiterator.cpp | 0
.../itemviews/qtreewidgetitemiterator.h | 0
.../itemviews/qtreewidgetitemiterator_p.h | 0
.../itemviews/qwidgetitemdata_p.h | 0
src/{gui => widgets}/kernel/kernel.pri | 0
src/{gui => widgets}/kernel/mac.pri | 0
src/{gui => widgets}/kernel/qaction.cpp | 0
src/{gui => widgets}/kernel/qaction.h | 0
src/{gui => widgets}/kernel/qaction_p.h | 0
src/{gui => widgets}/kernel/qactiongroup.cpp | 0
src/{gui => widgets}/kernel/qactiongroup.h | 0
src/{gui => widgets}/kernel/qapplication.cpp | 0
src/{gui => widgets}/kernel/qapplication.h | 0
src/{gui => widgets}/kernel/qapplication_p.h | 0
.../kernel/qapplication_qpa.cpp | 0
src/{gui => widgets}/kernel/qbackingstore.cpp | 0
src/{gui => widgets}/kernel/qbackingstore_p.h | 0
src/{gui => widgets}/kernel/qboxlayout.cpp | 0
src/{gui => widgets}/kernel/qboxlayout.h | 0
.../kernel/qdesktopwidget.cpp | 0
src/{gui => widgets}/kernel/qdesktopwidget.h | 0
.../kernel/qdesktopwidget.qdoc | 0
.../kernel/qdesktopwidget_qpa.cpp | 0
.../kernel/qdesktopwidget_qpa_p.h | 0
src/{gui => widgets}/kernel/qformlayout.cpp | 0
src/{gui => widgets}/kernel/qformlayout.h | 0
src/{gui => widgets}/kernel/qgesture.cpp | 0
src/{gui => widgets}/kernel/qgesture.h | 0
src/{gui => widgets}/kernel/qgesture_p.h | 0
.../kernel/qgesturemanager.cpp | 0
.../kernel/qgesturemanager_p.h | 0
.../kernel/qgesturerecognizer.cpp | 0
.../kernel/qgesturerecognizer.h | 0
src/{gui => widgets}/kernel/qgridlayout.cpp | 0
src/{gui => widgets}/kernel/qgridlayout.h | 0
.../kernel/qguieventdispatcher_glib.cpp | 0
.../kernel/qguieventdispatcher_glib_p.h | 0
.../kernel/qguiplatformplugin.cpp | 0
.../kernel/qguiplatformplugin_p.h | 0
src/{gui => widgets}/kernel/qicon.cpp | 0
src/{gui => widgets}/kernel/qicon.h | 0
src/{gui => widgets}/kernel/qicon_p.h | 0
src/{gui => widgets}/kernel/qiconengine.cpp | 0
src/{gui => widgets}/kernel/qiconengine.h | 0
.../kernel/qiconengineplugin.cpp | 0
.../kernel/qiconengineplugin.h | 0
src/{gui => widgets}/kernel/qiconloader.cpp | 0
src/{gui => widgets}/kernel/qiconloader_p.h | 0
src/{gui => widgets}/kernel/qlayout.cpp | 0
src/{gui => widgets}/kernel/qlayout.h | 0
src/{gui => widgets}/kernel/qlayout_p.h | 0
src/{gui => widgets}/kernel/qlayoutengine.cpp | 0
src/{gui => widgets}/kernel/qlayoutengine_p.h | 0
src/{gui => widgets}/kernel/qlayoutitem.cpp | 0
src/{gui => widgets}/kernel/qlayoutitem.h | 0
src/{gui => widgets}/kernel/qsizepolicy.h | 0
src/{gui => widgets}/kernel/qsizepolicy.qdoc | 0
.../kernel/qsoftkeymanager.cpp | 0
.../kernel/qsoftkeymanager_common_p.h | 0
.../kernel/qsoftkeymanager_p.h | 0
src/{gui => widgets}/kernel/qsound.cpp | 0
src/{gui => widgets}/kernel/qsound.h | 0
src/{gui => widgets}/kernel/qsound_p.h | 0
.../kernel/qstackedlayout.cpp | 0
src/{gui => widgets}/kernel/qstackedlayout.h | 0
.../kernel/qstandardgestures.cpp | 0
.../kernel/qstandardgestures_p.h | 0
src/{gui => widgets}/kernel/qt_gui_pch.h | 0
src/{gui => widgets}/kernel/qtooltip.cpp | 0
src/{gui => widgets}/kernel/qtooltip.h | 0
src/{gui => widgets}/kernel/qwhatsthis.cpp | 0
src/{gui => widgets}/kernel/qwhatsthis.h | 0
src/{gui => widgets}/kernel/qwidget.cpp | 0
src/{gui => widgets}/kernel/qwidget.h | 0
src/{gui => widgets}/kernel/qwidget_p.h | 0
src/{gui => widgets}/kernel/qwidget_qpa.cpp | 0
src/{gui => widgets}/kernel/qwidgetaction.cpp | 0
src/{gui => widgets}/kernel/qwidgetaction.h | 0
src/{gui => widgets}/kernel/qwidgetaction_p.h | 0
.../kernel/qwidgetwindow_qpa.cpp | 0
.../kernel/qwidgetwindow_qpa_p.h | 0
src/{gui => widgets}/kernel/symbian.pri | 0
src/{gui => widgets}/kernel/win.pri | 0
src/{gui => widgets}/kernel/x11.pri | 0
.../mac/images/copyarrowcursor.png | Bin
.../mac/images/forbiddencursor.png | Bin
.../mac/images/leopard-unified-toolbar-on.png | Bin
.../mac/images/pluscursor.png | Bin
.../mac/images/spincursor.png | Bin
.../mac/images/waitcursor.png | Bin
src/{gui => widgets}/mac/macresources.qrc | 0
.../mac/qt_menu.nib/classes.nib | 0
src/{gui => widgets}/mac/qt_menu.nib/info.nib | 0
.../mac/qt_menu.nib/keyedobjects.nib | Bin
.../platforms/mac/qapplication_mac.mm | 0
.../platforms/mac/qclipboard_mac.cpp | 0
.../platforms/mac/qcocoaapplication_mac.mm | 0
.../platforms/mac/qcocoaapplication_mac_p.h | 0
.../mac/qcocoaapplicationdelegate_mac.mm | 0
.../mac/qcocoaapplicationdelegate_mac_p.h | 0
.../platforms/mac/qcocoaintrospection_mac.mm | 0
.../platforms/mac/qcocoaintrospection_p.h | 0
.../platforms/mac/qcocoamenuloader_mac.mm | 0
.../platforms/mac/qcocoamenuloader_mac_p.h | 0
.../platforms/mac/qcocoapanel_mac.mm | 0
.../platforms/mac/qcocoapanel_mac_p.h | 0
.../mac/qcocoasharedwindowmethods_mac_p.h | 0
.../platforms/mac/qcocoaview_mac.mm | 0
.../platforms/mac/qcocoaview_mac_p.h | 0
.../platforms/mac/qcocoawindow_mac.mm | 0
.../platforms/mac/qcocoawindow_mac_p.h | 0
.../mac/qcocoawindowcustomthemeframe_mac.mm | 0
.../mac/qcocoawindowcustomthemeframe_mac_p.h | 0
.../platforms/mac/qcocoawindowdelegate_mac.mm | 0
.../mac/qcocoawindowdelegate_mac_p.h | 0
.../platforms/mac/qcolormap_mac.cpp | 0
.../platforms/mac/qcursor_mac.mm | 0
.../platforms/mac/qdesktopwidget_mac.mm | 0
.../platforms/mac/qdesktopwidget_mac_p.h | 0
.../platforms/mac/qdnd_mac.mm | 0
.../platforms/mac/qeventdispatcher_mac.mm | 0
.../platforms/mac/qeventdispatcher_mac_p.h | 0
.../platforms/mac/qfont_mac.cpp | 0
.../platforms/mac/qfontdatabase_mac.cpp | 0
.../platforms/mac/qfontengine_coretext.mm | 0
.../platforms/mac/qfontengine_coretext_p.h | 0
.../platforms/mac/qfontengine_mac.mm | 0
.../platforms/mac/qfontengine_mac_p.h | 0
.../platforms/mac/qkeymapper_mac.cpp | 0
.../platforms/mac/qmacdefines_mac.h | 0
.../mac/qmacgesturerecognizer_mac.mm | 0
.../mac/qmacgesturerecognizer_mac_p.h | 0
.../platforms/mac/qmime_mac.cpp | 0
.../platforms/mac/qmultitouch_mac.mm | 0
.../platforms/mac/qmultitouch_mac_p.h | 0
.../platforms/mac/qnsframeview_mac_p.h | 0
.../platforms/mac/qnsthemeframe_mac_p.h | 0
.../platforms/mac/qnstitledframe_mac_p.h | 0
.../platforms/mac/qpaintdevice_mac.cpp | 0
.../platforms/mac/qpaintengine_mac.cpp | 0
.../platforms/mac/qpaintengine_mac_p.h | 0
.../platforms/mac/qpixmap_mac.cpp | 0
.../platforms/mac/qpixmap_mac_p.h | 0
.../platforms/mac/qprintengine_mac.mm | 0
.../platforms/mac/qprintengine_mac_p.h | 0
.../platforms/mac/qprinterinfo_mac.cpp | 0
.../platforms/mac/qrawfont_mac.cpp | 0
.../platforms/mac/qregion_mac.cpp | 0
.../platforms/mac/qsound_mac.mm | 0
.../platforms/mac/qt_cocoa_helpers_mac.mm | 0
.../platforms/mac/qt_cocoa_helpers_mac_p.h | 0
src/{gui => widgets}/platforms/mac/qt_mac.cpp | 0
src/{gui => widgets}/platforms/mac/qt_mac_p.h | 0
.../platforms/mac/qtextengine_mac.cpp | 0
.../platforms/mac/qwidget_mac.mm | 0
.../platforms/s60/qapplication_s60.cpp | 0
.../platforms/s60/qclipboard_s60.cpp | 0
.../platforms/s60/qcolormap_s60.cpp | 0
.../platforms/s60/qcursor_s60.cpp | 0
.../platforms/s60/qdesktopwidget_s60.cpp | 0
.../platforms/s60/qdnd_s60.cpp | 0
.../platforms/s60/qeventdispatcher_s60.cpp | 0
.../platforms/s60/qeventdispatcher_s60_p.h | 0
.../platforms/s60/qfont_s60.cpp | 0
.../platforms/s60/qfontdatabase_s60.cpp | 0
.../platforms/s60/qfontengine_s60.cpp | 0
.../platforms/s60/qfontengine_s60_p.h | 0
.../platforms/s60/qkeymapper_s60.cpp | 0
.../platforms/s60/qpaintengine_s60.cpp | 0
.../platforms/s60/qpaintengine_s60_p.h | 0
.../platforms/s60/qpixmap_s60.cpp | 0
.../platforms/s60/qpixmap_s60_p.h | 0
.../platforms/s60/qregion_s60.cpp | 0
.../platforms/s60/qsoftkeymanager_s60.cpp | 0
.../platforms/s60/qsoftkeymanager_s60_p.h | 0
.../platforms/s60/qsound_s60.cpp | 0
src/{gui => widgets}/platforms/s60/qt_s60_p.h | 0
.../platforms/s60/qwidget_s60.cpp | 0
.../platforms/win/qapplication_win.cpp | 0
.../platforms/win/qclipboard_win.cpp | 0
.../platforms/win/qcolormap_win.cpp | 0
.../platforms/win/qcursor_win.cpp | 0
.../platforms/win/qdesktopwidget_win.cpp | 0
.../platforms/win/qdnd_win.cpp | 0
.../platforms/win/qfont_win.cpp | 0
.../platforms/win/qfontdatabase_win.cpp | 0
.../platforms/win/qfontengine_win.cpp | 0
.../platforms/win/qfontengine_win_p.h | 0
.../platforms/win/qguifunctions_wince.cpp | 0
.../platforms/win/qguifunctions_wince.h | 0
.../platforms/win/qkeymapper_win.cpp | 0
.../platforms/win/qmime_win.cpp | 0
.../platforms/win/qole_win.cpp | 0
.../platforms/win/qpaintdevice_win.cpp | 0
.../platforms/win/qpixmap_win.cpp | 0
.../platforms/win/qprintengine_win.cpp | 0
.../platforms/win/qprintengine_win_p.h | 0
.../platforms/win/qprinterinfo_win.cpp | 0
.../platforms/win/qrawfont_win.cpp | 0
.../platforms/win/qregion_win.cpp | 0
.../platforms/win/qsound_win.cpp | 0
.../platforms/win/qwidget_win.cpp | 0
.../platforms/win/qwidget_wince.cpp | 0
.../platforms/win/qwindowdefs_win.h | 0
.../qwinnativepangesturerecognizer_win.cpp | 0
.../qwinnativepangesturerecognizer_win_p.h | 0
.../platforms/x11/qapplication_x11.cpp | 0
.../platforms/x11/qclipboard_x11.cpp | 0
.../platforms/x11/qcolormap_x11.cpp | 0
.../platforms/x11/qcursor_x11.cpp | 0
.../platforms/x11/qdesktopwidget_x11.cpp | 0
.../platforms/x11/qdnd_x11.cpp | 0
.../platforms/x11/qeventdispatcher_x11.cpp | 0
.../platforms/x11/qeventdispatcher_x11_p.h | 0
.../platforms/x11/qfont_x11.cpp | 0
.../platforms/x11/qfontdatabase_x11.cpp | 0
.../platforms/x11/qfontengine_x11.cpp | 0
.../platforms/x11/qfontengine_x11_p.h | 0
src/{gui => widgets}/platforms/x11/qkde.cpp | 0
src/{gui => widgets}/platforms/x11/qkde_p.h | 0
.../platforms/x11/qkeymapper_x11.cpp | 0
.../platforms/x11/qkeymapper_x11_p.cpp | 0
.../platforms/x11/qmotifdnd_x11.cpp | 0
.../platforms/x11/qpaintdevice_x11.cpp | 0
.../platforms/x11/qpaintengine_x11.cpp | 0
.../platforms/x11/qpaintengine_x11_p.h | 0
.../platforms/x11/qpixmap_x11.cpp | 0
.../platforms/x11/qpixmap_x11_p.h | 0
.../platforms/x11/qregion_x11.cpp | 0
.../platforms/x11/qsound_x11.cpp | 0
src/{gui => widgets}/platforms/x11/qt_x11_p.h | 0
.../platforms/x11/qwidget_x11.cpp | 0
.../platforms/x11/qwidgetcreate_x11.cpp | 0
.../platforms/x11/qx11embed_x11.cpp | 0
.../platforms/x11/qx11embed_x11.h | 0
.../platforms/x11/qx11info_x11.cpp | 0
.../platforms/x11/qx11info_x11.h | 0
.../s60framework/qs60mainapplication.cpp | 0
.../s60framework/qs60mainapplication.h | 0
.../s60framework/qs60mainapplication_p.h | 0
.../s60framework/qs60mainappui.cpp | 0
.../s60framework/qs60mainappui.h | 0
.../s60framework/qs60maindocument.cpp | 0
.../s60framework/qs60maindocument.h | 0
.../s60framework/s60framework.pri | 0
src/{gui => widgets}/s60framework/s60main.rss | 0
.../statemachine/qbasickeyeventtransition.cpp | 0
.../statemachine/qbasickeyeventtransition_p.h | 0
.../qbasicmouseeventtransition.cpp | 0
.../qbasicmouseeventtransition_p.h | 0
.../statemachine/qguistatemachine.cpp | 0
.../statemachine/qkeyeventtransition.cpp | 0
.../statemachine/qkeyeventtransition.h | 0
.../statemachine/qmouseeventtransition.cpp | 0
.../statemachine/qmouseeventtransition.h | 0
.../statemachine/statemachine.pri | 0
.../styles/images/cdr-128.png | Bin
src/{gui => widgets}/styles/images/cdr-16.png | Bin
src/{gui => widgets}/styles/images/cdr-32.png | Bin
.../styles/images/closedock-16.png | Bin
.../styles/images/closedock-down-16.png | Bin
.../styles/images/computer-16.png | Bin
.../styles/images/computer-32.png | Bin
.../styles/images/defaults60theme.blob | Bin
.../styles/images/desktop-16.png | Bin
.../styles/images/desktop-32.png | Bin
.../styles/images/dirclosed-128.png | Bin
.../styles/images/dirclosed-16.png | Bin
.../styles/images/dirclosed-32.png | Bin
.../styles/images/dirlink-128.png | Bin
.../styles/images/dirlink-16.png | Bin
.../styles/images/dirlink-32.png | Bin
.../styles/images/diropen-128.png | Bin
.../styles/images/diropen-16.png | Bin
.../styles/images/diropen-32.png | Bin
.../styles/images/dockdock-16.png | Bin
.../styles/images/dockdock-down-16.png | Bin
.../styles/images/down-128.png | Bin
.../styles/images/down-16.png | Bin
.../styles/images/down-32.png | Bin
.../styles/images/dvd-128.png | Bin
src/{gui => widgets}/styles/images/dvd-16.png | Bin
src/{gui => widgets}/styles/images/dvd-32.png | Bin
.../styles/images/file-128.png | Bin
.../styles/images/file-16.png | Bin
.../styles/images/file-32.png | Bin
.../styles/images/filecontents-128.png | Bin
.../styles/images/filecontents-16.png | Bin
.../styles/images/filecontents-32.png | Bin
.../styles/images/fileinfo-128.png | Bin
.../styles/images/fileinfo-16.png | Bin
.../styles/images/fileinfo-32.png | Bin
.../styles/images/filelink-128.png | Bin
.../styles/images/filelink-16.png | Bin
.../styles/images/filelink-32.png | Bin
.../styles/images/floppy-128.png | Bin
.../styles/images/floppy-16.png | Bin
.../styles/images/floppy-32.png | Bin
.../styles/images/fontbitmap-16.png | Bin
.../styles/images/fonttruetype-16.png | Bin
.../styles/images/harddrive-128.png | Bin
.../styles/images/harddrive-16.png | Bin
.../styles/images/harddrive-32.png | Bin
.../styles/images/left-128.png | Bin
.../styles/images/left-16.png | Bin
.../styles/images/left-32.png | Bin
.../styles/images/media-pause-16.png | Bin
.../styles/images/media-pause-32.png | Bin
.../styles/images/media-play-16.png | Bin
.../styles/images/media-play-32.png | Bin
.../styles/images/media-seek-backward-16.png | Bin
.../styles/images/media-seek-backward-32.png | Bin
.../styles/images/media-seek-forward-16.png | Bin
.../styles/images/media-seek-forward-32.png | Bin
.../styles/images/media-skip-backward-16.png | Bin
.../styles/images/media-skip-backward-32.png | Bin
.../styles/images/media-skip-forward-16.png | Bin
.../styles/images/media-skip-forward-32.png | Bin
.../styles/images/media-stop-16.png | Bin
.../styles/images/media-stop-32.png | Bin
.../styles/images/media-volume-16.png | Bin
.../styles/images/media-volume-muted-16.png | Bin
.../styles/images/networkdrive-128.png | Bin
.../styles/images/networkdrive-16.png | Bin
.../styles/images/networkdrive-32.png | Bin
.../styles/images/newdirectory-128.png | Bin
.../styles/images/newdirectory-16.png | Bin
.../styles/images/newdirectory-32.png | Bin
.../styles/images/parentdir-128.png | Bin
.../styles/images/parentdir-16.png | Bin
.../styles/images/parentdir-32.png | Bin
.../styles/images/refresh-24.png | Bin
.../styles/images/refresh-32.png | Bin
.../styles/images/right-128.png | Bin
.../styles/images/right-16.png | Bin
.../styles/images/right-32.png | Bin
.../images/standardbutton-apply-128.png | Bin
.../styles/images/standardbutton-apply-16.png | Bin
.../styles/images/standardbutton-apply-32.png | Bin
.../images/standardbutton-cancel-128.png | Bin
.../images/standardbutton-cancel-16.png | Bin
.../images/standardbutton-cancel-32.png | Bin
.../images/standardbutton-clear-128.png | Bin
.../styles/images/standardbutton-clear-16.png | Bin
.../styles/images/standardbutton-clear-32.png | Bin
.../images/standardbutton-close-128.png | Bin
.../styles/images/standardbutton-close-16.png | Bin
.../styles/images/standardbutton-close-32.png | Bin
.../images/standardbutton-closetab-16.png | Bin
.../standardbutton-closetab-down-16.png | Bin
.../standardbutton-closetab-hover-16.png | Bin
.../images/standardbutton-delete-128.png | Bin
.../images/standardbutton-delete-16.png | Bin
.../images/standardbutton-delete-32.png | Bin
.../styles/images/standardbutton-help-128.png | Bin
.../styles/images/standardbutton-help-16.png | Bin
.../styles/images/standardbutton-help-32.png | Bin
.../styles/images/standardbutton-no-128.png | Bin
.../styles/images/standardbutton-no-16.png | Bin
.../styles/images/standardbutton-no-32.png | Bin
.../styles/images/standardbutton-ok-128.png | Bin
.../styles/images/standardbutton-ok-16.png | Bin
.../styles/images/standardbutton-ok-32.png | Bin
.../styles/images/standardbutton-open-128.png | Bin
.../styles/images/standardbutton-open-16.png | Bin
.../styles/images/standardbutton-open-32.png | Bin
.../styles/images/standardbutton-save-128.png | Bin
.../styles/images/standardbutton-save-16.png | Bin
.../styles/images/standardbutton-save-32.png | Bin
.../styles/images/standardbutton-yes-128.png | Bin
.../styles/images/standardbutton-yes-16.png | Bin
.../styles/images/standardbutton-yes-32.png | Bin
.../styles/images/stop-24.png | Bin
.../styles/images/stop-32.png | Bin
.../styles/images/trash-128.png | Bin
.../styles/images/trash-16.png | Bin
.../styles/images/trash-32.png | Bin
src/{gui => widgets}/styles/images/up-128.png | Bin
src/{gui => widgets}/styles/images/up-16.png | Bin
src/{gui => widgets}/styles/images/up-32.png | Bin
.../styles/images/viewdetailed-128.png | Bin
.../styles/images/viewdetailed-16.png | Bin
.../styles/images/viewdetailed-32.png | Bin
.../styles/images/viewlist-128.png | Bin
.../styles/images/viewlist-16.png | Bin
.../styles/images/viewlist-32.png | Bin
src/{gui => widgets}/styles/qcdestyle.cpp | 0
src/{gui => widgets}/styles/qcdestyle.h | 0
.../styles/qcleanlooksstyle.cpp | 0
.../styles/qcleanlooksstyle.h | 0
.../styles/qcleanlooksstyle_p.h | 0
src/{gui => widgets}/styles/qcommonstyle.cpp | 0
src/{gui => widgets}/styles/qcommonstyle.h | 0
src/{gui => widgets}/styles/qcommonstyle_p.h | 0
.../styles/qcommonstylepixmaps_p.h | 0
src/{gui => widgets}/styles/qdrawutil.cpp | 0
src/{gui => widgets}/styles/qdrawutil.h | 0
src/{gui => widgets}/styles/qgtkpainter.cpp | 0
src/{gui => widgets}/styles/qgtkpainter_p.h | 0
src/{gui => widgets}/styles/qgtkstyle.cpp | 0
src/{gui => widgets}/styles/qgtkstyle.h | 0
src/{gui => widgets}/styles/qgtkstyle_p.cpp | 0
src/{gui => widgets}/styles/qgtkstyle_p.h | 0
src/{gui => widgets}/styles/qmacstyle.qdoc | 0
src/{gui => widgets}/styles/qmacstyle_mac.h | 0
src/{gui => widgets}/styles/qmacstyle_mac.mm | 0
src/{gui => widgets}/styles/qmacstyle_mac_p.h | 0
.../styles/qmacstylepixmaps_mac_p.h | 0
src/{gui => widgets}/styles/qmotifstyle.cpp | 0
src/{gui => widgets}/styles/qmotifstyle.h | 0
src/{gui => widgets}/styles/qmotifstyle_p.h | 0
.../styles/qplastiquestyle.cpp | 0
src/{gui => widgets}/styles/qplastiquestyle.h | 0
src/{gui => widgets}/styles/qproxystyle.cpp | 0
src/{gui => widgets}/styles/qproxystyle.h | 0
src/{gui => widgets}/styles/qproxystyle_p.h | 0
src/{gui => widgets}/styles/qs60style.cpp | 0
src/{gui => widgets}/styles/qs60style.h | 0
src/{gui => widgets}/styles/qs60style_p.h | 0
src/{gui => widgets}/styles/qs60style_s60.cpp | 0
.../styles/qs60style_simulated.cpp | 0
.../styles/qs60style_stub.cpp | 0
src/{gui => widgets}/styles/qstyle.cpp | 0
src/{gui => widgets}/styles/qstyle.h | 0
src/{gui => widgets}/styles/qstyle.qrc | 0
src/{gui => widgets}/styles/qstyle_p.h | 0
src/{gui => widgets}/styles/qstyle_s60.qrc | 0
.../styles/qstyle_s60_simulated.qrc | 0
src/{gui => widgets}/styles/qstyle_wince.qrc | 0
src/{gui => widgets}/styles/qstylefactory.cpp | 0
src/{gui => widgets}/styles/qstylefactory.h | 0
src/{gui => widgets}/styles/qstylehelper.cpp | 0
src/{gui => widgets}/styles/qstylehelper_p.h | 0
src/{gui => widgets}/styles/qstyleoption.cpp | 0
src/{gui => widgets}/styles/qstyleoption.h | 0
src/{gui => widgets}/styles/qstylepainter.cpp | 0
src/{gui => widgets}/styles/qstylepainter.h | 0
src/{gui => widgets}/styles/qstyleplugin.cpp | 0
src/{gui => widgets}/styles/qstyleplugin.h | 0
.../styles/qstylesheetstyle.cpp | 0
.../styles/qstylesheetstyle_default.cpp | 0
.../styles/qstylesheetstyle_p.h | 0
.../styles/qwindowscestyle.cpp | 0
src/{gui => widgets}/styles/qwindowscestyle.h | 0
.../styles/qwindowscestyle_p.h | 0
.../styles/qwindowsmobilestyle.cpp | 0
.../styles/qwindowsmobilestyle.h | 0
.../styles/qwindowsmobilestyle_p.h | 0
src/{gui => widgets}/styles/qwindowsstyle.cpp | 0
src/{gui => widgets}/styles/qwindowsstyle.h | 0
src/{gui => widgets}/styles/qwindowsstyle_p.h | 0
.../styles/qwindowsvistastyle.cpp | 0
.../styles/qwindowsvistastyle.h | 0
.../styles/qwindowsvistastyle_p.h | 0
.../styles/qwindowsxpstyle.cpp | 0
src/{gui => widgets}/styles/qwindowsxpstyle.h | 0
.../styles/qwindowsxpstyle_p.h | 0
src/{gui => widgets}/styles/styles.pri | 0
src/{gui => widgets}/symbian/images/blank.png | Bin
.../symbian/images/busy12.png | Bin
src/{gui => widgets}/symbian/images/busy3.png | Bin
src/{gui => widgets}/symbian/images/busy6.png | Bin
src/{gui => widgets}/symbian/images/busy9.png | Bin
.../symbian/images/closehand.png | Bin
src/{gui => widgets}/symbian/images/cross.png | Bin
.../symbian/images/forbidden.png | Bin
.../symbian/images/handpoint.png | Bin
src/{gui => widgets}/symbian/images/ibeam.png | Bin
.../symbian/images/openhand.png | Bin
.../symbian/images/pointer.png | Bin
.../symbian/images/sizeall.png | Bin
.../symbian/images/sizebdiag.png | Bin
.../symbian/images/sizefdiag.png | Bin
.../symbian/images/sizehor.png | Bin
.../symbian/images/sizever.png | Bin
.../symbian/images/splith.png | Bin
.../symbian/images/splitv.png | Bin
.../symbian/images/uparrow.png | Bin
src/{gui => widgets}/symbian/images/wait1.png | Bin
.../symbian/images/wait10.png | Bin
.../symbian/images/wait11.png | Bin
.../symbian/images/wait12.png | Bin
src/{gui => widgets}/symbian/images/wait2.png | Bin
src/{gui => widgets}/symbian/images/wait3.png | Bin
src/{gui => widgets}/symbian/images/wait4.png | Bin
src/{gui => widgets}/symbian/images/wait5.png | Bin
src/{gui => widgets}/symbian/images/wait6.png | Bin
src/{gui => widgets}/symbian/images/wait7.png | Bin
src/{gui => widgets}/symbian/images/wait8.png | Bin
src/{gui => widgets}/symbian/images/wait9.png | Bin
.../symbian/images/whatsthis.png | Bin
.../symbian/qsymbianevent.cpp | 0
src/{gui => widgets}/symbian/qsymbianevent.h | 0
.../symbian/symbianresources.qrc | 0
src/{gui => widgets}/to_be_moved/qdnd.cpp | 0
src/{gui => widgets}/to_be_moved/qdnd_p.h | 0
src/{gui => widgets}/to_be_moved/qdnd_qpa.cpp | 0
src/{gui => widgets}/to_be_moved/qdrag.cpp | 0
src/{gui => widgets}/to_be_moved/qdrag.h | 0
.../to_be_moved/qlinecontrol.cpp | 0
.../to_be_moved/qlinecontrol_p.h | 0
.../to_be_moved/qshortcut.cpp | 0
src/{gui => widgets}/to_be_moved/qshortcut.h | 0
.../to_be_moved/qshortcutmap.cpp | 0
.../to_be_moved/qshortcutmap_p.h | 0
.../to_be_moved/qtextcontrol.cpp | 0
.../to_be_moved/qtextcontrol_p.h | 0
.../to_be_moved/qtextcontrol_p_p.h | 0
.../to_be_moved/to_be_moved.pri | 0
src/{gui => widgets}/util/qcompleter.cpp | 0
src/{gui => widgets}/util/qcompleter.h | 0
src/{gui => widgets}/util/qcompleter_p.h | 0
src/{gui => widgets}/util/qflickgesture.cpp | 0
src/{gui => widgets}/util/qflickgesture_p.h | 0
src/{gui => widgets}/util/qscroller.cpp | 0
src/{gui => widgets}/util/qscroller.h | 0
src/{gui => widgets}/util/qscroller_mac.mm | 0
src/{gui => widgets}/util/qscroller_p.h | 0
.../util/qscrollerproperties.cpp | 0
.../util/qscrollerproperties.h | 0
.../util/qscrollerproperties_p.h | 0
src/{gui => widgets}/util/qsystemtrayicon.cpp | 0
src/{gui => widgets}/util/qsystemtrayicon.h | 0
.../util/qsystemtrayicon_mac.mm | 0
src/{gui => widgets}/util/qsystemtrayicon_p.h | 0
.../util/qsystemtrayicon_qpa.cpp | 0
.../util/qsystemtrayicon_win.cpp | 0
.../util/qsystemtrayicon_wince.cpp | 0
.../util/qsystemtrayicon_x11.cpp | 0
src/{gui => widgets}/util/qundogroup.cpp | 0
src/{gui => widgets}/util/qundogroup.h | 0
src/{gui => widgets}/util/qundostack.cpp | 0
src/{gui => widgets}/util/qundostack.h | 0
src/{gui => widgets}/util/qundostack_p.h | 0
src/{gui => widgets}/util/qundoview.cpp | 0
src/{gui => widgets}/util/qundoview.h | 0
src/{gui => widgets}/util/util.pri | 0
src/widgets/widgets.pro | 222 ++++++++++++++++++
.../widgets/qabstractbutton.cpp | 0
.../widgets/qabstractbutton.h | 0
.../widgets/qabstractbutton_p.h | 0
.../widgets/qabstractscrollarea.cpp | 0
.../widgets/qabstractscrollarea.h | 0
.../widgets/qabstractscrollarea_p.h | 0
.../widgets/qabstractslider.cpp | 0
.../widgets/qabstractslider.h | 0
.../widgets/qabstractslider_p.h | 0
.../widgets/qabstractspinbox.cpp | 0
.../widgets/qabstractspinbox.h | 0
.../widgets/qabstractspinbox_p.h | 0
src/{gui => widgets}/widgets/qbuttongroup.cpp | 0
src/{gui => widgets}/widgets/qbuttongroup.h | 0
.../widgets/qcalendartextnavigator_p.h | 0
.../widgets/qcalendarwidget.cpp | 0
.../widgets/qcalendarwidget.h | 0
src/{gui => widgets}/widgets/qcheckbox.cpp | 0
src/{gui => widgets}/widgets/qcheckbox.h | 0
.../widgets/qcocoamenu_mac.mm | 0
.../widgets/qcocoamenu_mac_p.h | 0
.../widgets/qcocoatoolbardelegate_mac.mm | 0
.../widgets/qcocoatoolbardelegate_mac_p.h | 0
src/{gui => widgets}/widgets/qcombobox.cpp | 0
src/{gui => widgets}/widgets/qcombobox.h | 0
src/{gui => widgets}/widgets/qcombobox_p.h | 0
.../widgets/qcommandlinkbutton.cpp | 0
.../widgets/qcommandlinkbutton.h | 0
.../widgets/qdatetimeedit.cpp | 0
src/{gui => widgets}/widgets/qdatetimeedit.h | 0
.../widgets/qdatetimeedit_p.h | 0
src/{gui => widgets}/widgets/qdial.cpp | 0
src/{gui => widgets}/widgets/qdial.h | 0
.../widgets/qdialogbuttonbox.cpp | 0
.../widgets/qdialogbuttonbox.h | 0
.../widgets/qdockarealayout.cpp | 0
.../widgets/qdockarealayout_p.h | 0
src/{gui => widgets}/widgets/qdockwidget.cpp | 0
src/{gui => widgets}/widgets/qdockwidget.h | 0
src/{gui => widgets}/widgets/qdockwidget_p.h | 0
src/{gui => widgets}/widgets/qeffects.cpp | 0
src/{gui => widgets}/widgets/qeffects_p.h | 0
src/{gui => widgets}/widgets/qfocusframe.cpp | 0
src/{gui => widgets}/widgets/qfocusframe.h | 0
.../widgets/qfontcombobox.cpp | 0
src/{gui => widgets}/widgets/qfontcombobox.h | 0
src/{gui => widgets}/widgets/qframe.cpp | 0
src/{gui => widgets}/widgets/qframe.h | 0
src/{gui => widgets}/widgets/qframe_p.h | 0
src/{gui => widgets}/widgets/qgroupbox.cpp | 0
src/{gui => widgets}/widgets/qgroupbox.h | 0
src/{gui => widgets}/widgets/qlabel.cpp | 0
src/{gui => widgets}/widgets/qlabel.h | 0
src/{gui => widgets}/widgets/qlabel_p.h | 0
src/{gui => widgets}/widgets/qlcdnumber.cpp | 0
src/{gui => widgets}/widgets/qlcdnumber.h | 0
src/{gui => widgets}/widgets/qlineedit.cpp | 0
src/{gui => widgets}/widgets/qlineedit.h | 0
src/{gui => widgets}/widgets/qlineedit_p.cpp | 0
src/{gui => widgets}/widgets/qlineedit_p.h | 0
.../widgets/qmaccocoaviewcontainer_mac.h | 0
.../widgets/qmaccocoaviewcontainer_mac.mm | 0
.../widgets/qmacnativewidget_mac.h | 0
.../widgets/qmacnativewidget_mac.mm | 0
src/{gui => widgets}/widgets/qmainwindow.cpp | 0
src/{gui => widgets}/widgets/qmainwindow.h | 0
.../widgets/qmainwindowlayout.cpp | 0
.../widgets/qmainwindowlayout_mac.mm | 0
.../widgets/qmainwindowlayout_p.h | 0
src/{gui => widgets}/widgets/qmdiarea.cpp | 0
src/{gui => widgets}/widgets/qmdiarea.h | 0
src/{gui => widgets}/widgets/qmdiarea_p.h | 0
.../widgets/qmdisubwindow.cpp | 0
src/{gui => widgets}/widgets/qmdisubwindow.h | 0
.../widgets/qmdisubwindow_p.h | 0
src/{gui => widgets}/widgets/qmenu.cpp | 0
src/{gui => widgets}/widgets/qmenu.h | 0
src/{gui => widgets}/widgets/qmenu_mac.mm | 0
src/{gui => widgets}/widgets/qmenu_p.h | 0
.../widgets/qmenu_symbian.cpp | 0
src/{gui => widgets}/widgets/qmenu_wince.cpp | 0
src/{gui => widgets}/widgets/qmenu_wince.rc | 0
.../widgets/qmenu_wince_resource_p.h | 0
src/{gui => widgets}/widgets/qmenubar.cpp | 0
src/{gui => widgets}/widgets/qmenubar.h | 0
src/{gui => widgets}/widgets/qmenubar_p.h | 0
src/{gui => widgets}/widgets/qmenudata.cpp | 0
src/{gui => widgets}/widgets/qmenudata.h | 0
.../widgets/qplaintextedit.cpp | 0
src/{gui => widgets}/widgets/qplaintextedit.h | 0
.../widgets/qplaintextedit_p.h | 0
.../widgets/qprintpreviewwidget.cpp | 0
.../widgets/qprintpreviewwidget.h | 0
src/{gui => widgets}/widgets/qprogressbar.cpp | 0
src/{gui => widgets}/widgets/qprogressbar.h | 0
src/{gui => widgets}/widgets/qpushbutton.cpp | 0
src/{gui => widgets}/widgets/qpushbutton.h | 0
src/{gui => widgets}/widgets/qpushbutton_p.h | 0
src/{gui => widgets}/widgets/qradiobutton.cpp | 0
src/{gui => widgets}/widgets/qradiobutton.h | 0
src/{gui => widgets}/widgets/qrubberband.cpp | 0
src/{gui => widgets}/widgets/qrubberband.h | 0
src/{gui => widgets}/widgets/qscrollarea.cpp | 0
src/{gui => widgets}/widgets/qscrollarea.h | 0
src/{gui => widgets}/widgets/qscrollarea_p.h | 0
src/{gui => widgets}/widgets/qscrollbar.cpp | 0
src/{gui => widgets}/widgets/qscrollbar.h | 0
src/{gui => widgets}/widgets/qsizegrip.cpp | 0
src/{gui => widgets}/widgets/qsizegrip.h | 0
src/{gui => widgets}/widgets/qslider.cpp | 0
src/{gui => widgets}/widgets/qslider.h | 0
src/{gui => widgets}/widgets/qspinbox.cpp | 0
src/{gui => widgets}/widgets/qspinbox.h | 0
.../widgets/qsplashscreen.cpp | 0
src/{gui => widgets}/widgets/qsplashscreen.h | 0
src/{gui => widgets}/widgets/qsplitter.cpp | 0
src/{gui => widgets}/widgets/qsplitter.h | 0
src/{gui => widgets}/widgets/qsplitter_p.h | 0
.../widgets/qstackedwidget.cpp | 0
src/{gui => widgets}/widgets/qstackedwidget.h | 0
src/{gui => widgets}/widgets/qstatusbar.cpp | 0
src/{gui => widgets}/widgets/qstatusbar.h | 0
src/{gui => widgets}/widgets/qtabbar.cpp | 0
src/{gui => widgets}/widgets/qtabbar.h | 0
src/{gui => widgets}/widgets/qtabbar_p.h | 0
src/{gui => widgets}/widgets/qtabwidget.cpp | 0
src/{gui => widgets}/widgets/qtabwidget.h | 0
src/{gui => widgets}/widgets/qtextbrowser.cpp | 0
src/{gui => widgets}/widgets/qtextbrowser.h | 0
src/{gui => widgets}/widgets/qtextedit.cpp | 0
src/{gui => widgets}/widgets/qtextedit.h | 0
src/{gui => widgets}/widgets/qtextedit_p.h | 0
src/{gui => widgets}/widgets/qtoolbar.cpp | 0
src/{gui => widgets}/widgets/qtoolbar.h | 0
src/{gui => widgets}/widgets/qtoolbar_p.h | 0
.../widgets/qtoolbararealayout.cpp | 0
.../widgets/qtoolbararealayout_p.h | 0
.../widgets/qtoolbarextension.cpp | 0
.../widgets/qtoolbarextension_p.h | 0
.../widgets/qtoolbarlayout.cpp | 0
.../widgets/qtoolbarlayout_p.h | 0
.../widgets/qtoolbarseparator.cpp | 0
.../widgets/qtoolbarseparator_p.h | 0
src/{gui => widgets}/widgets/qtoolbox.cpp | 0
src/{gui => widgets}/widgets/qtoolbox.h | 0
src/{gui => widgets}/widgets/qtoolbutton.cpp | 0
src/{gui => widgets}/widgets/qtoolbutton.h | 0
.../widgets/qwidgetanimator.cpp | 0
.../widgets/qwidgetanimator_p.h | 0
.../widgets/qwidgetresizehandler.cpp | 0
.../widgets/qwidgetresizehandler_p.h | 0
src/{gui => widgets}/widgets/qworkspace.cpp | 0
src/{gui => widgets}/widgets/qworkspace.h | 0
src/{gui => widgets}/widgets/widgets.pri | 0
sync.profile | 8 +
960 files changed, 330 insertions(+), 47 deletions(-)
create mode 100644 src/gui/guikernel/qt_gui_pch.h
create mode 100644 src/modules/qt_widgets.pri
rename src/{gui => widgets}/QtGui.dynlist (100%)
rename src/{gui => widgets}/accessible/accessible.pri (100%)
rename src/{gui => widgets}/accessible/qaccessible.cpp (100%)
rename src/{gui => widgets}/accessible/qaccessible.h (100%)
rename src/{gui => widgets}/accessible/qaccessible2.cpp (100%)
rename src/{gui => widgets}/accessible/qaccessible2.h (100%)
rename src/{gui => widgets}/accessible/qaccessible_mac.mm (100%)
rename src/{gui => widgets}/accessible/qaccessible_mac_carbon.cpp (100%)
rename src/{gui => widgets}/accessible/qaccessible_mac_cocoa.mm (100%)
rename src/{gui => widgets}/accessible/qaccessible_mac_p.h (100%)
rename src/{gui => widgets}/accessible/qaccessible_unix.cpp (100%)
rename src/{gui => widgets}/accessible/qaccessible_win.cpp (100%)
rename src/{gui => widgets}/accessible/qaccessiblebridge.cpp (100%)
rename src/{gui => widgets}/accessible/qaccessiblebridge.h (100%)
rename src/{gui => widgets}/accessible/qaccessibleobject.cpp (100%)
rename src/{gui => widgets}/accessible/qaccessibleobject.h (100%)
rename src/{gui => widgets}/accessible/qaccessibleplugin.cpp (100%)
rename src/{gui => widgets}/accessible/qaccessibleplugin.h (100%)
rename src/{gui => widgets}/accessible/qaccessiblewidget.cpp (100%)
rename src/{gui => widgets}/accessible/qaccessiblewidget.h (100%)
rename src/{gui => widgets}/animation/animation.pri (100%)
rename src/{gui => widgets}/animation/qguivariantanimation.cpp (100%)
rename src/{gui => widgets}/dialogs/dialogs.pri (100%)
rename src/{gui => widgets}/dialogs/images/fit-page-24.png (100%)
rename src/{gui => widgets}/dialogs/images/fit-page-32.png (100%)
rename src/{gui => widgets}/dialogs/images/fit-width-24.png (100%)
rename src/{gui => widgets}/dialogs/images/fit-width-32.png (100%)
rename src/{gui => widgets}/dialogs/images/go-first-24.png (100%)
rename src/{gui => widgets}/dialogs/images/go-first-32.png (100%)
rename src/{gui => widgets}/dialogs/images/go-last-24.png (100%)
rename src/{gui => widgets}/dialogs/images/go-last-32.png (100%)
rename src/{gui => widgets}/dialogs/images/go-next-24.png (100%)
rename src/{gui => widgets}/dialogs/images/go-next-32.png (100%)
rename src/{gui => widgets}/dialogs/images/go-previous-24.png (100%)
rename src/{gui => widgets}/dialogs/images/go-previous-32.png (100%)
rename src/{gui => widgets}/dialogs/images/layout-landscape-24.png (100%)
rename src/{gui => widgets}/dialogs/images/layout-landscape-32.png (100%)
rename src/{gui => widgets}/dialogs/images/layout-portrait-24.png (100%)
rename src/{gui => widgets}/dialogs/images/layout-portrait-32.png (100%)
rename src/{gui => widgets}/dialogs/images/page-setup-24.png (100%)
rename src/{gui => widgets}/dialogs/images/page-setup-32.png (100%)
rename src/{gui => widgets}/dialogs/images/print-24.png (100%)
rename src/{gui => widgets}/dialogs/images/print-32.png (100%)
rename src/{gui => widgets}/dialogs/images/qtlogo-64.png (100%)
rename src/{gui => widgets}/dialogs/images/status-color.png (100%)
rename src/{gui => widgets}/dialogs/images/status-gray-scale.png (100%)
rename src/{gui => widgets}/dialogs/images/view-page-multi-24.png (100%)
rename src/{gui => widgets}/dialogs/images/view-page-multi-32.png (100%)
rename src/{gui => widgets}/dialogs/images/view-page-one-24.png (100%)
rename src/{gui => widgets}/dialogs/images/view-page-one-32.png (100%)
rename src/{gui => widgets}/dialogs/images/view-page-sided-24.png (100%)
rename src/{gui => widgets}/dialogs/images/view-page-sided-32.png (100%)
rename src/{gui => widgets}/dialogs/images/zoom-in-24.png (100%)
rename src/{gui => widgets}/dialogs/images/zoom-in-32.png (100%)
rename src/{gui => widgets}/dialogs/images/zoom-out-24.png (100%)
rename src/{gui => widgets}/dialogs/images/zoom-out-32.png (100%)
rename src/{gui => widgets}/dialogs/qabstractpagesetupdialog.cpp (100%)
rename src/{gui => widgets}/dialogs/qabstractpagesetupdialog.h (100%)
rename src/{gui => widgets}/dialogs/qabstractpagesetupdialog_p.h (100%)
rename src/{gui => widgets}/dialogs/qabstractprintdialog.cpp (100%)
rename src/{gui => widgets}/dialogs/qabstractprintdialog.h (100%)
rename src/{gui => widgets}/dialogs/qabstractprintdialog_p.h (100%)
rename src/{gui => widgets}/dialogs/qcolordialog.cpp (100%)
rename src/{gui => widgets}/dialogs/qcolordialog.h (100%)
rename src/{gui => widgets}/dialogs/qcolordialog_mac.mm (100%)
rename src/{gui => widgets}/dialogs/qcolordialog_p.h (100%)
rename src/{gui => widgets}/dialogs/qcolordialog_symbian.cpp (100%)
rename src/{gui => widgets}/dialogs/qdialog.cpp (100%)
rename src/{gui => widgets}/dialogs/qdialog.h (100%)
rename src/{gui => widgets}/dialogs/qdialog_p.h (100%)
rename src/{gui => widgets}/dialogs/qdialogsbinarycompat_win.cpp (100%)
rename src/{gui => widgets}/dialogs/qerrormessage.cpp (100%)
rename src/{gui => widgets}/dialogs/qerrormessage.h (100%)
rename src/{gui => widgets}/dialogs/qfiledialog.cpp (100%)
rename src/{gui => widgets}/dialogs/qfiledialog.h (100%)
rename src/{gui => widgets}/dialogs/qfiledialog.ui (100%)
rename src/{gui => widgets}/dialogs/qfiledialog_embedded.ui (100%)
rename src/{gui => widgets}/dialogs/qfiledialog_mac.mm (100%)
rename src/{gui => widgets}/dialogs/qfiledialog_p.h (100%)
rename src/{gui => widgets}/dialogs/qfiledialog_symbian.cpp (100%)
rename src/{gui => widgets}/dialogs/qfiledialog_win.cpp (100%)
rename src/{gui => widgets}/dialogs/qfiledialog_win_p.h (100%)
rename src/{gui => widgets}/dialogs/qfileinfogatherer.cpp (100%)
rename src/{gui => widgets}/dialogs/qfileinfogatherer_p.h (100%)
rename src/{gui => widgets}/dialogs/qfilesystemmodel.cpp (100%)
rename src/{gui => widgets}/dialogs/qfilesystemmodel.h (100%)
rename src/{gui => widgets}/dialogs/qfilesystemmodel_p.h (100%)
rename src/{gui => widgets}/dialogs/qfontdialog.cpp (100%)
rename src/{gui => widgets}/dialogs/qfontdialog.h (100%)
rename src/{gui => widgets}/dialogs/qfontdialog_mac.mm (100%)
rename src/{gui => widgets}/dialogs/qfontdialog_p.h (100%)
rename src/{gui => widgets}/dialogs/qfscompleter_p.h (100%)
rename src/{gui => widgets}/dialogs/qinputdialog.cpp (100%)
rename src/{gui => widgets}/dialogs/qinputdialog.h (100%)
rename src/{gui => widgets}/dialogs/qmessagebox.cpp (100%)
rename src/{gui => widgets}/dialogs/qmessagebox.h (100%)
rename src/{gui => widgets}/dialogs/qmessagebox.qrc (100%)
rename src/{gui => widgets}/dialogs/qnspanelproxy_mac.mm (100%)
rename src/{gui => widgets}/dialogs/qpagesetupdialog.cpp (100%)
rename src/{gui => widgets}/dialogs/qpagesetupdialog.h (100%)
rename src/{gui => widgets}/dialogs/qpagesetupdialog_mac.mm (100%)
rename src/{gui => widgets}/dialogs/qpagesetupdialog_unix.cpp (100%)
rename src/{gui => widgets}/dialogs/qpagesetupdialog_unix_p.h (100%)
rename src/{gui => widgets}/dialogs/qpagesetupdialog_win.cpp (100%)
rename src/{gui => widgets}/dialogs/qpagesetupwidget.ui (100%)
rename src/{gui => widgets}/dialogs/qprintdialog.h (100%)
rename src/{gui => widgets}/dialogs/qprintdialog.qdoc (100%)
rename src/{gui => widgets}/dialogs/qprintdialog.qrc (100%)
rename src/{gui => widgets}/dialogs/qprintdialog_mac.mm (100%)
rename src/{gui => widgets}/dialogs/qprintdialog_unix.cpp (100%)
rename src/{gui => widgets}/dialogs/qprintdialog_win.cpp (100%)
rename src/{gui => widgets}/dialogs/qprintpreviewdialog.cpp (100%)
rename src/{gui => widgets}/dialogs/qprintpreviewdialog.h (100%)
rename src/{gui => widgets}/dialogs/qprintpropertieswidget.ui (100%)
rename src/{gui => widgets}/dialogs/qprintsettingsoutput.ui (100%)
rename src/{gui => widgets}/dialogs/qprintwidget.ui (100%)
rename src/{gui => widgets}/dialogs/qprogressdialog.cpp (100%)
rename src/{gui => widgets}/dialogs/qprogressdialog.h (100%)
rename src/{gui => widgets}/dialogs/qsidebar.cpp (100%)
rename src/{gui => widgets}/dialogs/qsidebar_p.h (100%)
rename src/{gui => widgets}/dialogs/qwizard.cpp (100%)
rename src/{gui => widgets}/dialogs/qwizard.h (100%)
rename src/{gui => widgets}/dialogs/qwizard_win.cpp (100%)
rename src/{gui => widgets}/dialogs/qwizard_win_p.h (100%)
rename src/{gui => widgets}/effects/effects.pri (100%)
rename src/{gui => widgets}/effects/qgraphicseffect.cpp (100%)
rename src/{gui => widgets}/effects/qgraphicseffect.h (100%)
rename src/{gui => widgets}/effects/qgraphicseffect_p.h (100%)
rename src/{gui => widgets}/effects/qpixmapfilter.cpp (100%)
rename src/{gui => widgets}/effects/qpixmapfilter_p.h (100%)
rename src/{gui => widgets}/graphicsview/graphicsview.pri (100%)
rename src/{gui => widgets}/graphicsview/qgraph_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsanchorlayout.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsanchorlayout.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsanchorlayout_p.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsanchorlayout_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsgridlayout.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsgridlayout.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsitem.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsitem.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsitem_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsitemanimation.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsitemanimation.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicslayout.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicslayout.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicslayout_p.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicslayout_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicslayoutitem.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicslayoutitem.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicslayoutitem_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicslinearlayout.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicslinearlayout.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsproxywidget.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsproxywidget.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsproxywidget_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsscene.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsscene.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsscene_bsp.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsscene_bsp_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsscene_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsscenebsptreeindex.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsscenebsptreeindex_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicssceneevent.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicssceneevent.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicssceneindex.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicssceneindex_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsscenelinearindex.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsscenelinearindex_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicstransform.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicstransform.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicstransform_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsview.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsview.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicsview_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicswidget.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicswidget.h (100%)
rename src/{gui => widgets}/graphicsview/qgraphicswidget_p.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgraphicswidget_p.h (100%)
rename src/{gui => widgets}/graphicsview/qgridlayoutengine.cpp (100%)
rename src/{gui => widgets}/graphicsview/qgridlayoutengine_p.h (100%)
rename src/{gui => widgets}/graphicsview/qsimplex_p.cpp (100%)
rename src/{gui => widgets}/graphicsview/qsimplex_p.h (100%)
rename src/{gui => widgets}/inputmethod/inputmethod.pri (100%)
rename src/{gui => widgets}/inputmethod/qcoefepinputcontext_p.h (100%)
rename src/{gui => widgets}/inputmethod/qcoefepinputcontext_s60.cpp (100%)
rename src/{gui => widgets}/inputmethod/qinputcontext.cpp (100%)
rename src/{gui => widgets}/inputmethod/qinputcontext.h (100%)
rename src/{gui => widgets}/inputmethod/qinputcontext_p.h (100%)
rename src/{gui => widgets}/inputmethod/qinputcontextfactory.cpp (100%)
rename src/{gui => widgets}/inputmethod/qinputcontextfactory.h (100%)
rename src/{gui => widgets}/inputmethod/qinputcontextplugin.cpp (100%)
rename src/{gui => widgets}/inputmethod/qinputcontextplugin.h (100%)
rename src/{gui => widgets}/inputmethod/qmacinputcontext_mac.cpp (100%)
rename src/{gui => widgets}/inputmethod/qmacinputcontext_p.h (100%)
rename src/{gui => widgets}/inputmethod/qwininputcontext_p.h (100%)
rename src/{gui => widgets}/inputmethod/qwininputcontext_win.cpp (100%)
rename src/{gui => widgets}/inputmethod/qximinputcontext_p.h (100%)
rename src/{gui => widgets}/inputmethod/qximinputcontext_x11.cpp (100%)
rename src/{gui => widgets}/itemviews/itemviews.pri (100%)
rename src/{gui => widgets}/itemviews/qabstractitemdelegate.cpp (100%)
rename src/{gui => widgets}/itemviews/qabstractitemdelegate.h (100%)
rename src/{gui => widgets}/itemviews/qabstractitemview.cpp (100%)
rename src/{gui => widgets}/itemviews/qabstractitemview.h (100%)
rename src/{gui => widgets}/itemviews/qabstractitemview_p.h (100%)
rename src/{gui => widgets}/itemviews/qabstractproxymodel.cpp (100%)
rename src/{gui => widgets}/itemviews/qabstractproxymodel.h (100%)
rename src/{gui => widgets}/itemviews/qabstractproxymodel_p.h (100%)
rename src/{gui => widgets}/itemviews/qbsptree.cpp (100%)
rename src/{gui => widgets}/itemviews/qbsptree_p.h (100%)
rename src/{gui => widgets}/itemviews/qcolumnview.cpp (100%)
rename src/{gui => widgets}/itemviews/qcolumnview.h (100%)
rename src/{gui => widgets}/itemviews/qcolumnview_p.h (100%)
rename src/{gui => widgets}/itemviews/qcolumnviewgrip.cpp (100%)
rename src/{gui => widgets}/itemviews/qcolumnviewgrip_p.h (100%)
rename src/{gui => widgets}/itemviews/qdatawidgetmapper.cpp (100%)
rename src/{gui => widgets}/itemviews/qdatawidgetmapper.h (100%)
rename src/{gui => widgets}/itemviews/qdirmodel.cpp (100%)
rename src/{gui => widgets}/itemviews/qdirmodel.h (100%)
rename src/{gui => widgets}/itemviews/qfileiconprovider.cpp (100%)
rename src/{gui => widgets}/itemviews/qfileiconprovider.h (100%)
rename src/{gui => widgets}/itemviews/qheaderview.cpp (100%)
rename src/{gui => widgets}/itemviews/qheaderview.h (100%)
rename src/{gui => widgets}/itemviews/qheaderview_p.h (100%)
rename src/{gui => widgets}/itemviews/qitemdelegate.cpp (100%)
rename src/{gui => widgets}/itemviews/qitemdelegate.h (100%)
rename src/{gui => widgets}/itemviews/qitemeditorfactory.cpp (100%)
rename src/{gui => widgets}/itemviews/qitemeditorfactory.h (100%)
rename src/{gui => widgets}/itemviews/qitemeditorfactory_p.h (100%)
rename src/{gui => widgets}/itemviews/qitemselectionmodel.cpp (100%)
rename src/{gui => widgets}/itemviews/qitemselectionmodel.h (100%)
rename src/{gui => widgets}/itemviews/qitemselectionmodel_p.h (100%)
rename src/{gui => widgets}/itemviews/qlistview.cpp (100%)
rename src/{gui => widgets}/itemviews/qlistview.h (100%)
rename src/{gui => widgets}/itemviews/qlistview_p.h (100%)
rename src/{gui => widgets}/itemviews/qlistwidget.cpp (100%)
rename src/{gui => widgets}/itemviews/qlistwidget.h (100%)
rename src/{gui => widgets}/itemviews/qlistwidget_p.h (100%)
rename src/{gui => widgets}/itemviews/qproxymodel.cpp (100%)
rename src/{gui => widgets}/itemviews/qproxymodel.h (100%)
rename src/{gui => widgets}/itemviews/qproxymodel_p.h (100%)
rename src/{gui => widgets}/itemviews/qsortfilterproxymodel.cpp (100%)
rename src/{gui => widgets}/itemviews/qsortfilterproxymodel.h (100%)
rename src/{gui => widgets}/itemviews/qstandarditemmodel.cpp (100%)
rename src/{gui => widgets}/itemviews/qstandarditemmodel.h (100%)
rename src/{gui => widgets}/itemviews/qstandarditemmodel_p.h (100%)
rename src/{gui => widgets}/itemviews/qstringlistmodel.cpp (100%)
rename src/{gui => widgets}/itemviews/qstringlistmodel.h (100%)
rename src/{gui => widgets}/itemviews/qstyleditemdelegate.cpp (100%)
rename src/{gui => widgets}/itemviews/qstyleditemdelegate.h (100%)
rename src/{gui => widgets}/itemviews/qtableview.cpp (100%)
rename src/{gui => widgets}/itemviews/qtableview.h (100%)
rename src/{gui => widgets}/itemviews/qtableview_p.h (100%)
rename src/{gui => widgets}/itemviews/qtablewidget.cpp (100%)
rename src/{gui => widgets}/itemviews/qtablewidget.h (100%)
rename src/{gui => widgets}/itemviews/qtablewidget_p.h (100%)
rename src/{gui => widgets}/itemviews/qtreeview.cpp (100%)
rename src/{gui => widgets}/itemviews/qtreeview.h (100%)
rename src/{gui => widgets}/itemviews/qtreeview_p.h (100%)
rename src/{gui => widgets}/itemviews/qtreewidget.cpp (100%)
rename src/{gui => widgets}/itemviews/qtreewidget.h (100%)
rename src/{gui => widgets}/itemviews/qtreewidget_p.h (100%)
rename src/{gui => widgets}/itemviews/qtreewidgetitemiterator.cpp (100%)
rename src/{gui => widgets}/itemviews/qtreewidgetitemiterator.h (100%)
rename src/{gui => widgets}/itemviews/qtreewidgetitemiterator_p.h (100%)
rename src/{gui => widgets}/itemviews/qwidgetitemdata_p.h (100%)
rename src/{gui => widgets}/kernel/kernel.pri (100%)
rename src/{gui => widgets}/kernel/mac.pri (100%)
rename src/{gui => widgets}/kernel/qaction.cpp (100%)
rename src/{gui => widgets}/kernel/qaction.h (100%)
rename src/{gui => widgets}/kernel/qaction_p.h (100%)
rename src/{gui => widgets}/kernel/qactiongroup.cpp (100%)
rename src/{gui => widgets}/kernel/qactiongroup.h (100%)
rename src/{gui => widgets}/kernel/qapplication.cpp (100%)
rename src/{gui => widgets}/kernel/qapplication.h (100%)
rename src/{gui => widgets}/kernel/qapplication_p.h (100%)
rename src/{gui => widgets}/kernel/qapplication_qpa.cpp (100%)
rename src/{gui => widgets}/kernel/qbackingstore.cpp (100%)
rename src/{gui => widgets}/kernel/qbackingstore_p.h (100%)
rename src/{gui => widgets}/kernel/qboxlayout.cpp (100%)
rename src/{gui => widgets}/kernel/qboxlayout.h (100%)
rename src/{gui => widgets}/kernel/qdesktopwidget.cpp (100%)
rename src/{gui => widgets}/kernel/qdesktopwidget.h (100%)
rename src/{gui => widgets}/kernel/qdesktopwidget.qdoc (100%)
rename src/{gui => widgets}/kernel/qdesktopwidget_qpa.cpp (100%)
rename src/{gui => widgets}/kernel/qdesktopwidget_qpa_p.h (100%)
rename src/{gui => widgets}/kernel/qformlayout.cpp (100%)
rename src/{gui => widgets}/kernel/qformlayout.h (100%)
rename src/{gui => widgets}/kernel/qgesture.cpp (100%)
rename src/{gui => widgets}/kernel/qgesture.h (100%)
rename src/{gui => widgets}/kernel/qgesture_p.h (100%)
rename src/{gui => widgets}/kernel/qgesturemanager.cpp (100%)
rename src/{gui => widgets}/kernel/qgesturemanager_p.h (100%)
rename src/{gui => widgets}/kernel/qgesturerecognizer.cpp (100%)
rename src/{gui => widgets}/kernel/qgesturerecognizer.h (100%)
rename src/{gui => widgets}/kernel/qgridlayout.cpp (100%)
rename src/{gui => widgets}/kernel/qgridlayout.h (100%)
rename src/{gui => widgets}/kernel/qguieventdispatcher_glib.cpp (100%)
rename src/{gui => widgets}/kernel/qguieventdispatcher_glib_p.h (100%)
rename src/{gui => widgets}/kernel/qguiplatformplugin.cpp (100%)
rename src/{gui => widgets}/kernel/qguiplatformplugin_p.h (100%)
rename src/{gui => widgets}/kernel/qicon.cpp (100%)
rename src/{gui => widgets}/kernel/qicon.h (100%)
rename src/{gui => widgets}/kernel/qicon_p.h (100%)
rename src/{gui => widgets}/kernel/qiconengine.cpp (100%)
rename src/{gui => widgets}/kernel/qiconengine.h (100%)
rename src/{gui => widgets}/kernel/qiconengineplugin.cpp (100%)
rename src/{gui => widgets}/kernel/qiconengineplugin.h (100%)
rename src/{gui => widgets}/kernel/qiconloader.cpp (100%)
rename src/{gui => widgets}/kernel/qiconloader_p.h (100%)
rename src/{gui => widgets}/kernel/qlayout.cpp (100%)
rename src/{gui => widgets}/kernel/qlayout.h (100%)
rename src/{gui => widgets}/kernel/qlayout_p.h (100%)
rename src/{gui => widgets}/kernel/qlayoutengine.cpp (100%)
rename src/{gui => widgets}/kernel/qlayoutengine_p.h (100%)
rename src/{gui => widgets}/kernel/qlayoutitem.cpp (100%)
rename src/{gui => widgets}/kernel/qlayoutitem.h (100%)
rename src/{gui => widgets}/kernel/qsizepolicy.h (100%)
rename src/{gui => widgets}/kernel/qsizepolicy.qdoc (100%)
rename src/{gui => widgets}/kernel/qsoftkeymanager.cpp (100%)
rename src/{gui => widgets}/kernel/qsoftkeymanager_common_p.h (100%)
rename src/{gui => widgets}/kernel/qsoftkeymanager_p.h (100%)
rename src/{gui => widgets}/kernel/qsound.cpp (100%)
rename src/{gui => widgets}/kernel/qsound.h (100%)
rename src/{gui => widgets}/kernel/qsound_p.h (100%)
rename src/{gui => widgets}/kernel/qstackedlayout.cpp (100%)
rename src/{gui => widgets}/kernel/qstackedlayout.h (100%)
rename src/{gui => widgets}/kernel/qstandardgestures.cpp (100%)
rename src/{gui => widgets}/kernel/qstandardgestures_p.h (100%)
rename src/{gui => widgets}/kernel/qt_gui_pch.h (100%)
rename src/{gui => widgets}/kernel/qtooltip.cpp (100%)
rename src/{gui => widgets}/kernel/qtooltip.h (100%)
rename src/{gui => widgets}/kernel/qwhatsthis.cpp (100%)
rename src/{gui => widgets}/kernel/qwhatsthis.h (100%)
rename src/{gui => widgets}/kernel/qwidget.cpp (100%)
rename src/{gui => widgets}/kernel/qwidget.h (100%)
rename src/{gui => widgets}/kernel/qwidget_p.h (100%)
rename src/{gui => widgets}/kernel/qwidget_qpa.cpp (100%)
rename src/{gui => widgets}/kernel/qwidgetaction.cpp (100%)
rename src/{gui => widgets}/kernel/qwidgetaction.h (100%)
rename src/{gui => widgets}/kernel/qwidgetaction_p.h (100%)
rename src/{gui => widgets}/kernel/qwidgetwindow_qpa.cpp (100%)
rename src/{gui => widgets}/kernel/qwidgetwindow_qpa_p.h (100%)
rename src/{gui => widgets}/kernel/symbian.pri (100%)
rename src/{gui => widgets}/kernel/win.pri (100%)
rename src/{gui => widgets}/kernel/x11.pri (100%)
rename src/{gui => widgets}/mac/images/copyarrowcursor.png (100%)
rename src/{gui => widgets}/mac/images/forbiddencursor.png (100%)
rename src/{gui => widgets}/mac/images/leopard-unified-toolbar-on.png (100%)
rename src/{gui => widgets}/mac/images/pluscursor.png (100%)
rename src/{gui => widgets}/mac/images/spincursor.png (100%)
rename src/{gui => widgets}/mac/images/waitcursor.png (100%)
rename src/{gui => widgets}/mac/macresources.qrc (100%)
rename src/{gui => widgets}/mac/qt_menu.nib/classes.nib (100%)
rename src/{gui => widgets}/mac/qt_menu.nib/info.nib (100%)
rename src/{gui => widgets}/mac/qt_menu.nib/keyedobjects.nib (100%)
rename src/{gui => widgets}/platforms/mac/qapplication_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qclipboard_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qcocoaapplication_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qcocoaapplication_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qcocoaapplicationdelegate_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qcocoaapplicationdelegate_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qcocoaintrospection_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qcocoaintrospection_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qcocoamenuloader_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qcocoamenuloader_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qcocoapanel_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qcocoapanel_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qcocoasharedwindowmethods_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qcocoaview_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qcocoaview_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qcocoawindow_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qcocoawindow_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qcocoawindowcustomthemeframe_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qcocoawindowcustomthemeframe_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qcocoawindowdelegate_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qcocoawindowdelegate_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qcolormap_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qcursor_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qdesktopwidget_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qdesktopwidget_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qdnd_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qeventdispatcher_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qeventdispatcher_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qfont_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qfontdatabase_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qfontengine_coretext.mm (100%)
rename src/{gui => widgets}/platforms/mac/qfontengine_coretext_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qfontengine_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qfontengine_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qkeymapper_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qmacdefines_mac.h (100%)
rename src/{gui => widgets}/platforms/mac/qmacgesturerecognizer_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qmacgesturerecognizer_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qmime_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qmultitouch_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qmultitouch_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qnsframeview_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qnsthemeframe_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qnstitledframe_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qpaintdevice_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qpaintengine_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qpaintengine_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qpixmap_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qpixmap_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qprintengine_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qprintengine_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qprinterinfo_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qrawfont_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qregion_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qsound_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qt_cocoa_helpers_mac.mm (100%)
rename src/{gui => widgets}/platforms/mac/qt_cocoa_helpers_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qt_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qt_mac_p.h (100%)
rename src/{gui => widgets}/platforms/mac/qtextengine_mac.cpp (100%)
rename src/{gui => widgets}/platforms/mac/qwidget_mac.mm (100%)
rename src/{gui => widgets}/platforms/s60/qapplication_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qclipboard_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qcolormap_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qcursor_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qdesktopwidget_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qdnd_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qeventdispatcher_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qeventdispatcher_s60_p.h (100%)
rename src/{gui => widgets}/platforms/s60/qfont_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qfontdatabase_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qfontengine_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qfontengine_s60_p.h (100%)
rename src/{gui => widgets}/platforms/s60/qkeymapper_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qpaintengine_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qpaintengine_s60_p.h (100%)
rename src/{gui => widgets}/platforms/s60/qpixmap_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qpixmap_s60_p.h (100%)
rename src/{gui => widgets}/platforms/s60/qregion_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qsoftkeymanager_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qsoftkeymanager_s60_p.h (100%)
rename src/{gui => widgets}/platforms/s60/qsound_s60.cpp (100%)
rename src/{gui => widgets}/platforms/s60/qt_s60_p.h (100%)
rename src/{gui => widgets}/platforms/s60/qwidget_s60.cpp (100%)
rename src/{gui => widgets}/platforms/win/qapplication_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qclipboard_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qcolormap_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qcursor_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qdesktopwidget_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qdnd_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qfont_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qfontdatabase_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qfontengine_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qfontengine_win_p.h (100%)
rename src/{gui => widgets}/platforms/win/qguifunctions_wince.cpp (100%)
rename src/{gui => widgets}/platforms/win/qguifunctions_wince.h (100%)
rename src/{gui => widgets}/platforms/win/qkeymapper_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qmime_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qole_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qpaintdevice_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qpixmap_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qprintengine_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qprintengine_win_p.h (100%)
rename src/{gui => widgets}/platforms/win/qprinterinfo_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qrawfont_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qregion_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qsound_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qwidget_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qwidget_wince.cpp (100%)
rename src/{gui => widgets}/platforms/win/qwindowdefs_win.h (100%)
rename src/{gui => widgets}/platforms/win/qwinnativepangesturerecognizer_win.cpp (100%)
rename src/{gui => widgets}/platforms/win/qwinnativepangesturerecognizer_win_p.h (100%)
rename src/{gui => widgets}/platforms/x11/qapplication_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qclipboard_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qcolormap_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qcursor_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qdesktopwidget_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qdnd_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qeventdispatcher_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qeventdispatcher_x11_p.h (100%)
rename src/{gui => widgets}/platforms/x11/qfont_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qfontdatabase_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qfontengine_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qfontengine_x11_p.h (100%)
rename src/{gui => widgets}/platforms/x11/qkde.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qkde_p.h (100%)
rename src/{gui => widgets}/platforms/x11/qkeymapper_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qkeymapper_x11_p.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qmotifdnd_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qpaintdevice_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qpaintengine_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qpaintengine_x11_p.h (100%)
rename src/{gui => widgets}/platforms/x11/qpixmap_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qpixmap_x11_p.h (100%)
rename src/{gui => widgets}/platforms/x11/qregion_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qsound_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qt_x11_p.h (100%)
rename src/{gui => widgets}/platforms/x11/qwidget_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qwidgetcreate_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qx11embed_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qx11embed_x11.h (100%)
rename src/{gui => widgets}/platforms/x11/qx11info_x11.cpp (100%)
rename src/{gui => widgets}/platforms/x11/qx11info_x11.h (100%)
rename src/{gui => widgets}/s60framework/qs60mainapplication.cpp (100%)
rename src/{gui => widgets}/s60framework/qs60mainapplication.h (100%)
rename src/{gui => widgets}/s60framework/qs60mainapplication_p.h (100%)
rename src/{gui => widgets}/s60framework/qs60mainappui.cpp (100%)
rename src/{gui => widgets}/s60framework/qs60mainappui.h (100%)
rename src/{gui => widgets}/s60framework/qs60maindocument.cpp (100%)
rename src/{gui => widgets}/s60framework/qs60maindocument.h (100%)
rename src/{gui => widgets}/s60framework/s60framework.pri (100%)
rename src/{gui => widgets}/s60framework/s60main.rss (100%)
rename src/{gui => widgets}/statemachine/qbasickeyeventtransition.cpp (100%)
rename src/{gui => widgets}/statemachine/qbasickeyeventtransition_p.h (100%)
rename src/{gui => widgets}/statemachine/qbasicmouseeventtransition.cpp (100%)
rename src/{gui => widgets}/statemachine/qbasicmouseeventtransition_p.h (100%)
rename src/{gui => widgets}/statemachine/qguistatemachine.cpp (100%)
rename src/{gui => widgets}/statemachine/qkeyeventtransition.cpp (100%)
rename src/{gui => widgets}/statemachine/qkeyeventtransition.h (100%)
rename src/{gui => widgets}/statemachine/qmouseeventtransition.cpp (100%)
rename src/{gui => widgets}/statemachine/qmouseeventtransition.h (100%)
rename src/{gui => widgets}/statemachine/statemachine.pri (100%)
rename src/{gui => widgets}/styles/images/cdr-128.png (100%)
rename src/{gui => widgets}/styles/images/cdr-16.png (100%)
rename src/{gui => widgets}/styles/images/cdr-32.png (100%)
rename src/{gui => widgets}/styles/images/closedock-16.png (100%)
rename src/{gui => widgets}/styles/images/closedock-down-16.png (100%)
rename src/{gui => widgets}/styles/images/computer-16.png (100%)
rename src/{gui => widgets}/styles/images/computer-32.png (100%)
rename src/{gui => widgets}/styles/images/defaults60theme.blob (100%)
rename src/{gui => widgets}/styles/images/desktop-16.png (100%)
rename src/{gui => widgets}/styles/images/desktop-32.png (100%)
rename src/{gui => widgets}/styles/images/dirclosed-128.png (100%)
rename src/{gui => widgets}/styles/images/dirclosed-16.png (100%)
rename src/{gui => widgets}/styles/images/dirclosed-32.png (100%)
rename src/{gui => widgets}/styles/images/dirlink-128.png (100%)
rename src/{gui => widgets}/styles/images/dirlink-16.png (100%)
rename src/{gui => widgets}/styles/images/dirlink-32.png (100%)
rename src/{gui => widgets}/styles/images/diropen-128.png (100%)
rename src/{gui => widgets}/styles/images/diropen-16.png (100%)
rename src/{gui => widgets}/styles/images/diropen-32.png (100%)
rename src/{gui => widgets}/styles/images/dockdock-16.png (100%)
rename src/{gui => widgets}/styles/images/dockdock-down-16.png (100%)
rename src/{gui => widgets}/styles/images/down-128.png (100%)
rename src/{gui => widgets}/styles/images/down-16.png (100%)
rename src/{gui => widgets}/styles/images/down-32.png (100%)
rename src/{gui => widgets}/styles/images/dvd-128.png (100%)
rename src/{gui => widgets}/styles/images/dvd-16.png (100%)
rename src/{gui => widgets}/styles/images/dvd-32.png (100%)
rename src/{gui => widgets}/styles/images/file-128.png (100%)
rename src/{gui => widgets}/styles/images/file-16.png (100%)
rename src/{gui => widgets}/styles/images/file-32.png (100%)
rename src/{gui => widgets}/styles/images/filecontents-128.png (100%)
rename src/{gui => widgets}/styles/images/filecontents-16.png (100%)
rename src/{gui => widgets}/styles/images/filecontents-32.png (100%)
rename src/{gui => widgets}/styles/images/fileinfo-128.png (100%)
rename src/{gui => widgets}/styles/images/fileinfo-16.png (100%)
rename src/{gui => widgets}/styles/images/fileinfo-32.png (100%)
rename src/{gui => widgets}/styles/images/filelink-128.png (100%)
rename src/{gui => widgets}/styles/images/filelink-16.png (100%)
rename src/{gui => widgets}/styles/images/filelink-32.png (100%)
rename src/{gui => widgets}/styles/images/floppy-128.png (100%)
rename src/{gui => widgets}/styles/images/floppy-16.png (100%)
rename src/{gui => widgets}/styles/images/floppy-32.png (100%)
rename src/{gui => widgets}/styles/images/fontbitmap-16.png (100%)
rename src/{gui => widgets}/styles/images/fonttruetype-16.png (100%)
rename src/{gui => widgets}/styles/images/harddrive-128.png (100%)
rename src/{gui => widgets}/styles/images/harddrive-16.png (100%)
rename src/{gui => widgets}/styles/images/harddrive-32.png (100%)
rename src/{gui => widgets}/styles/images/left-128.png (100%)
rename src/{gui => widgets}/styles/images/left-16.png (100%)
rename src/{gui => widgets}/styles/images/left-32.png (100%)
rename src/{gui => widgets}/styles/images/media-pause-16.png (100%)
rename src/{gui => widgets}/styles/images/media-pause-32.png (100%)
rename src/{gui => widgets}/styles/images/media-play-16.png (100%)
rename src/{gui => widgets}/styles/images/media-play-32.png (100%)
rename src/{gui => widgets}/styles/images/media-seek-backward-16.png (100%)
rename src/{gui => widgets}/styles/images/media-seek-backward-32.png (100%)
rename src/{gui => widgets}/styles/images/media-seek-forward-16.png (100%)
rename src/{gui => widgets}/styles/images/media-seek-forward-32.png (100%)
rename src/{gui => widgets}/styles/images/media-skip-backward-16.png (100%)
rename src/{gui => widgets}/styles/images/media-skip-backward-32.png (100%)
rename src/{gui => widgets}/styles/images/media-skip-forward-16.png (100%)
rename src/{gui => widgets}/styles/images/media-skip-forward-32.png (100%)
rename src/{gui => widgets}/styles/images/media-stop-16.png (100%)
rename src/{gui => widgets}/styles/images/media-stop-32.png (100%)
rename src/{gui => widgets}/styles/images/media-volume-16.png (100%)
rename src/{gui => widgets}/styles/images/media-volume-muted-16.png (100%)
rename src/{gui => widgets}/styles/images/networkdrive-128.png (100%)
rename src/{gui => widgets}/styles/images/networkdrive-16.png (100%)
rename src/{gui => widgets}/styles/images/networkdrive-32.png (100%)
rename src/{gui => widgets}/styles/images/newdirectory-128.png (100%)
rename src/{gui => widgets}/styles/images/newdirectory-16.png (100%)
rename src/{gui => widgets}/styles/images/newdirectory-32.png (100%)
rename src/{gui => widgets}/styles/images/parentdir-128.png (100%)
rename src/{gui => widgets}/styles/images/parentdir-16.png (100%)
rename src/{gui => widgets}/styles/images/parentdir-32.png (100%)
rename src/{gui => widgets}/styles/images/refresh-24.png (100%)
rename src/{gui => widgets}/styles/images/refresh-32.png (100%)
rename src/{gui => widgets}/styles/images/right-128.png (100%)
rename src/{gui => widgets}/styles/images/right-16.png (100%)
rename src/{gui => widgets}/styles/images/right-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-apply-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-apply-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-apply-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-cancel-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-cancel-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-cancel-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-clear-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-clear-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-clear-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-close-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-close-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-close-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-closetab-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-closetab-down-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-closetab-hover-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-delete-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-delete-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-delete-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-help-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-help-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-help-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-no-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-no-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-no-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-ok-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-ok-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-ok-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-open-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-open-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-open-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-save-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-save-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-save-32.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-yes-128.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-yes-16.png (100%)
rename src/{gui => widgets}/styles/images/standardbutton-yes-32.png (100%)
rename src/{gui => widgets}/styles/images/stop-24.png (100%)
rename src/{gui => widgets}/styles/images/stop-32.png (100%)
rename src/{gui => widgets}/styles/images/trash-128.png (100%)
rename src/{gui => widgets}/styles/images/trash-16.png (100%)
rename src/{gui => widgets}/styles/images/trash-32.png (100%)
rename src/{gui => widgets}/styles/images/up-128.png (100%)
rename src/{gui => widgets}/styles/images/up-16.png (100%)
rename src/{gui => widgets}/styles/images/up-32.png (100%)
rename src/{gui => widgets}/styles/images/viewdetailed-128.png (100%)
rename src/{gui => widgets}/styles/images/viewdetailed-16.png (100%)
rename src/{gui => widgets}/styles/images/viewdetailed-32.png (100%)
rename src/{gui => widgets}/styles/images/viewlist-128.png (100%)
rename src/{gui => widgets}/styles/images/viewlist-16.png (100%)
rename src/{gui => widgets}/styles/images/viewlist-32.png (100%)
rename src/{gui => widgets}/styles/qcdestyle.cpp (100%)
rename src/{gui => widgets}/styles/qcdestyle.h (100%)
rename src/{gui => widgets}/styles/qcleanlooksstyle.cpp (100%)
rename src/{gui => widgets}/styles/qcleanlooksstyle.h (100%)
rename src/{gui => widgets}/styles/qcleanlooksstyle_p.h (100%)
rename src/{gui => widgets}/styles/qcommonstyle.cpp (100%)
rename src/{gui => widgets}/styles/qcommonstyle.h (100%)
rename src/{gui => widgets}/styles/qcommonstyle_p.h (100%)
rename src/{gui => widgets}/styles/qcommonstylepixmaps_p.h (100%)
rename src/{gui => widgets}/styles/qdrawutil.cpp (100%)
rename src/{gui => widgets}/styles/qdrawutil.h (100%)
rename src/{gui => widgets}/styles/qgtkpainter.cpp (100%)
rename src/{gui => widgets}/styles/qgtkpainter_p.h (100%)
rename src/{gui => widgets}/styles/qgtkstyle.cpp (100%)
rename src/{gui => widgets}/styles/qgtkstyle.h (100%)
rename src/{gui => widgets}/styles/qgtkstyle_p.cpp (100%)
rename src/{gui => widgets}/styles/qgtkstyle_p.h (100%)
rename src/{gui => widgets}/styles/qmacstyle.qdoc (100%)
rename src/{gui => widgets}/styles/qmacstyle_mac.h (100%)
rename src/{gui => widgets}/styles/qmacstyle_mac.mm (100%)
rename src/{gui => widgets}/styles/qmacstyle_mac_p.h (100%)
rename src/{gui => widgets}/styles/qmacstylepixmaps_mac_p.h (100%)
rename src/{gui => widgets}/styles/qmotifstyle.cpp (100%)
rename src/{gui => widgets}/styles/qmotifstyle.h (100%)
rename src/{gui => widgets}/styles/qmotifstyle_p.h (100%)
rename src/{gui => widgets}/styles/qplastiquestyle.cpp (100%)
rename src/{gui => widgets}/styles/qplastiquestyle.h (100%)
rename src/{gui => widgets}/styles/qproxystyle.cpp (100%)
rename src/{gui => widgets}/styles/qproxystyle.h (100%)
rename src/{gui => widgets}/styles/qproxystyle_p.h (100%)
rename src/{gui => widgets}/styles/qs60style.cpp (100%)
rename src/{gui => widgets}/styles/qs60style.h (100%)
rename src/{gui => widgets}/styles/qs60style_p.h (100%)
rename src/{gui => widgets}/styles/qs60style_s60.cpp (100%)
rename src/{gui => widgets}/styles/qs60style_simulated.cpp (100%)
rename src/{gui => widgets}/styles/qs60style_stub.cpp (100%)
rename src/{gui => widgets}/styles/qstyle.cpp (100%)
rename src/{gui => widgets}/styles/qstyle.h (100%)
rename src/{gui => widgets}/styles/qstyle.qrc (100%)
rename src/{gui => widgets}/styles/qstyle_p.h (100%)
rename src/{gui => widgets}/styles/qstyle_s60.qrc (100%)
rename src/{gui => widgets}/styles/qstyle_s60_simulated.qrc (100%)
rename src/{gui => widgets}/styles/qstyle_wince.qrc (100%)
rename src/{gui => widgets}/styles/qstylefactory.cpp (100%)
rename src/{gui => widgets}/styles/qstylefactory.h (100%)
rename src/{gui => widgets}/styles/qstylehelper.cpp (100%)
rename src/{gui => widgets}/styles/qstylehelper_p.h (100%)
rename src/{gui => widgets}/styles/qstyleoption.cpp (100%)
rename src/{gui => widgets}/styles/qstyleoption.h (100%)
rename src/{gui => widgets}/styles/qstylepainter.cpp (100%)
rename src/{gui => widgets}/styles/qstylepainter.h (100%)
rename src/{gui => widgets}/styles/qstyleplugin.cpp (100%)
rename src/{gui => widgets}/styles/qstyleplugin.h (100%)
rename src/{gui => widgets}/styles/qstylesheetstyle.cpp (100%)
rename src/{gui => widgets}/styles/qstylesheetstyle_default.cpp (100%)
rename src/{gui => widgets}/styles/qstylesheetstyle_p.h (100%)
rename src/{gui => widgets}/styles/qwindowscestyle.cpp (100%)
rename src/{gui => widgets}/styles/qwindowscestyle.h (100%)
rename src/{gui => widgets}/styles/qwindowscestyle_p.h (100%)
rename src/{gui => widgets}/styles/qwindowsmobilestyle.cpp (100%)
rename src/{gui => widgets}/styles/qwindowsmobilestyle.h (100%)
rename src/{gui => widgets}/styles/qwindowsmobilestyle_p.h (100%)
rename src/{gui => widgets}/styles/qwindowsstyle.cpp (100%)
rename src/{gui => widgets}/styles/qwindowsstyle.h (100%)
rename src/{gui => widgets}/styles/qwindowsstyle_p.h (100%)
rename src/{gui => widgets}/styles/qwindowsvistastyle.cpp (100%)
rename src/{gui => widgets}/styles/qwindowsvistastyle.h (100%)
rename src/{gui => widgets}/styles/qwindowsvistastyle_p.h (100%)
rename src/{gui => widgets}/styles/qwindowsxpstyle.cpp (100%)
rename src/{gui => widgets}/styles/qwindowsxpstyle.h (100%)
rename src/{gui => widgets}/styles/qwindowsxpstyle_p.h (100%)
rename src/{gui => widgets}/styles/styles.pri (100%)
rename src/{gui => widgets}/symbian/images/blank.png (100%)
rename src/{gui => widgets}/symbian/images/busy12.png (100%)
rename src/{gui => widgets}/symbian/images/busy3.png (100%)
rename src/{gui => widgets}/symbian/images/busy6.png (100%)
rename src/{gui => widgets}/symbian/images/busy9.png (100%)
rename src/{gui => widgets}/symbian/images/closehand.png (100%)
rename src/{gui => widgets}/symbian/images/cross.png (100%)
rename src/{gui => widgets}/symbian/images/forbidden.png (100%)
rename src/{gui => widgets}/symbian/images/handpoint.png (100%)
rename src/{gui => widgets}/symbian/images/ibeam.png (100%)
rename src/{gui => widgets}/symbian/images/openhand.png (100%)
rename src/{gui => widgets}/symbian/images/pointer.png (100%)
rename src/{gui => widgets}/symbian/images/sizeall.png (100%)
rename src/{gui => widgets}/symbian/images/sizebdiag.png (100%)
rename src/{gui => widgets}/symbian/images/sizefdiag.png (100%)
rename src/{gui => widgets}/symbian/images/sizehor.png (100%)
rename src/{gui => widgets}/symbian/images/sizever.png (100%)
rename src/{gui => widgets}/symbian/images/splith.png (100%)
rename src/{gui => widgets}/symbian/images/splitv.png (100%)
rename src/{gui => widgets}/symbian/images/uparrow.png (100%)
rename src/{gui => widgets}/symbian/images/wait1.png (100%)
rename src/{gui => widgets}/symbian/images/wait10.png (100%)
rename src/{gui => widgets}/symbian/images/wait11.png (100%)
rename src/{gui => widgets}/symbian/images/wait12.png (100%)
rename src/{gui => widgets}/symbian/images/wait2.png (100%)
rename src/{gui => widgets}/symbian/images/wait3.png (100%)
rename src/{gui => widgets}/symbian/images/wait4.png (100%)
rename src/{gui => widgets}/symbian/images/wait5.png (100%)
rename src/{gui => widgets}/symbian/images/wait6.png (100%)
rename src/{gui => widgets}/symbian/images/wait7.png (100%)
rename src/{gui => widgets}/symbian/images/wait8.png (100%)
rename src/{gui => widgets}/symbian/images/wait9.png (100%)
rename src/{gui => widgets}/symbian/images/whatsthis.png (100%)
rename src/{gui => widgets}/symbian/qsymbianevent.cpp (100%)
rename src/{gui => widgets}/symbian/qsymbianevent.h (100%)
rename src/{gui => widgets}/symbian/symbianresources.qrc (100%)
rename src/{gui => widgets}/to_be_moved/qdnd.cpp (100%)
rename src/{gui => widgets}/to_be_moved/qdnd_p.h (100%)
rename src/{gui => widgets}/to_be_moved/qdnd_qpa.cpp (100%)
rename src/{gui => widgets}/to_be_moved/qdrag.cpp (100%)
rename src/{gui => widgets}/to_be_moved/qdrag.h (100%)
rename src/{gui => widgets}/to_be_moved/qlinecontrol.cpp (100%)
rename src/{gui => widgets}/to_be_moved/qlinecontrol_p.h (100%)
rename src/{gui => widgets}/to_be_moved/qshortcut.cpp (100%)
rename src/{gui => widgets}/to_be_moved/qshortcut.h (100%)
rename src/{gui => widgets}/to_be_moved/qshortcutmap.cpp (100%)
rename src/{gui => widgets}/to_be_moved/qshortcutmap_p.h (100%)
rename src/{gui => widgets}/to_be_moved/qtextcontrol.cpp (100%)
rename src/{gui => widgets}/to_be_moved/qtextcontrol_p.h (100%)
rename src/{gui => widgets}/to_be_moved/qtextcontrol_p_p.h (100%)
rename src/{gui => widgets}/to_be_moved/to_be_moved.pri (100%)
rename src/{gui => widgets}/util/qcompleter.cpp (100%)
rename src/{gui => widgets}/util/qcompleter.h (100%)
rename src/{gui => widgets}/util/qcompleter_p.h (100%)
rename src/{gui => widgets}/util/qflickgesture.cpp (100%)
rename src/{gui => widgets}/util/qflickgesture_p.h (100%)
rename src/{gui => widgets}/util/qscroller.cpp (100%)
rename src/{gui => widgets}/util/qscroller.h (100%)
rename src/{gui => widgets}/util/qscroller_mac.mm (100%)
rename src/{gui => widgets}/util/qscroller_p.h (100%)
rename src/{gui => widgets}/util/qscrollerproperties.cpp (100%)
rename src/{gui => widgets}/util/qscrollerproperties.h (100%)
rename src/{gui => widgets}/util/qscrollerproperties_p.h (100%)
rename src/{gui => widgets}/util/qsystemtrayicon.cpp (100%)
rename src/{gui => widgets}/util/qsystemtrayicon.h (100%)
rename src/{gui => widgets}/util/qsystemtrayicon_mac.mm (100%)
rename src/{gui => widgets}/util/qsystemtrayicon_p.h (100%)
rename src/{gui => widgets}/util/qsystemtrayicon_qpa.cpp (100%)
rename src/{gui => widgets}/util/qsystemtrayicon_win.cpp (100%)
rename src/{gui => widgets}/util/qsystemtrayicon_wince.cpp (100%)
rename src/{gui => widgets}/util/qsystemtrayicon_x11.cpp (100%)
rename src/{gui => widgets}/util/qundogroup.cpp (100%)
rename src/{gui => widgets}/util/qundogroup.h (100%)
rename src/{gui => widgets}/util/qundostack.cpp (100%)
rename src/{gui => widgets}/util/qundostack.h (100%)
rename src/{gui => widgets}/util/qundostack_p.h (100%)
rename src/{gui => widgets}/util/qundoview.cpp (100%)
rename src/{gui => widgets}/util/qundoview.h (100%)
rename src/{gui => widgets}/util/util.pri (100%)
create mode 100644 src/widgets/widgets.pro
rename src/{gui => widgets}/widgets/qabstractbutton.cpp (100%)
rename src/{gui => widgets}/widgets/qabstractbutton.h (100%)
rename src/{gui => widgets}/widgets/qabstractbutton_p.h (100%)
rename src/{gui => widgets}/widgets/qabstractscrollarea.cpp (100%)
rename src/{gui => widgets}/widgets/qabstractscrollarea.h (100%)
rename src/{gui => widgets}/widgets/qabstractscrollarea_p.h (100%)
rename src/{gui => widgets}/widgets/qabstractslider.cpp (100%)
rename src/{gui => widgets}/widgets/qabstractslider.h (100%)
rename src/{gui => widgets}/widgets/qabstractslider_p.h (100%)
rename src/{gui => widgets}/widgets/qabstractspinbox.cpp (100%)
rename src/{gui => widgets}/widgets/qabstractspinbox.h (100%)
rename src/{gui => widgets}/widgets/qabstractspinbox_p.h (100%)
rename src/{gui => widgets}/widgets/qbuttongroup.cpp (100%)
rename src/{gui => widgets}/widgets/qbuttongroup.h (100%)
rename src/{gui => widgets}/widgets/qcalendartextnavigator_p.h (100%)
rename src/{gui => widgets}/widgets/qcalendarwidget.cpp (100%)
rename src/{gui => widgets}/widgets/qcalendarwidget.h (100%)
rename src/{gui => widgets}/widgets/qcheckbox.cpp (100%)
rename src/{gui => widgets}/widgets/qcheckbox.h (100%)
rename src/{gui => widgets}/widgets/qcocoamenu_mac.mm (100%)
rename src/{gui => widgets}/widgets/qcocoamenu_mac_p.h (100%)
rename src/{gui => widgets}/widgets/qcocoatoolbardelegate_mac.mm (100%)
rename src/{gui => widgets}/widgets/qcocoatoolbardelegate_mac_p.h (100%)
rename src/{gui => widgets}/widgets/qcombobox.cpp (100%)
rename src/{gui => widgets}/widgets/qcombobox.h (100%)
rename src/{gui => widgets}/widgets/qcombobox_p.h (100%)
rename src/{gui => widgets}/widgets/qcommandlinkbutton.cpp (100%)
rename src/{gui => widgets}/widgets/qcommandlinkbutton.h (100%)
rename src/{gui => widgets}/widgets/qdatetimeedit.cpp (100%)
rename src/{gui => widgets}/widgets/qdatetimeedit.h (100%)
rename src/{gui => widgets}/widgets/qdatetimeedit_p.h (100%)
rename src/{gui => widgets}/widgets/qdial.cpp (100%)
rename src/{gui => widgets}/widgets/qdial.h (100%)
rename src/{gui => widgets}/widgets/qdialogbuttonbox.cpp (100%)
rename src/{gui => widgets}/widgets/qdialogbuttonbox.h (100%)
rename src/{gui => widgets}/widgets/qdockarealayout.cpp (100%)
rename src/{gui => widgets}/widgets/qdockarealayout_p.h (100%)
rename src/{gui => widgets}/widgets/qdockwidget.cpp (100%)
rename src/{gui => widgets}/widgets/qdockwidget.h (100%)
rename src/{gui => widgets}/widgets/qdockwidget_p.h (100%)
rename src/{gui => widgets}/widgets/qeffects.cpp (100%)
rename src/{gui => widgets}/widgets/qeffects_p.h (100%)
rename src/{gui => widgets}/widgets/qfocusframe.cpp (100%)
rename src/{gui => widgets}/widgets/qfocusframe.h (100%)
rename src/{gui => widgets}/widgets/qfontcombobox.cpp (100%)
rename src/{gui => widgets}/widgets/qfontcombobox.h (100%)
rename src/{gui => widgets}/widgets/qframe.cpp (100%)
rename src/{gui => widgets}/widgets/qframe.h (100%)
rename src/{gui => widgets}/widgets/qframe_p.h (100%)
rename src/{gui => widgets}/widgets/qgroupbox.cpp (100%)
rename src/{gui => widgets}/widgets/qgroupbox.h (100%)
rename src/{gui => widgets}/widgets/qlabel.cpp (100%)
rename src/{gui => widgets}/widgets/qlabel.h (100%)
rename src/{gui => widgets}/widgets/qlabel_p.h (100%)
rename src/{gui => widgets}/widgets/qlcdnumber.cpp (100%)
rename src/{gui => widgets}/widgets/qlcdnumber.h (100%)
rename src/{gui => widgets}/widgets/qlineedit.cpp (100%)
rename src/{gui => widgets}/widgets/qlineedit.h (100%)
rename src/{gui => widgets}/widgets/qlineedit_p.cpp (100%)
rename src/{gui => widgets}/widgets/qlineedit_p.h (100%)
rename src/{gui => widgets}/widgets/qmaccocoaviewcontainer_mac.h (100%)
rename src/{gui => widgets}/widgets/qmaccocoaviewcontainer_mac.mm (100%)
rename src/{gui => widgets}/widgets/qmacnativewidget_mac.h (100%)
rename src/{gui => widgets}/widgets/qmacnativewidget_mac.mm (100%)
rename src/{gui => widgets}/widgets/qmainwindow.cpp (100%)
rename src/{gui => widgets}/widgets/qmainwindow.h (100%)
rename src/{gui => widgets}/widgets/qmainwindowlayout.cpp (100%)
rename src/{gui => widgets}/widgets/qmainwindowlayout_mac.mm (100%)
rename src/{gui => widgets}/widgets/qmainwindowlayout_p.h (100%)
rename src/{gui => widgets}/widgets/qmdiarea.cpp (100%)
rename src/{gui => widgets}/widgets/qmdiarea.h (100%)
rename src/{gui => widgets}/widgets/qmdiarea_p.h (100%)
rename src/{gui => widgets}/widgets/qmdisubwindow.cpp (100%)
rename src/{gui => widgets}/widgets/qmdisubwindow.h (100%)
rename src/{gui => widgets}/widgets/qmdisubwindow_p.h (100%)
rename src/{gui => widgets}/widgets/qmenu.cpp (100%)
rename src/{gui => widgets}/widgets/qmenu.h (100%)
rename src/{gui => widgets}/widgets/qmenu_mac.mm (100%)
rename src/{gui => widgets}/widgets/qmenu_p.h (100%)
rename src/{gui => widgets}/widgets/qmenu_symbian.cpp (100%)
rename src/{gui => widgets}/widgets/qmenu_wince.cpp (100%)
rename src/{gui => widgets}/widgets/qmenu_wince.rc (100%)
rename src/{gui => widgets}/widgets/qmenu_wince_resource_p.h (100%)
rename src/{gui => widgets}/widgets/qmenubar.cpp (100%)
rename src/{gui => widgets}/widgets/qmenubar.h (100%)
rename src/{gui => widgets}/widgets/qmenubar_p.h (100%)
rename src/{gui => widgets}/widgets/qmenudata.cpp (100%)
rename src/{gui => widgets}/widgets/qmenudata.h (100%)
rename src/{gui => widgets}/widgets/qplaintextedit.cpp (100%)
rename src/{gui => widgets}/widgets/qplaintextedit.h (100%)
rename src/{gui => widgets}/widgets/qplaintextedit_p.h (100%)
rename src/{gui => widgets}/widgets/qprintpreviewwidget.cpp (100%)
rename src/{gui => widgets}/widgets/qprintpreviewwidget.h (100%)
rename src/{gui => widgets}/widgets/qprogressbar.cpp (100%)
rename src/{gui => widgets}/widgets/qprogressbar.h (100%)
rename src/{gui => widgets}/widgets/qpushbutton.cpp (100%)
rename src/{gui => widgets}/widgets/qpushbutton.h (100%)
rename src/{gui => widgets}/widgets/qpushbutton_p.h (100%)
rename src/{gui => widgets}/widgets/qradiobutton.cpp (100%)
rename src/{gui => widgets}/widgets/qradiobutton.h (100%)
rename src/{gui => widgets}/widgets/qrubberband.cpp (100%)
rename src/{gui => widgets}/widgets/qrubberband.h (100%)
rename src/{gui => widgets}/widgets/qscrollarea.cpp (100%)
rename src/{gui => widgets}/widgets/qscrollarea.h (100%)
rename src/{gui => widgets}/widgets/qscrollarea_p.h (100%)
rename src/{gui => widgets}/widgets/qscrollbar.cpp (100%)
rename src/{gui => widgets}/widgets/qscrollbar.h (100%)
rename src/{gui => widgets}/widgets/qsizegrip.cpp (100%)
rename src/{gui => widgets}/widgets/qsizegrip.h (100%)
rename src/{gui => widgets}/widgets/qslider.cpp (100%)
rename src/{gui => widgets}/widgets/qslider.h (100%)
rename src/{gui => widgets}/widgets/qspinbox.cpp (100%)
rename src/{gui => widgets}/widgets/qspinbox.h (100%)
rename src/{gui => widgets}/widgets/qsplashscreen.cpp (100%)
rename src/{gui => widgets}/widgets/qsplashscreen.h (100%)
rename src/{gui => widgets}/widgets/qsplitter.cpp (100%)
rename src/{gui => widgets}/widgets/qsplitter.h (100%)
rename src/{gui => widgets}/widgets/qsplitter_p.h (100%)
rename src/{gui => widgets}/widgets/qstackedwidget.cpp (100%)
rename src/{gui => widgets}/widgets/qstackedwidget.h (100%)
rename src/{gui => widgets}/widgets/qstatusbar.cpp (100%)
rename src/{gui => widgets}/widgets/qstatusbar.h (100%)
rename src/{gui => widgets}/widgets/qtabbar.cpp (100%)
rename src/{gui => widgets}/widgets/qtabbar.h (100%)
rename src/{gui => widgets}/widgets/qtabbar_p.h (100%)
rename src/{gui => widgets}/widgets/qtabwidget.cpp (100%)
rename src/{gui => widgets}/widgets/qtabwidget.h (100%)
rename src/{gui => widgets}/widgets/qtextbrowser.cpp (100%)
rename src/{gui => widgets}/widgets/qtextbrowser.h (100%)
rename src/{gui => widgets}/widgets/qtextedit.cpp (100%)
rename src/{gui => widgets}/widgets/qtextedit.h (100%)
rename src/{gui => widgets}/widgets/qtextedit_p.h (100%)
rename src/{gui => widgets}/widgets/qtoolbar.cpp (100%)
rename src/{gui => widgets}/widgets/qtoolbar.h (100%)
rename src/{gui => widgets}/widgets/qtoolbar_p.h (100%)
rename src/{gui => widgets}/widgets/qtoolbararealayout.cpp (100%)
rename src/{gui => widgets}/widgets/qtoolbararealayout_p.h (100%)
rename src/{gui => widgets}/widgets/qtoolbarextension.cpp (100%)
rename src/{gui => widgets}/widgets/qtoolbarextension_p.h (100%)
rename src/{gui => widgets}/widgets/qtoolbarlayout.cpp (100%)
rename src/{gui => widgets}/widgets/qtoolbarlayout_p.h (100%)
rename src/{gui => widgets}/widgets/qtoolbarseparator.cpp (100%)
rename src/{gui => widgets}/widgets/qtoolbarseparator_p.h (100%)
rename src/{gui => widgets}/widgets/qtoolbox.cpp (100%)
rename src/{gui => widgets}/widgets/qtoolbox.h (100%)
rename src/{gui => widgets}/widgets/qtoolbutton.cpp (100%)
rename src/{gui => widgets}/widgets/qtoolbutton.h (100%)
rename src/{gui => widgets}/widgets/qwidgetanimator.cpp (100%)
rename src/{gui => widgets}/widgets/qwidgetanimator_p.h (100%)
rename src/{gui => widgets}/widgets/qwidgetresizehandler.cpp (100%)
rename src/{gui => widgets}/widgets/qwidgetresizehandler_p.h (100%)
rename src/{gui => widgets}/widgets/qworkspace.cpp (100%)
rename src/{gui => widgets}/widgets/qworkspace.h (100%)
rename src/{gui => widgets}/widgets/widgets.pri (100%)
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index c146a9b4727..f9ae32b6b5e 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -6,68 +6,24 @@ CONFIG += module
MODULE_PRI = ../modules/qt_gui.pri
DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
-win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
-irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
-
-!win32:!qpa:!mac:!symbian:CONFIG += x11
unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
include(../qbase.pri)
-contains(QT_CONFIG, x11sm):CONFIG += x11sm
-
-#platforms
-x11:include(kernel/x11.pri)
-mac:include(kernel/mac.pri)
-win32:include(kernel/win.pri)
-symbian {
- include(kernel/symbian.pri)
- include(s60framework/s60framework.pri)
-}
-
# stuff that goes into new QtGui
include(guikernel/guikernel.pri)
include(image/image.pri)
include(text/text.pri)
include(painting/painting.pri)
include(guiutil/guiutil.pri)
-
-# to be moved into QtGui
-include(to_be_moved/to_be_moved.pri)
-
-#modules
-include(animation/animation.pri)
-include(kernel/kernel.pri)
-include(styles/styles.pri)
-include(widgets/widgets.pri)
-include(dialogs/dialogs.pri)
-include(accessible/accessible.pri)
-include(itemviews/itemviews.pri)
-include(inputmethod/inputmethod.pri)
-include(graphicsview/graphicsview.pri)
-include(util/util.pri)
-include(statemachine/statemachine.pri)
include(math3d/math3d.pri)
-include(effects/effects.pri)
include(egl/egl.pri)
-win32:!wince*: DEFINES += QT_NO_EGL
QMAKE_LIBS += $$QMAKE_LIBS_GUI
-contains(DEFINES,QT_EVAL):include($$QT_SOURCE_TREE/src/corelib/eval.pri)
-
-QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist
-
DEFINES += Q_INTERNAL_QAPP_SRC
-symbian {
- TARGET.UID3=0x2001B2DD
-
- # ro-section in gui can exceed default allocated space, so move rw-section a little further
- QMAKE_LFLAGS.ARMCC += --rw-base 0x800000
- QMAKE_LFLAGS.GCCE += -Tdata 0x800000
-}
neon:*-g++* {
DEFINES += QT_HAVE_NEON
diff --git a/src/gui/guikernel/qplatformcursor_qpa.cpp b/src/gui/guikernel/qplatformcursor_qpa.cpp
index 6b4f9152cec..f43eca640f8 100644
--- a/src/gui/guikernel/qplatformcursor_qpa.cpp
+++ b/src/gui/guikernel/qplatformcursor_qpa.cpp
@@ -40,7 +40,6 @@
****************************************************************************/
#include "qplatformcursor_qpa.h"
-#include <QWidget>
#include <QPainter>
#include <QBitmap>
#include <QGuiApplication>
diff --git a/src/gui/guikernel/qt_gui_pch.h b/src/gui/guikernel/qt_gui_pch.h
new file mode 100644
index 00000000000..79450219fa7
--- /dev/null
+++ b/src/gui/guikernel/qt_gui_pch.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ * This is a precompiled header file for use in Xcode / Mac GCC /
+ * GCC >= 3.4 / VC to greatly speed the building of Qt. It may also be
+ * of use to people developing their own project, but it is probably
+ * better to define your own header. Use of this header is currently
+ * UNSUPPORTED.
+ */
+
+// from corelib/global/qt_pch.h
+#if defined __cplusplus
+#include <qglobal.h>
+
+
+#ifdef Q_WS_WIN
+# define _POSIX_
+# include <limits.h>
+# undef _POSIX_
+#endif
+
+#include <qcoreapplication.h>
+#include <qlist.h>
+#include <qvariant.h> // All moc genereated code has this include
+#include <qobject.h>
+#include <qregexp.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qtextcodec.h>
+
+#include <qguiapplication.h>
+#include <qbitmap.h>
+#include <qcursor.h>
+#include <qevent.h>
+#include <qimage.h>
+#include <qpainter.h>
+#include <qpixmap.h>
+#include <qtimer.h>
+
+#include <stdlib.h>
+
+#endif
diff --git a/src/gui/painting/qpaintdevice_qpa.cpp b/src/gui/painting/qpaintdevice_qpa.cpp
index 44e169c14ea..9d731db4be2 100644
--- a/src/gui/painting/qpaintdevice_qpa.cpp
+++ b/src/gui/painting/qpaintdevice_qpa.cpp
@@ -42,7 +42,7 @@
#include "qpaintdevice.h"
#include "qpainter.h"
#include "qbitmap.h"
-#include "qapplication.h"
+#include "qguiapplication.h"
QT_BEGIN_NAMESPACE
diff --git a/src/modules/qt_widgets.pri b/src/modules/qt_widgets.pri
new file mode 100644
index 00000000000..78752e131ef
--- /dev/null
+++ b/src/modules/qt_widgets.pri
@@ -0,0 +1,14 @@
+QT.widgets.VERSION = 4.8.0
+QT.widgets.MAJOR_VERSION = 4
+QT.widgets.MINOR_VERSION = 8
+QT.widgets.PATCH_VERSION = 0
+
+QT.widgets.name = QtGui
+QT.widgets.includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets
+QT.widgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets/$$QT.widgets.VERSION
+QT.widgets.sources = $$QT_MODULE_BASE/src/widgets
+QT.widgets.libs = $$QT_MODULE_LIB_BASE
+QT.widgets.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.widgets.imports = $$QT_MODULE_IMPORT_BASE
+QT.widgets.depends = core network
+QT.widgets.DEFINES = QT_GUI_LIB
diff --git a/src/src.pro b/src/src.pro
index 491973c6353..fad1b8866ee 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -35,6 +35,8 @@ src_dbus.subdir = $$QT_SOURCE_TREE/src/dbus
src_dbus.target = sub-dbus
src_gui.subdir = $$QT_SOURCE_TREE/src/gui
src_gui.target = sub-gui
+src_widgets.subdir = $$QT_SOURCE_TREE/src/widgets
+src_widgets.target = sub-widgets
src_sql.subdir = $$QT_SOURCE_TREE/src/sql
src_sql.target = sub-sql
src_network.subdir = $$QT_SOURCE_TREE/src/network
@@ -51,7 +53,8 @@ src_testlib.target = sub-testlib
#CONFIG += ordered
!wince*:!ordered:!symbian-abld:!symbian-sbsv2 {
src_corelib.depends = src_tools_moc src_tools_rcc
- src_gui.depends = src_corelib src_tools_uic
+ src_gui.depends = src_corelib
+ src_widgets.depends = src_corelib gui src_tools_uic
embedded: src_gui.depends += src_network
src_xml.depends = src_corelib
src_uitools.depends = src_corelib src_xml
diff --git a/src/gui/QtGui.dynlist b/src/widgets/QtGui.dynlist
similarity index 100%
rename from src/gui/QtGui.dynlist
rename to src/widgets/QtGui.dynlist
diff --git a/src/gui/accessible/accessible.pri b/src/widgets/accessible/accessible.pri
similarity index 100%
rename from src/gui/accessible/accessible.pri
rename to src/widgets/accessible/accessible.pri
diff --git a/src/gui/accessible/qaccessible.cpp b/src/widgets/accessible/qaccessible.cpp
similarity index 100%
rename from src/gui/accessible/qaccessible.cpp
rename to src/widgets/accessible/qaccessible.cpp
diff --git a/src/gui/accessible/qaccessible.h b/src/widgets/accessible/qaccessible.h
similarity index 100%
rename from src/gui/accessible/qaccessible.h
rename to src/widgets/accessible/qaccessible.h
diff --git a/src/gui/accessible/qaccessible2.cpp b/src/widgets/accessible/qaccessible2.cpp
similarity index 100%
rename from src/gui/accessible/qaccessible2.cpp
rename to src/widgets/accessible/qaccessible2.cpp
diff --git a/src/gui/accessible/qaccessible2.h b/src/widgets/accessible/qaccessible2.h
similarity index 100%
rename from src/gui/accessible/qaccessible2.h
rename to src/widgets/accessible/qaccessible2.h
diff --git a/src/gui/accessible/qaccessible_mac.mm b/src/widgets/accessible/qaccessible_mac.mm
similarity index 100%
rename from src/gui/accessible/qaccessible_mac.mm
rename to src/widgets/accessible/qaccessible_mac.mm
diff --git a/src/gui/accessible/qaccessible_mac_carbon.cpp b/src/widgets/accessible/qaccessible_mac_carbon.cpp
similarity index 100%
rename from src/gui/accessible/qaccessible_mac_carbon.cpp
rename to src/widgets/accessible/qaccessible_mac_carbon.cpp
diff --git a/src/gui/accessible/qaccessible_mac_cocoa.mm b/src/widgets/accessible/qaccessible_mac_cocoa.mm
similarity index 100%
rename from src/gui/accessible/qaccessible_mac_cocoa.mm
rename to src/widgets/accessible/qaccessible_mac_cocoa.mm
diff --git a/src/gui/accessible/qaccessible_mac_p.h b/src/widgets/accessible/qaccessible_mac_p.h
similarity index 100%
rename from src/gui/accessible/qaccessible_mac_p.h
rename to src/widgets/accessible/qaccessible_mac_p.h
diff --git a/src/gui/accessible/qaccessible_unix.cpp b/src/widgets/accessible/qaccessible_unix.cpp
similarity index 100%
rename from src/gui/accessible/qaccessible_unix.cpp
rename to src/widgets/accessible/qaccessible_unix.cpp
diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/widgets/accessible/qaccessible_win.cpp
similarity index 100%
rename from src/gui/accessible/qaccessible_win.cpp
rename to src/widgets/accessible/qaccessible_win.cpp
diff --git a/src/gui/accessible/qaccessiblebridge.cpp b/src/widgets/accessible/qaccessiblebridge.cpp
similarity index 100%
rename from src/gui/accessible/qaccessiblebridge.cpp
rename to src/widgets/accessible/qaccessiblebridge.cpp
diff --git a/src/gui/accessible/qaccessiblebridge.h b/src/widgets/accessible/qaccessiblebridge.h
similarity index 100%
rename from src/gui/accessible/qaccessiblebridge.h
rename to src/widgets/accessible/qaccessiblebridge.h
diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/widgets/accessible/qaccessibleobject.cpp
similarity index 100%
rename from src/gui/accessible/qaccessibleobject.cpp
rename to src/widgets/accessible/qaccessibleobject.cpp
diff --git a/src/gui/accessible/qaccessibleobject.h b/src/widgets/accessible/qaccessibleobject.h
similarity index 100%
rename from src/gui/accessible/qaccessibleobject.h
rename to src/widgets/accessible/qaccessibleobject.h
diff --git a/src/gui/accessible/qaccessibleplugin.cpp b/src/widgets/accessible/qaccessibleplugin.cpp
similarity index 100%
rename from src/gui/accessible/qaccessibleplugin.cpp
rename to src/widgets/accessible/qaccessibleplugin.cpp
diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/widgets/accessible/qaccessibleplugin.h
similarity index 100%
rename from src/gui/accessible/qaccessibleplugin.h
rename to src/widgets/accessible/qaccessibleplugin.h
diff --git a/src/gui/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
similarity index 100%
rename from src/gui/accessible/qaccessiblewidget.cpp
rename to src/widgets/accessible/qaccessiblewidget.cpp
diff --git a/src/gui/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h
similarity index 100%
rename from src/gui/accessible/qaccessiblewidget.h
rename to src/widgets/accessible/qaccessiblewidget.h
diff --git a/src/gui/animation/animation.pri b/src/widgets/animation/animation.pri
similarity index 100%
rename from src/gui/animation/animation.pri
rename to src/widgets/animation/animation.pri
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/widgets/animation/qguivariantanimation.cpp
similarity index 100%
rename from src/gui/animation/qguivariantanimation.cpp
rename to src/widgets/animation/qguivariantanimation.cpp
diff --git a/src/gui/dialogs/dialogs.pri b/src/widgets/dialogs/dialogs.pri
similarity index 100%
rename from src/gui/dialogs/dialogs.pri
rename to src/widgets/dialogs/dialogs.pri
diff --git a/src/gui/dialogs/images/fit-page-24.png b/src/widgets/dialogs/images/fit-page-24.png
similarity index 100%
rename from src/gui/dialogs/images/fit-page-24.png
rename to src/widgets/dialogs/images/fit-page-24.png
diff --git a/src/gui/dialogs/images/fit-page-32.png b/src/widgets/dialogs/images/fit-page-32.png
similarity index 100%
rename from src/gui/dialogs/images/fit-page-32.png
rename to src/widgets/dialogs/images/fit-page-32.png
diff --git a/src/gui/dialogs/images/fit-width-24.png b/src/widgets/dialogs/images/fit-width-24.png
similarity index 100%
rename from src/gui/dialogs/images/fit-width-24.png
rename to src/widgets/dialogs/images/fit-width-24.png
diff --git a/src/gui/dialogs/images/fit-width-32.png b/src/widgets/dialogs/images/fit-width-32.png
similarity index 100%
rename from src/gui/dialogs/images/fit-width-32.png
rename to src/widgets/dialogs/images/fit-width-32.png
diff --git a/src/gui/dialogs/images/go-first-24.png b/src/widgets/dialogs/images/go-first-24.png
similarity index 100%
rename from src/gui/dialogs/images/go-first-24.png
rename to src/widgets/dialogs/images/go-first-24.png
diff --git a/src/gui/dialogs/images/go-first-32.png b/src/widgets/dialogs/images/go-first-32.png
similarity index 100%
rename from src/gui/dialogs/images/go-first-32.png
rename to src/widgets/dialogs/images/go-first-32.png
diff --git a/src/gui/dialogs/images/go-last-24.png b/src/widgets/dialogs/images/go-last-24.png
similarity index 100%
rename from src/gui/dialogs/images/go-last-24.png
rename to src/widgets/dialogs/images/go-last-24.png
diff --git a/src/gui/dialogs/images/go-last-32.png b/src/widgets/dialogs/images/go-last-32.png
similarity index 100%
rename from src/gui/dialogs/images/go-last-32.png
rename to src/widgets/dialogs/images/go-last-32.png
diff --git a/src/gui/dialogs/images/go-next-24.png b/src/widgets/dialogs/images/go-next-24.png
similarity index 100%
rename from src/gui/dialogs/images/go-next-24.png
rename to src/widgets/dialogs/images/go-next-24.png
diff --git a/src/gui/dialogs/images/go-next-32.png b/src/widgets/dialogs/images/go-next-32.png
similarity index 100%
rename from src/gui/dialogs/images/go-next-32.png
rename to src/widgets/dialogs/images/go-next-32.png
diff --git a/src/gui/dialogs/images/go-previous-24.png b/src/widgets/dialogs/images/go-previous-24.png
similarity index 100%
rename from src/gui/dialogs/images/go-previous-24.png
rename to src/widgets/dialogs/images/go-previous-24.png
diff --git a/src/gui/dialogs/images/go-previous-32.png b/src/widgets/dialogs/images/go-previous-32.png
similarity index 100%
rename from src/gui/dialogs/images/go-previous-32.png
rename to src/widgets/dialogs/images/go-previous-32.png
diff --git a/src/gui/dialogs/images/layout-landscape-24.png b/src/widgets/dialogs/images/layout-landscape-24.png
similarity index 100%
rename from src/gui/dialogs/images/layout-landscape-24.png
rename to src/widgets/dialogs/images/layout-landscape-24.png
diff --git a/src/gui/dialogs/images/layout-landscape-32.png b/src/widgets/dialogs/images/layout-landscape-32.png
similarity index 100%
rename from src/gui/dialogs/images/layout-landscape-32.png
rename to src/widgets/dialogs/images/layout-landscape-32.png
diff --git a/src/gui/dialogs/images/layout-portrait-24.png b/src/widgets/dialogs/images/layout-portrait-24.png
similarity index 100%
rename from src/gui/dialogs/images/layout-portrait-24.png
rename to src/widgets/dialogs/images/layout-portrait-24.png
diff --git a/src/gui/dialogs/images/layout-portrait-32.png b/src/widgets/dialogs/images/layout-portrait-32.png
similarity index 100%
rename from src/gui/dialogs/images/layout-portrait-32.png
rename to src/widgets/dialogs/images/layout-portrait-32.png
diff --git a/src/gui/dialogs/images/page-setup-24.png b/src/widgets/dialogs/images/page-setup-24.png
similarity index 100%
rename from src/gui/dialogs/images/page-setup-24.png
rename to src/widgets/dialogs/images/page-setup-24.png
diff --git a/src/gui/dialogs/images/page-setup-32.png b/src/widgets/dialogs/images/page-setup-32.png
similarity index 100%
rename from src/gui/dialogs/images/page-setup-32.png
rename to src/widgets/dialogs/images/page-setup-32.png
diff --git a/src/gui/dialogs/images/print-24.png b/src/widgets/dialogs/images/print-24.png
similarity index 100%
rename from src/gui/dialogs/images/print-24.png
rename to src/widgets/dialogs/images/print-24.png
diff --git a/src/gui/dialogs/images/print-32.png b/src/widgets/dialogs/images/print-32.png
similarity index 100%
rename from src/gui/dialogs/images/print-32.png
rename to src/widgets/dialogs/images/print-32.png
diff --git a/src/gui/dialogs/images/qtlogo-64.png b/src/widgets/dialogs/images/qtlogo-64.png
similarity index 100%
rename from src/gui/dialogs/images/qtlogo-64.png
rename to src/widgets/dialogs/images/qtlogo-64.png
diff --git a/src/gui/dialogs/images/status-color.png b/src/widgets/dialogs/images/status-color.png
similarity index 100%
rename from src/gui/dialogs/images/status-color.png
rename to src/widgets/dialogs/images/status-color.png
diff --git a/src/gui/dialogs/images/status-gray-scale.png b/src/widgets/dialogs/images/status-gray-scale.png
similarity index 100%
rename from src/gui/dialogs/images/status-gray-scale.png
rename to src/widgets/dialogs/images/status-gray-scale.png
diff --git a/src/gui/dialogs/images/view-page-multi-24.png b/src/widgets/dialogs/images/view-page-multi-24.png
similarity index 100%
rename from src/gui/dialogs/images/view-page-multi-24.png
rename to src/widgets/dialogs/images/view-page-multi-24.png
diff --git a/src/gui/dialogs/images/view-page-multi-32.png b/src/widgets/dialogs/images/view-page-multi-32.png
similarity index 100%
rename from src/gui/dialogs/images/view-page-multi-32.png
rename to src/widgets/dialogs/images/view-page-multi-32.png
diff --git a/src/gui/dialogs/images/view-page-one-24.png b/src/widgets/dialogs/images/view-page-one-24.png
similarity index 100%
rename from src/gui/dialogs/images/view-page-one-24.png
rename to src/widgets/dialogs/images/view-page-one-24.png
diff --git a/src/gui/dialogs/images/view-page-one-32.png b/src/widgets/dialogs/images/view-page-one-32.png
similarity index 100%
rename from src/gui/dialogs/images/view-page-one-32.png
rename to src/widgets/dialogs/images/view-page-one-32.png
diff --git a/src/gui/dialogs/images/view-page-sided-24.png b/src/widgets/dialogs/images/view-page-sided-24.png
similarity index 100%
rename from src/gui/dialogs/images/view-page-sided-24.png
rename to src/widgets/dialogs/images/view-page-sided-24.png
diff --git a/src/gui/dialogs/images/view-page-sided-32.png b/src/widgets/dialogs/images/view-page-sided-32.png
similarity index 100%
rename from src/gui/dialogs/images/view-page-sided-32.png
rename to src/widgets/dialogs/images/view-page-sided-32.png
diff --git a/src/gui/dialogs/images/zoom-in-24.png b/src/widgets/dialogs/images/zoom-in-24.png
similarity index 100%
rename from src/gui/dialogs/images/zoom-in-24.png
rename to src/widgets/dialogs/images/zoom-in-24.png
diff --git a/src/gui/dialogs/images/zoom-in-32.png b/src/widgets/dialogs/images/zoom-in-32.png
similarity index 100%
rename from src/gui/dialogs/images/zoom-in-32.png
rename to src/widgets/dialogs/images/zoom-in-32.png
diff --git a/src/gui/dialogs/images/zoom-out-24.png b/src/widgets/dialogs/images/zoom-out-24.png
similarity index 100%
rename from src/gui/dialogs/images/zoom-out-24.png
rename to src/widgets/dialogs/images/zoom-out-24.png
diff --git a/src/gui/dialogs/images/zoom-out-32.png b/src/widgets/dialogs/images/zoom-out-32.png
similarity index 100%
rename from src/gui/dialogs/images/zoom-out-32.png
rename to src/widgets/dialogs/images/zoom-out-32.png
diff --git a/src/gui/dialogs/qabstractpagesetupdialog.cpp b/src/widgets/dialogs/qabstractpagesetupdialog.cpp
similarity index 100%
rename from src/gui/dialogs/qabstractpagesetupdialog.cpp
rename to src/widgets/dialogs/qabstractpagesetupdialog.cpp
diff --git a/src/gui/dialogs/qabstractpagesetupdialog.h b/src/widgets/dialogs/qabstractpagesetupdialog.h
similarity index 100%
rename from src/gui/dialogs/qabstractpagesetupdialog.h
rename to src/widgets/dialogs/qabstractpagesetupdialog.h
diff --git a/src/gui/dialogs/qabstractpagesetupdialog_p.h b/src/widgets/dialogs/qabstractpagesetupdialog_p.h
similarity index 100%
rename from src/gui/dialogs/qabstractpagesetupdialog_p.h
rename to src/widgets/dialogs/qabstractpagesetupdialog_p.h
diff --git a/src/gui/dialogs/qabstractprintdialog.cpp b/src/widgets/dialogs/qabstractprintdialog.cpp
similarity index 100%
rename from src/gui/dialogs/qabstractprintdialog.cpp
rename to src/widgets/dialogs/qabstractprintdialog.cpp
diff --git a/src/gui/dialogs/qabstractprintdialog.h b/src/widgets/dialogs/qabstractprintdialog.h
similarity index 100%
rename from src/gui/dialogs/qabstractprintdialog.h
rename to src/widgets/dialogs/qabstractprintdialog.h
diff --git a/src/gui/dialogs/qabstractprintdialog_p.h b/src/widgets/dialogs/qabstractprintdialog_p.h
similarity index 100%
rename from src/gui/dialogs/qabstractprintdialog_p.h
rename to src/widgets/dialogs/qabstractprintdialog_p.h
diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
similarity index 100%
rename from src/gui/dialogs/qcolordialog.cpp
rename to src/widgets/dialogs/qcolordialog.cpp
diff --git a/src/gui/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h
similarity index 100%
rename from src/gui/dialogs/qcolordialog.h
rename to src/widgets/dialogs/qcolordialog.h
diff --git a/src/gui/dialogs/qcolordialog_mac.mm b/src/widgets/dialogs/qcolordialog_mac.mm
similarity index 100%
rename from src/gui/dialogs/qcolordialog_mac.mm
rename to src/widgets/dialogs/qcolordialog_mac.mm
diff --git a/src/gui/dialogs/qcolordialog_p.h b/src/widgets/dialogs/qcolordialog_p.h
similarity index 100%
rename from src/gui/dialogs/qcolordialog_p.h
rename to src/widgets/dialogs/qcolordialog_p.h
diff --git a/src/gui/dialogs/qcolordialog_symbian.cpp b/src/widgets/dialogs/qcolordialog_symbian.cpp
similarity index 100%
rename from src/gui/dialogs/qcolordialog_symbian.cpp
rename to src/widgets/dialogs/qcolordialog_symbian.cpp
diff --git a/src/gui/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
similarity index 100%
rename from src/gui/dialogs/qdialog.cpp
rename to src/widgets/dialogs/qdialog.cpp
diff --git a/src/gui/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h
similarity index 100%
rename from src/gui/dialogs/qdialog.h
rename to src/widgets/dialogs/qdialog.h
diff --git a/src/gui/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h
similarity index 100%
rename from src/gui/dialogs/qdialog_p.h
rename to src/widgets/dialogs/qdialog_p.h
diff --git a/src/gui/dialogs/qdialogsbinarycompat_win.cpp b/src/widgets/dialogs/qdialogsbinarycompat_win.cpp
similarity index 100%
rename from src/gui/dialogs/qdialogsbinarycompat_win.cpp
rename to src/widgets/dialogs/qdialogsbinarycompat_win.cpp
diff --git a/src/gui/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp
similarity index 100%
rename from src/gui/dialogs/qerrormessage.cpp
rename to src/widgets/dialogs/qerrormessage.cpp
diff --git a/src/gui/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h
similarity index 100%
rename from src/gui/dialogs/qerrormessage.h
rename to src/widgets/dialogs/qerrormessage.h
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
similarity index 100%
rename from src/gui/dialogs/qfiledialog.cpp
rename to src/widgets/dialogs/qfiledialog.cpp
diff --git a/src/gui/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
similarity index 100%
rename from src/gui/dialogs/qfiledialog.h
rename to src/widgets/dialogs/qfiledialog.h
diff --git a/src/gui/dialogs/qfiledialog.ui b/src/widgets/dialogs/qfiledialog.ui
similarity index 100%
rename from src/gui/dialogs/qfiledialog.ui
rename to src/widgets/dialogs/qfiledialog.ui
diff --git a/src/gui/dialogs/qfiledialog_embedded.ui b/src/widgets/dialogs/qfiledialog_embedded.ui
similarity index 100%
rename from src/gui/dialogs/qfiledialog_embedded.ui
rename to src/widgets/dialogs/qfiledialog_embedded.ui
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/widgets/dialogs/qfiledialog_mac.mm
similarity index 100%
rename from src/gui/dialogs/qfiledialog_mac.mm
rename to src/widgets/dialogs/qfiledialog_mac.mm
diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
similarity index 100%
rename from src/gui/dialogs/qfiledialog_p.h
rename to src/widgets/dialogs/qfiledialog_p.h
diff --git a/src/gui/dialogs/qfiledialog_symbian.cpp b/src/widgets/dialogs/qfiledialog_symbian.cpp
similarity index 100%
rename from src/gui/dialogs/qfiledialog_symbian.cpp
rename to src/widgets/dialogs/qfiledialog_symbian.cpp
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/widgets/dialogs/qfiledialog_win.cpp
similarity index 100%
rename from src/gui/dialogs/qfiledialog_win.cpp
rename to src/widgets/dialogs/qfiledialog_win.cpp
diff --git a/src/gui/dialogs/qfiledialog_win_p.h b/src/widgets/dialogs/qfiledialog_win_p.h
similarity index 100%
rename from src/gui/dialogs/qfiledialog_win_p.h
rename to src/widgets/dialogs/qfiledialog_win_p.h
diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/widgets/dialogs/qfileinfogatherer.cpp
similarity index 100%
rename from src/gui/dialogs/qfileinfogatherer.cpp
rename to src/widgets/dialogs/qfileinfogatherer.cpp
diff --git a/src/gui/dialogs/qfileinfogatherer_p.h b/src/widgets/dialogs/qfileinfogatherer_p.h
similarity index 100%
rename from src/gui/dialogs/qfileinfogatherer_p.h
rename to src/widgets/dialogs/qfileinfogatherer_p.h
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
similarity index 100%
rename from src/gui/dialogs/qfilesystemmodel.cpp
rename to src/widgets/dialogs/qfilesystemmodel.cpp
diff --git a/src/gui/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h
similarity index 100%
rename from src/gui/dialogs/qfilesystemmodel.h
rename to src/widgets/dialogs/qfilesystemmodel.h
diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h
similarity index 100%
rename from src/gui/dialogs/qfilesystemmodel_p.h
rename to src/widgets/dialogs/qfilesystemmodel_p.h
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
similarity index 100%
rename from src/gui/dialogs/qfontdialog.cpp
rename to src/widgets/dialogs/qfontdialog.cpp
diff --git a/src/gui/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h
similarity index 100%
rename from src/gui/dialogs/qfontdialog.h
rename to src/widgets/dialogs/qfontdialog.h
diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/widgets/dialogs/qfontdialog_mac.mm
similarity index 100%
rename from src/gui/dialogs/qfontdialog_mac.mm
rename to src/widgets/dialogs/qfontdialog_mac.mm
diff --git a/src/gui/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h
similarity index 100%
rename from src/gui/dialogs/qfontdialog_p.h
rename to src/widgets/dialogs/qfontdialog_p.h
diff --git a/src/gui/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h
similarity index 100%
rename from src/gui/dialogs/qfscompleter_p.h
rename to src/widgets/dialogs/qfscompleter_p.h
diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp
similarity index 100%
rename from src/gui/dialogs/qinputdialog.cpp
rename to src/widgets/dialogs/qinputdialog.cpp
diff --git a/src/gui/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h
similarity index 100%
rename from src/gui/dialogs/qinputdialog.h
rename to src/widgets/dialogs/qinputdialog.h
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
similarity index 100%
rename from src/gui/dialogs/qmessagebox.cpp
rename to src/widgets/dialogs/qmessagebox.cpp
diff --git a/src/gui/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h
similarity index 100%
rename from src/gui/dialogs/qmessagebox.h
rename to src/widgets/dialogs/qmessagebox.h
diff --git a/src/gui/dialogs/qmessagebox.qrc b/src/widgets/dialogs/qmessagebox.qrc
similarity index 100%
rename from src/gui/dialogs/qmessagebox.qrc
rename to src/widgets/dialogs/qmessagebox.qrc
diff --git a/src/gui/dialogs/qnspanelproxy_mac.mm b/src/widgets/dialogs/qnspanelproxy_mac.mm
similarity index 100%
rename from src/gui/dialogs/qnspanelproxy_mac.mm
rename to src/widgets/dialogs/qnspanelproxy_mac.mm
diff --git a/src/gui/dialogs/qpagesetupdialog.cpp b/src/widgets/dialogs/qpagesetupdialog.cpp
similarity index 100%
rename from src/gui/dialogs/qpagesetupdialog.cpp
rename to src/widgets/dialogs/qpagesetupdialog.cpp
diff --git a/src/gui/dialogs/qpagesetupdialog.h b/src/widgets/dialogs/qpagesetupdialog.h
similarity index 100%
rename from src/gui/dialogs/qpagesetupdialog.h
rename to src/widgets/dialogs/qpagesetupdialog.h
diff --git a/src/gui/dialogs/qpagesetupdialog_mac.mm b/src/widgets/dialogs/qpagesetupdialog_mac.mm
similarity index 100%
rename from src/gui/dialogs/qpagesetupdialog_mac.mm
rename to src/widgets/dialogs/qpagesetupdialog_mac.mm
diff --git a/src/gui/dialogs/qpagesetupdialog_unix.cpp b/src/widgets/dialogs/qpagesetupdialog_unix.cpp
similarity index 100%
rename from src/gui/dialogs/qpagesetupdialog_unix.cpp
rename to src/widgets/dialogs/qpagesetupdialog_unix.cpp
diff --git a/src/gui/dialogs/qpagesetupdialog_unix_p.h b/src/widgets/dialogs/qpagesetupdialog_unix_p.h
similarity index 100%
rename from src/gui/dialogs/qpagesetupdialog_unix_p.h
rename to src/widgets/dialogs/qpagesetupdialog_unix_p.h
diff --git a/src/gui/dialogs/qpagesetupdialog_win.cpp b/src/widgets/dialogs/qpagesetupdialog_win.cpp
similarity index 100%
rename from src/gui/dialogs/qpagesetupdialog_win.cpp
rename to src/widgets/dialogs/qpagesetupdialog_win.cpp
diff --git a/src/gui/dialogs/qpagesetupwidget.ui b/src/widgets/dialogs/qpagesetupwidget.ui
similarity index 100%
rename from src/gui/dialogs/qpagesetupwidget.ui
rename to src/widgets/dialogs/qpagesetupwidget.ui
diff --git a/src/gui/dialogs/qprintdialog.h b/src/widgets/dialogs/qprintdialog.h
similarity index 100%
rename from src/gui/dialogs/qprintdialog.h
rename to src/widgets/dialogs/qprintdialog.h
diff --git a/src/gui/dialogs/qprintdialog.qdoc b/src/widgets/dialogs/qprintdialog.qdoc
similarity index 100%
rename from src/gui/dialogs/qprintdialog.qdoc
rename to src/widgets/dialogs/qprintdialog.qdoc
diff --git a/src/gui/dialogs/qprintdialog.qrc b/src/widgets/dialogs/qprintdialog.qrc
similarity index 100%
rename from src/gui/dialogs/qprintdialog.qrc
rename to src/widgets/dialogs/qprintdialog.qrc
diff --git a/src/gui/dialogs/qprintdialog_mac.mm b/src/widgets/dialogs/qprintdialog_mac.mm
similarity index 100%
rename from src/gui/dialogs/qprintdialog_mac.mm
rename to src/widgets/dialogs/qprintdialog_mac.mm
diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/widgets/dialogs/qprintdialog_unix.cpp
similarity index 100%
rename from src/gui/dialogs/qprintdialog_unix.cpp
rename to src/widgets/dialogs/qprintdialog_unix.cpp
diff --git a/src/gui/dialogs/qprintdialog_win.cpp b/src/widgets/dialogs/qprintdialog_win.cpp
similarity index 100%
rename from src/gui/dialogs/qprintdialog_win.cpp
rename to src/widgets/dialogs/qprintdialog_win.cpp
diff --git a/src/gui/dialogs/qprintpreviewdialog.cpp b/src/widgets/dialogs/qprintpreviewdialog.cpp
similarity index 100%
rename from src/gui/dialogs/qprintpreviewdialog.cpp
rename to src/widgets/dialogs/qprintpreviewdialog.cpp
diff --git a/src/gui/dialogs/qprintpreviewdialog.h b/src/widgets/dialogs/qprintpreviewdialog.h
similarity index 100%
rename from src/gui/dialogs/qprintpreviewdialog.h
rename to src/widgets/dialogs/qprintpreviewdialog.h
diff --git a/src/gui/dialogs/qprintpropertieswidget.ui b/src/widgets/dialogs/qprintpropertieswidget.ui
similarity index 100%
rename from src/gui/dialogs/qprintpropertieswidget.ui
rename to src/widgets/dialogs/qprintpropertieswidget.ui
diff --git a/src/gui/dialogs/qprintsettingsoutput.ui b/src/widgets/dialogs/qprintsettingsoutput.ui
similarity index 100%
rename from src/gui/dialogs/qprintsettingsoutput.ui
rename to src/widgets/dialogs/qprintsettingsoutput.ui
diff --git a/src/gui/dialogs/qprintwidget.ui b/src/widgets/dialogs/qprintwidget.ui
similarity index 100%
rename from src/gui/dialogs/qprintwidget.ui
rename to src/widgets/dialogs/qprintwidget.ui
diff --git a/src/gui/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp
similarity index 100%
rename from src/gui/dialogs/qprogressdialog.cpp
rename to src/widgets/dialogs/qprogressdialog.cpp
diff --git a/src/gui/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h
similarity index 100%
rename from src/gui/dialogs/qprogressdialog.h
rename to src/widgets/dialogs/qprogressdialog.h
diff --git a/src/gui/dialogs/qsidebar.cpp b/src/widgets/dialogs/qsidebar.cpp
similarity index 100%
rename from src/gui/dialogs/qsidebar.cpp
rename to src/widgets/dialogs/qsidebar.cpp
diff --git a/src/gui/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h
similarity index 100%
rename from src/gui/dialogs/qsidebar_p.h
rename to src/widgets/dialogs/qsidebar_p.h
diff --git a/src/gui/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
similarity index 100%
rename from src/gui/dialogs/qwizard.cpp
rename to src/widgets/dialogs/qwizard.cpp
diff --git a/src/gui/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h
similarity index 100%
rename from src/gui/dialogs/qwizard.h
rename to src/widgets/dialogs/qwizard.h
diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp
similarity index 100%
rename from src/gui/dialogs/qwizard_win.cpp
rename to src/widgets/dialogs/qwizard_win.cpp
diff --git a/src/gui/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h
similarity index 100%
rename from src/gui/dialogs/qwizard_win_p.h
rename to src/widgets/dialogs/qwizard_win_p.h
diff --git a/src/gui/effects/effects.pri b/src/widgets/effects/effects.pri
similarity index 100%
rename from src/gui/effects/effects.pri
rename to src/widgets/effects/effects.pri
diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/widgets/effects/qgraphicseffect.cpp
similarity index 100%
rename from src/gui/effects/qgraphicseffect.cpp
rename to src/widgets/effects/qgraphicseffect.cpp
diff --git a/src/gui/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h
similarity index 100%
rename from src/gui/effects/qgraphicseffect.h
rename to src/widgets/effects/qgraphicseffect.h
diff --git a/src/gui/effects/qgraphicseffect_p.h b/src/widgets/effects/qgraphicseffect_p.h
similarity index 100%
rename from src/gui/effects/qgraphicseffect_p.h
rename to src/widgets/effects/qgraphicseffect_p.h
diff --git a/src/gui/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp
similarity index 100%
rename from src/gui/effects/qpixmapfilter.cpp
rename to src/widgets/effects/qpixmapfilter.cpp
diff --git a/src/gui/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h
similarity index 100%
rename from src/gui/effects/qpixmapfilter_p.h
rename to src/widgets/effects/qpixmapfilter_p.h
diff --git a/src/gui/graphicsview/graphicsview.pri b/src/widgets/graphicsview/graphicsview.pri
similarity index 100%
rename from src/gui/graphicsview/graphicsview.pri
rename to src/widgets/graphicsview/graphicsview.pri
diff --git a/src/gui/graphicsview/qgraph_p.h b/src/widgets/graphicsview/qgraph_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraph_p.h
rename to src/widgets/graphicsview/qgraph_p.h
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsanchorlayout.cpp
rename to src/widgets/graphicsview/qgraphicsanchorlayout.cpp
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsanchorlayout.h
rename to src/widgets/graphicsview/qgraphicsanchorlayout.h
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
rename to src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsanchorlayout_p.h
rename to src/widgets/graphicsview/qgraphicsanchorlayout_p.h
diff --git a/src/gui/graphicsview/qgraphicsgridlayout.cpp b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsgridlayout.cpp
rename to src/widgets/graphicsview/qgraphicsgridlayout.cpp
diff --git a/src/gui/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsgridlayout.h
rename to src/widgets/graphicsview/qgraphicsgridlayout.h
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsitem.cpp
rename to src/widgets/graphicsview/qgraphicsitem.cpp
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsitem.h
rename to src/widgets/graphicsview/qgraphicsitem.h
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsitem_p.h
rename to src/widgets/graphicsview/qgraphicsitem_p.h
diff --git a/src/gui/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsitemanimation.cpp
rename to src/widgets/graphicsview/qgraphicsitemanimation.cpp
diff --git a/src/gui/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsitemanimation.h
rename to src/widgets/graphicsview/qgraphicsitemanimation.h
diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/widgets/graphicsview/qgraphicslayout.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicslayout.cpp
rename to src/widgets/graphicsview/qgraphicslayout.cpp
diff --git a/src/gui/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicslayout.h
rename to src/widgets/graphicsview/qgraphicslayout.h
diff --git a/src/gui/graphicsview/qgraphicslayout_p.cpp b/src/widgets/graphicsview/qgraphicslayout_p.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicslayout_p.cpp
rename to src/widgets/graphicsview/qgraphicslayout_p.cpp
diff --git a/src/gui/graphicsview/qgraphicslayout_p.h b/src/widgets/graphicsview/qgraphicslayout_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicslayout_p.h
rename to src/widgets/graphicsview/qgraphicslayout_p.h
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/widgets/graphicsview/qgraphicslayoutitem.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicslayoutitem.cpp
rename to src/widgets/graphicsview/qgraphicslayoutitem.cpp
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicslayoutitem.h
rename to src/widgets/graphicsview/qgraphicslayoutitem.h
diff --git a/src/gui/graphicsview/qgraphicslayoutitem_p.h b/src/widgets/graphicsview/qgraphicslayoutitem_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicslayoutitem_p.h
rename to src/widgets/graphicsview/qgraphicslayoutitem_p.h
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/widgets/graphicsview/qgraphicslinearlayout.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicslinearlayout.cpp
rename to src/widgets/graphicsview/qgraphicslinearlayout.cpp
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicslinearlayout.h
rename to src/widgets/graphicsview/qgraphicslinearlayout.h
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsproxywidget.cpp
rename to src/widgets/graphicsview/qgraphicsproxywidget.cpp
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsproxywidget.h
rename to src/widgets/graphicsview/qgraphicsproxywidget.h
diff --git a/src/gui/graphicsview/qgraphicsproxywidget_p.h b/src/widgets/graphicsview/qgraphicsproxywidget_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsproxywidget_p.h
rename to src/widgets/graphicsview/qgraphicsproxywidget_p.h
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsscene.cpp
rename to src/widgets/graphicsview/qgraphicsscene.cpp
diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsscene.h
rename to src/widgets/graphicsview/qgraphicsscene.h
diff --git a/src/gui/graphicsview/qgraphicsscene_bsp.cpp b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsscene_bsp.cpp
rename to src/widgets/graphicsview/qgraphicsscene_bsp.cpp
diff --git a/src/gui/graphicsview/qgraphicsscene_bsp_p.h b/src/widgets/graphicsview/qgraphicsscene_bsp_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsscene_bsp_p.h
rename to src/widgets/graphicsview/qgraphicsscene_bsp_p.h
diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/widgets/graphicsview/qgraphicsscene_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsscene_p.h
rename to src/widgets/graphicsview/qgraphicsscene_p.h
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/widgets/graphicsview/qgraphicsscenebsptreeindex.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
rename to src/widgets/graphicsview/qgraphicsscenebsptreeindex.cpp
diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h
rename to src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h
diff --git a/src/gui/graphicsview/qgraphicssceneevent.cpp b/src/widgets/graphicsview/qgraphicssceneevent.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicssceneevent.cpp
rename to src/widgets/graphicsview/qgraphicssceneevent.cpp
diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/widgets/graphicsview/qgraphicssceneevent.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicssceneevent.h
rename to src/widgets/graphicsview/qgraphicssceneevent.h
diff --git a/src/gui/graphicsview/qgraphicssceneindex.cpp b/src/widgets/graphicsview/qgraphicssceneindex.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicssceneindex.cpp
rename to src/widgets/graphicsview/qgraphicssceneindex.cpp
diff --git a/src/gui/graphicsview/qgraphicssceneindex_p.h b/src/widgets/graphicsview/qgraphicssceneindex_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicssceneindex_p.h
rename to src/widgets/graphicsview/qgraphicssceneindex_p.h
diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex.cpp b/src/widgets/graphicsview/qgraphicsscenelinearindex.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsscenelinearindex.cpp
rename to src/widgets/graphicsview/qgraphicsscenelinearindex.cpp
diff --git a/src/gui/graphicsview/qgraphicsscenelinearindex_p.h b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsscenelinearindex_p.h
rename to src/widgets/graphicsview/qgraphicsscenelinearindex_p.h
diff --git a/src/gui/graphicsview/qgraphicstransform.cpp b/src/widgets/graphicsview/qgraphicstransform.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicstransform.cpp
rename to src/widgets/graphicsview/qgraphicstransform.cpp
diff --git a/src/gui/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicstransform.h
rename to src/widgets/graphicsview/qgraphicstransform.h
diff --git a/src/gui/graphicsview/qgraphicstransform_p.h b/src/widgets/graphicsview/qgraphicstransform_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicstransform_p.h
rename to src/widgets/graphicsview/qgraphicstransform_p.h
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicsview.cpp
rename to src/widgets/graphicsview/qgraphicsview.cpp
diff --git a/src/gui/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsview.h
rename to src/widgets/graphicsview/qgraphicsview.h
diff --git a/src/gui/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicsview_p.h
rename to src/widgets/graphicsview/qgraphicsview_p.h
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicswidget.cpp
rename to src/widgets/graphicsview/qgraphicswidget.cpp
diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicswidget.h
rename to src/widgets/graphicsview/qgraphicswidget.h
diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/widgets/graphicsview/qgraphicswidget_p.cpp
similarity index 100%
rename from src/gui/graphicsview/qgraphicswidget_p.cpp
rename to src/widgets/graphicsview/qgraphicswidget_p.cpp
diff --git a/src/gui/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h
similarity index 100%
rename from src/gui/graphicsview/qgraphicswidget_p.h
rename to src/widgets/graphicsview/qgraphicswidget_p.h
diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/widgets/graphicsview/qgridlayoutengine.cpp
similarity index 100%
rename from src/gui/graphicsview/qgridlayoutengine.cpp
rename to src/widgets/graphicsview/qgridlayoutengine.cpp
diff --git a/src/gui/graphicsview/qgridlayoutengine_p.h b/src/widgets/graphicsview/qgridlayoutengine_p.h
similarity index 100%
rename from src/gui/graphicsview/qgridlayoutengine_p.h
rename to src/widgets/graphicsview/qgridlayoutengine_p.h
diff --git a/src/gui/graphicsview/qsimplex_p.cpp b/src/widgets/graphicsview/qsimplex_p.cpp
similarity index 100%
rename from src/gui/graphicsview/qsimplex_p.cpp
rename to src/widgets/graphicsview/qsimplex_p.cpp
diff --git a/src/gui/graphicsview/qsimplex_p.h b/src/widgets/graphicsview/qsimplex_p.h
similarity index 100%
rename from src/gui/graphicsview/qsimplex_p.h
rename to src/widgets/graphicsview/qsimplex_p.h
diff --git a/src/gui/inputmethod/inputmethod.pri b/src/widgets/inputmethod/inputmethod.pri
similarity index 100%
rename from src/gui/inputmethod/inputmethod.pri
rename to src/widgets/inputmethod/inputmethod.pri
diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/widgets/inputmethod/qcoefepinputcontext_p.h
similarity index 100%
rename from src/gui/inputmethod/qcoefepinputcontext_p.h
rename to src/widgets/inputmethod/qcoefepinputcontext_p.h
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/widgets/inputmethod/qcoefepinputcontext_s60.cpp
similarity index 100%
rename from src/gui/inputmethod/qcoefepinputcontext_s60.cpp
rename to src/widgets/inputmethod/qcoefepinputcontext_s60.cpp
diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/widgets/inputmethod/qinputcontext.cpp
similarity index 100%
rename from src/gui/inputmethod/qinputcontext.cpp
rename to src/widgets/inputmethod/qinputcontext.cpp
diff --git a/src/gui/inputmethod/qinputcontext.h b/src/widgets/inputmethod/qinputcontext.h
similarity index 100%
rename from src/gui/inputmethod/qinputcontext.h
rename to src/widgets/inputmethod/qinputcontext.h
diff --git a/src/gui/inputmethod/qinputcontext_p.h b/src/widgets/inputmethod/qinputcontext_p.h
similarity index 100%
rename from src/gui/inputmethod/qinputcontext_p.h
rename to src/widgets/inputmethod/qinputcontext_p.h
diff --git a/src/gui/inputmethod/qinputcontextfactory.cpp b/src/widgets/inputmethod/qinputcontextfactory.cpp
similarity index 100%
rename from src/gui/inputmethod/qinputcontextfactory.cpp
rename to src/widgets/inputmethod/qinputcontextfactory.cpp
diff --git a/src/gui/inputmethod/qinputcontextfactory.h b/src/widgets/inputmethod/qinputcontextfactory.h
similarity index 100%
rename from src/gui/inputmethod/qinputcontextfactory.h
rename to src/widgets/inputmethod/qinputcontextfactory.h
diff --git a/src/gui/inputmethod/qinputcontextplugin.cpp b/src/widgets/inputmethod/qinputcontextplugin.cpp
similarity index 100%
rename from src/gui/inputmethod/qinputcontextplugin.cpp
rename to src/widgets/inputmethod/qinputcontextplugin.cpp
diff --git a/src/gui/inputmethod/qinputcontextplugin.h b/src/widgets/inputmethod/qinputcontextplugin.h
similarity index 100%
rename from src/gui/inputmethod/qinputcontextplugin.h
rename to src/widgets/inputmethod/qinputcontextplugin.h
diff --git a/src/gui/inputmethod/qmacinputcontext_mac.cpp b/src/widgets/inputmethod/qmacinputcontext_mac.cpp
similarity index 100%
rename from src/gui/inputmethod/qmacinputcontext_mac.cpp
rename to src/widgets/inputmethod/qmacinputcontext_mac.cpp
diff --git a/src/gui/inputmethod/qmacinputcontext_p.h b/src/widgets/inputmethod/qmacinputcontext_p.h
similarity index 100%
rename from src/gui/inputmethod/qmacinputcontext_p.h
rename to src/widgets/inputmethod/qmacinputcontext_p.h
diff --git a/src/gui/inputmethod/qwininputcontext_p.h b/src/widgets/inputmethod/qwininputcontext_p.h
similarity index 100%
rename from src/gui/inputmethod/qwininputcontext_p.h
rename to src/widgets/inputmethod/qwininputcontext_p.h
diff --git a/src/gui/inputmethod/qwininputcontext_win.cpp b/src/widgets/inputmethod/qwininputcontext_win.cpp
similarity index 100%
rename from src/gui/inputmethod/qwininputcontext_win.cpp
rename to src/widgets/inputmethod/qwininputcontext_win.cpp
diff --git a/src/gui/inputmethod/qximinputcontext_p.h b/src/widgets/inputmethod/qximinputcontext_p.h
similarity index 100%
rename from src/gui/inputmethod/qximinputcontext_p.h
rename to src/widgets/inputmethod/qximinputcontext_p.h
diff --git a/src/gui/inputmethod/qximinputcontext_x11.cpp b/src/widgets/inputmethod/qximinputcontext_x11.cpp
similarity index 100%
rename from src/gui/inputmethod/qximinputcontext_x11.cpp
rename to src/widgets/inputmethod/qximinputcontext_x11.cpp
diff --git a/src/gui/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri
similarity index 100%
rename from src/gui/itemviews/itemviews.pri
rename to src/widgets/itemviews/itemviews.pri
diff --git a/src/gui/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp
similarity index 100%
rename from src/gui/itemviews/qabstractitemdelegate.cpp
rename to src/widgets/itemviews/qabstractitemdelegate.cpp
diff --git a/src/gui/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h
similarity index 100%
rename from src/gui/itemviews/qabstractitemdelegate.h
rename to src/widgets/itemviews/qabstractitemdelegate.h
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
similarity index 100%
rename from src/gui/itemviews/qabstractitemview.cpp
rename to src/widgets/itemviews/qabstractitemview.cpp
diff --git a/src/gui/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h
similarity index 100%
rename from src/gui/itemviews/qabstractitemview.h
rename to src/widgets/itemviews/qabstractitemview.h
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h
similarity index 100%
rename from src/gui/itemviews/qabstractitemview_p.h
rename to src/widgets/itemviews/qabstractitemview_p.h
diff --git a/src/gui/itemviews/qabstractproxymodel.cpp b/src/widgets/itemviews/qabstractproxymodel.cpp
similarity index 100%
rename from src/gui/itemviews/qabstractproxymodel.cpp
rename to src/widgets/itemviews/qabstractproxymodel.cpp
diff --git a/src/gui/itemviews/qabstractproxymodel.h b/src/widgets/itemviews/qabstractproxymodel.h
similarity index 100%
rename from src/gui/itemviews/qabstractproxymodel.h
rename to src/widgets/itemviews/qabstractproxymodel.h
diff --git a/src/gui/itemviews/qabstractproxymodel_p.h b/src/widgets/itemviews/qabstractproxymodel_p.h
similarity index 100%
rename from src/gui/itemviews/qabstractproxymodel_p.h
rename to src/widgets/itemviews/qabstractproxymodel_p.h
diff --git a/src/gui/itemviews/qbsptree.cpp b/src/widgets/itemviews/qbsptree.cpp
similarity index 100%
rename from src/gui/itemviews/qbsptree.cpp
rename to src/widgets/itemviews/qbsptree.cpp
diff --git a/src/gui/itemviews/qbsptree_p.h b/src/widgets/itemviews/qbsptree_p.h
similarity index 100%
rename from src/gui/itemviews/qbsptree_p.h
rename to src/widgets/itemviews/qbsptree_p.h
diff --git a/src/gui/itemviews/qcolumnview.cpp b/src/widgets/itemviews/qcolumnview.cpp
similarity index 100%
rename from src/gui/itemviews/qcolumnview.cpp
rename to src/widgets/itemviews/qcolumnview.cpp
diff --git a/src/gui/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h
similarity index 100%
rename from src/gui/itemviews/qcolumnview.h
rename to src/widgets/itemviews/qcolumnview.h
diff --git a/src/gui/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h
similarity index 100%
rename from src/gui/itemviews/qcolumnview_p.h
rename to src/widgets/itemviews/qcolumnview_p.h
diff --git a/src/gui/itemviews/qcolumnviewgrip.cpp b/src/widgets/itemviews/qcolumnviewgrip.cpp
similarity index 100%
rename from src/gui/itemviews/qcolumnviewgrip.cpp
rename to src/widgets/itemviews/qcolumnviewgrip.cpp
diff --git a/src/gui/itemviews/qcolumnviewgrip_p.h b/src/widgets/itemviews/qcolumnviewgrip_p.h
similarity index 100%
rename from src/gui/itemviews/qcolumnviewgrip_p.h
rename to src/widgets/itemviews/qcolumnviewgrip_p.h
diff --git a/src/gui/itemviews/qdatawidgetmapper.cpp b/src/widgets/itemviews/qdatawidgetmapper.cpp
similarity index 100%
rename from src/gui/itemviews/qdatawidgetmapper.cpp
rename to src/widgets/itemviews/qdatawidgetmapper.cpp
diff --git a/src/gui/itemviews/qdatawidgetmapper.h b/src/widgets/itemviews/qdatawidgetmapper.h
similarity index 100%
rename from src/gui/itemviews/qdatawidgetmapper.h
rename to src/widgets/itemviews/qdatawidgetmapper.h
diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/widgets/itemviews/qdirmodel.cpp
similarity index 100%
rename from src/gui/itemviews/qdirmodel.cpp
rename to src/widgets/itemviews/qdirmodel.cpp
diff --git a/src/gui/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h
similarity index 100%
rename from src/gui/itemviews/qdirmodel.h
rename to src/widgets/itemviews/qdirmodel.h
diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp
similarity index 100%
rename from src/gui/itemviews/qfileiconprovider.cpp
rename to src/widgets/itemviews/qfileiconprovider.cpp
diff --git a/src/gui/itemviews/qfileiconprovider.h b/src/widgets/itemviews/qfileiconprovider.h
similarity index 100%
rename from src/gui/itemviews/qfileiconprovider.h
rename to src/widgets/itemviews/qfileiconprovider.h
diff --git a/src/gui/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
similarity index 100%
rename from src/gui/itemviews/qheaderview.cpp
rename to src/widgets/itemviews/qheaderview.cpp
diff --git a/src/gui/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h
similarity index 100%
rename from src/gui/itemviews/qheaderview.h
rename to src/widgets/itemviews/qheaderview.h
diff --git a/src/gui/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h
similarity index 100%
rename from src/gui/itemviews/qheaderview_p.h
rename to src/widgets/itemviews/qheaderview_p.h
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
similarity index 100%
rename from src/gui/itemviews/qitemdelegate.cpp
rename to src/widgets/itemviews/qitemdelegate.cpp
diff --git a/src/gui/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h
similarity index 100%
rename from src/gui/itemviews/qitemdelegate.h
rename to src/widgets/itemviews/qitemdelegate.h
diff --git a/src/gui/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp
similarity index 100%
rename from src/gui/itemviews/qitemeditorfactory.cpp
rename to src/widgets/itemviews/qitemeditorfactory.cpp
diff --git a/src/gui/itemviews/qitemeditorfactory.h b/src/widgets/itemviews/qitemeditorfactory.h
similarity index 100%
rename from src/gui/itemviews/qitemeditorfactory.h
rename to src/widgets/itemviews/qitemeditorfactory.h
diff --git a/src/gui/itemviews/qitemeditorfactory_p.h b/src/widgets/itemviews/qitemeditorfactory_p.h
similarity index 100%
rename from src/gui/itemviews/qitemeditorfactory_p.h
rename to src/widgets/itemviews/qitemeditorfactory_p.h
diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/widgets/itemviews/qitemselectionmodel.cpp
similarity index 100%
rename from src/gui/itemviews/qitemselectionmodel.cpp
rename to src/widgets/itemviews/qitemselectionmodel.cpp
diff --git a/src/gui/itemviews/qitemselectionmodel.h b/src/widgets/itemviews/qitemselectionmodel.h
similarity index 100%
rename from src/gui/itemviews/qitemselectionmodel.h
rename to src/widgets/itemviews/qitemselectionmodel.h
diff --git a/src/gui/itemviews/qitemselectionmodel_p.h b/src/widgets/itemviews/qitemselectionmodel_p.h
similarity index 100%
rename from src/gui/itemviews/qitemselectionmodel_p.h
rename to src/widgets/itemviews/qitemselectionmodel_p.h
diff --git a/src/gui/itemviews/qlistview.cpp b/src/widgets/itemviews/qlistview.cpp
similarity index 100%
rename from src/gui/itemviews/qlistview.cpp
rename to src/widgets/itemviews/qlistview.cpp
diff --git a/src/gui/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h
similarity index 100%
rename from src/gui/itemviews/qlistview.h
rename to src/widgets/itemviews/qlistview.h
diff --git a/src/gui/itemviews/qlistview_p.h b/src/widgets/itemviews/qlistview_p.h
similarity index 100%
rename from src/gui/itemviews/qlistview_p.h
rename to src/widgets/itemviews/qlistview_p.h
diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp
similarity index 100%
rename from src/gui/itemviews/qlistwidget.cpp
rename to src/widgets/itemviews/qlistwidget.cpp
diff --git a/src/gui/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h
similarity index 100%
rename from src/gui/itemviews/qlistwidget.h
rename to src/widgets/itemviews/qlistwidget.h
diff --git a/src/gui/itemviews/qlistwidget_p.h b/src/widgets/itemviews/qlistwidget_p.h
similarity index 100%
rename from src/gui/itemviews/qlistwidget_p.h
rename to src/widgets/itemviews/qlistwidget_p.h
diff --git a/src/gui/itemviews/qproxymodel.cpp b/src/widgets/itemviews/qproxymodel.cpp
similarity index 100%
rename from src/gui/itemviews/qproxymodel.cpp
rename to src/widgets/itemviews/qproxymodel.cpp
diff --git a/src/gui/itemviews/qproxymodel.h b/src/widgets/itemviews/qproxymodel.h
similarity index 100%
rename from src/gui/itemviews/qproxymodel.h
rename to src/widgets/itemviews/qproxymodel.h
diff --git a/src/gui/itemviews/qproxymodel_p.h b/src/widgets/itemviews/qproxymodel_p.h
similarity index 100%
rename from src/gui/itemviews/qproxymodel_p.h
rename to src/widgets/itemviews/qproxymodel_p.h
diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/widgets/itemviews/qsortfilterproxymodel.cpp
similarity index 100%
rename from src/gui/itemviews/qsortfilterproxymodel.cpp
rename to src/widgets/itemviews/qsortfilterproxymodel.cpp
diff --git a/src/gui/itemviews/qsortfilterproxymodel.h b/src/widgets/itemviews/qsortfilterproxymodel.h
similarity index 100%
rename from src/gui/itemviews/qsortfilterproxymodel.h
rename to src/widgets/itemviews/qsortfilterproxymodel.h
diff --git a/src/gui/itemviews/qstandarditemmodel.cpp b/src/widgets/itemviews/qstandarditemmodel.cpp
similarity index 100%
rename from src/gui/itemviews/qstandarditemmodel.cpp
rename to src/widgets/itemviews/qstandarditemmodel.cpp
diff --git a/src/gui/itemviews/qstandarditemmodel.h b/src/widgets/itemviews/qstandarditemmodel.h
similarity index 100%
rename from src/gui/itemviews/qstandarditemmodel.h
rename to src/widgets/itemviews/qstandarditemmodel.h
diff --git a/src/gui/itemviews/qstandarditemmodel_p.h b/src/widgets/itemviews/qstandarditemmodel_p.h
similarity index 100%
rename from src/gui/itemviews/qstandarditemmodel_p.h
rename to src/widgets/itemviews/qstandarditemmodel_p.h
diff --git a/src/gui/itemviews/qstringlistmodel.cpp b/src/widgets/itemviews/qstringlistmodel.cpp
similarity index 100%
rename from src/gui/itemviews/qstringlistmodel.cpp
rename to src/widgets/itemviews/qstringlistmodel.cpp
diff --git a/src/gui/itemviews/qstringlistmodel.h b/src/widgets/itemviews/qstringlistmodel.h
similarity index 100%
rename from src/gui/itemviews/qstringlistmodel.h
rename to src/widgets/itemviews/qstringlistmodel.h
diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp
similarity index 100%
rename from src/gui/itemviews/qstyleditemdelegate.cpp
rename to src/widgets/itemviews/qstyleditemdelegate.cpp
diff --git a/src/gui/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h
similarity index 100%
rename from src/gui/itemviews/qstyleditemdelegate.h
rename to src/widgets/itemviews/qstyleditemdelegate.h
diff --git a/src/gui/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp
similarity index 100%
rename from src/gui/itemviews/qtableview.cpp
rename to src/widgets/itemviews/qtableview.cpp
diff --git a/src/gui/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h
similarity index 100%
rename from src/gui/itemviews/qtableview.h
rename to src/widgets/itemviews/qtableview.h
diff --git a/src/gui/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h
similarity index 100%
rename from src/gui/itemviews/qtableview_p.h
rename to src/widgets/itemviews/qtableview_p.h
diff --git a/src/gui/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
similarity index 100%
rename from src/gui/itemviews/qtablewidget.cpp
rename to src/widgets/itemviews/qtablewidget.cpp
diff --git a/src/gui/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h
similarity index 100%
rename from src/gui/itemviews/qtablewidget.h
rename to src/widgets/itemviews/qtablewidget.h
diff --git a/src/gui/itemviews/qtablewidget_p.h b/src/widgets/itemviews/qtablewidget_p.h
similarity index 100%
rename from src/gui/itemviews/qtablewidget_p.h
rename to src/widgets/itemviews/qtablewidget_p.h
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
similarity index 100%
rename from src/gui/itemviews/qtreeview.cpp
rename to src/widgets/itemviews/qtreeview.cpp
diff --git a/src/gui/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h
similarity index 100%
rename from src/gui/itemviews/qtreeview.h
rename to src/widgets/itemviews/qtreeview.h
diff --git a/src/gui/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h
similarity index 100%
rename from src/gui/itemviews/qtreeview_p.h
rename to src/widgets/itemviews/qtreeview_p.h
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
similarity index 100%
rename from src/gui/itemviews/qtreewidget.cpp
rename to src/widgets/itemviews/qtreewidget.cpp
diff --git a/src/gui/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h
similarity index 100%
rename from src/gui/itemviews/qtreewidget.h
rename to src/widgets/itemviews/qtreewidget.h
diff --git a/src/gui/itemviews/qtreewidget_p.h b/src/widgets/itemviews/qtreewidget_p.h
similarity index 100%
rename from src/gui/itemviews/qtreewidget_p.h
rename to src/widgets/itemviews/qtreewidget_p.h
diff --git a/src/gui/itemviews/qtreewidgetitemiterator.cpp b/src/widgets/itemviews/qtreewidgetitemiterator.cpp
similarity index 100%
rename from src/gui/itemviews/qtreewidgetitemiterator.cpp
rename to src/widgets/itemviews/qtreewidgetitemiterator.cpp
diff --git a/src/gui/itemviews/qtreewidgetitemiterator.h b/src/widgets/itemviews/qtreewidgetitemiterator.h
similarity index 100%
rename from src/gui/itemviews/qtreewidgetitemiterator.h
rename to src/widgets/itemviews/qtreewidgetitemiterator.h
diff --git a/src/gui/itemviews/qtreewidgetitemiterator_p.h b/src/widgets/itemviews/qtreewidgetitemiterator_p.h
similarity index 100%
rename from src/gui/itemviews/qtreewidgetitemiterator_p.h
rename to src/widgets/itemviews/qtreewidgetitemiterator_p.h
diff --git a/src/gui/itemviews/qwidgetitemdata_p.h b/src/widgets/itemviews/qwidgetitemdata_p.h
similarity index 100%
rename from src/gui/itemviews/qwidgetitemdata_p.h
rename to src/widgets/itemviews/qwidgetitemdata_p.h
diff --git a/src/gui/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
similarity index 100%
rename from src/gui/kernel/kernel.pri
rename to src/widgets/kernel/kernel.pri
diff --git a/src/gui/kernel/mac.pri b/src/widgets/kernel/mac.pri
similarity index 100%
rename from src/gui/kernel/mac.pri
rename to src/widgets/kernel/mac.pri
diff --git a/src/gui/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp
similarity index 100%
rename from src/gui/kernel/qaction.cpp
rename to src/widgets/kernel/qaction.cpp
diff --git a/src/gui/kernel/qaction.h b/src/widgets/kernel/qaction.h
similarity index 100%
rename from src/gui/kernel/qaction.h
rename to src/widgets/kernel/qaction.h
diff --git a/src/gui/kernel/qaction_p.h b/src/widgets/kernel/qaction_p.h
similarity index 100%
rename from src/gui/kernel/qaction_p.h
rename to src/widgets/kernel/qaction_p.h
diff --git a/src/gui/kernel/qactiongroup.cpp b/src/widgets/kernel/qactiongroup.cpp
similarity index 100%
rename from src/gui/kernel/qactiongroup.cpp
rename to src/widgets/kernel/qactiongroup.cpp
diff --git a/src/gui/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h
similarity index 100%
rename from src/gui/kernel/qactiongroup.h
rename to src/widgets/kernel/qactiongroup.h
diff --git a/src/gui/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
similarity index 100%
rename from src/gui/kernel/qapplication.cpp
rename to src/widgets/kernel/qapplication.cpp
diff --git a/src/gui/kernel/qapplication.h b/src/widgets/kernel/qapplication.h
similarity index 100%
rename from src/gui/kernel/qapplication.h
rename to src/widgets/kernel/qapplication.h
diff --git a/src/gui/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
similarity index 100%
rename from src/gui/kernel/qapplication_p.h
rename to src/widgets/kernel/qapplication_p.h
diff --git a/src/gui/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qapplication_qpa.cpp
rename to src/widgets/kernel/qapplication_qpa.cpp
diff --git a/src/gui/kernel/qbackingstore.cpp b/src/widgets/kernel/qbackingstore.cpp
similarity index 100%
rename from src/gui/kernel/qbackingstore.cpp
rename to src/widgets/kernel/qbackingstore.cpp
diff --git a/src/gui/kernel/qbackingstore_p.h b/src/widgets/kernel/qbackingstore_p.h
similarity index 100%
rename from src/gui/kernel/qbackingstore_p.h
rename to src/widgets/kernel/qbackingstore_p.h
diff --git a/src/gui/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp
similarity index 100%
rename from src/gui/kernel/qboxlayout.cpp
rename to src/widgets/kernel/qboxlayout.cpp
diff --git a/src/gui/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h
similarity index 100%
rename from src/gui/kernel/qboxlayout.h
rename to src/widgets/kernel/qboxlayout.h
diff --git a/src/gui/kernel/qdesktopwidget.cpp b/src/widgets/kernel/qdesktopwidget.cpp
similarity index 100%
rename from src/gui/kernel/qdesktopwidget.cpp
rename to src/widgets/kernel/qdesktopwidget.cpp
diff --git a/src/gui/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h
similarity index 100%
rename from src/gui/kernel/qdesktopwidget.h
rename to src/widgets/kernel/qdesktopwidget.h
diff --git a/src/gui/kernel/qdesktopwidget.qdoc b/src/widgets/kernel/qdesktopwidget.qdoc
similarity index 100%
rename from src/gui/kernel/qdesktopwidget.qdoc
rename to src/widgets/kernel/qdesktopwidget.qdoc
diff --git a/src/gui/kernel/qdesktopwidget_qpa.cpp b/src/widgets/kernel/qdesktopwidget_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qdesktopwidget_qpa.cpp
rename to src/widgets/kernel/qdesktopwidget_qpa.cpp
diff --git a/src/gui/kernel/qdesktopwidget_qpa_p.h b/src/widgets/kernel/qdesktopwidget_qpa_p.h
similarity index 100%
rename from src/gui/kernel/qdesktopwidget_qpa_p.h
rename to src/widgets/kernel/qdesktopwidget_qpa_p.h
diff --git a/src/gui/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
similarity index 100%
rename from src/gui/kernel/qformlayout.cpp
rename to src/widgets/kernel/qformlayout.cpp
diff --git a/src/gui/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h
similarity index 100%
rename from src/gui/kernel/qformlayout.h
rename to src/widgets/kernel/qformlayout.h
diff --git a/src/gui/kernel/qgesture.cpp b/src/widgets/kernel/qgesture.cpp
similarity index 100%
rename from src/gui/kernel/qgesture.cpp
rename to src/widgets/kernel/qgesture.cpp
diff --git a/src/gui/kernel/qgesture.h b/src/widgets/kernel/qgesture.h
similarity index 100%
rename from src/gui/kernel/qgesture.h
rename to src/widgets/kernel/qgesture.h
diff --git a/src/gui/kernel/qgesture_p.h b/src/widgets/kernel/qgesture_p.h
similarity index 100%
rename from src/gui/kernel/qgesture_p.h
rename to src/widgets/kernel/qgesture_p.h
diff --git a/src/gui/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp
similarity index 100%
rename from src/gui/kernel/qgesturemanager.cpp
rename to src/widgets/kernel/qgesturemanager.cpp
diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/widgets/kernel/qgesturemanager_p.h
similarity index 100%
rename from src/gui/kernel/qgesturemanager_p.h
rename to src/widgets/kernel/qgesturemanager_p.h
diff --git a/src/gui/kernel/qgesturerecognizer.cpp b/src/widgets/kernel/qgesturerecognizer.cpp
similarity index 100%
rename from src/gui/kernel/qgesturerecognizer.cpp
rename to src/widgets/kernel/qgesturerecognizer.cpp
diff --git a/src/gui/kernel/qgesturerecognizer.h b/src/widgets/kernel/qgesturerecognizer.h
similarity index 100%
rename from src/gui/kernel/qgesturerecognizer.h
rename to src/widgets/kernel/qgesturerecognizer.h
diff --git a/src/gui/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp
similarity index 100%
rename from src/gui/kernel/qgridlayout.cpp
rename to src/widgets/kernel/qgridlayout.cpp
diff --git a/src/gui/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h
similarity index 100%
rename from src/gui/kernel/qgridlayout.h
rename to src/widgets/kernel/qgridlayout.h
diff --git a/src/gui/kernel/qguieventdispatcher_glib.cpp b/src/widgets/kernel/qguieventdispatcher_glib.cpp
similarity index 100%
rename from src/gui/kernel/qguieventdispatcher_glib.cpp
rename to src/widgets/kernel/qguieventdispatcher_glib.cpp
diff --git a/src/gui/kernel/qguieventdispatcher_glib_p.h b/src/widgets/kernel/qguieventdispatcher_glib_p.h
similarity index 100%
rename from src/gui/kernel/qguieventdispatcher_glib_p.h
rename to src/widgets/kernel/qguieventdispatcher_glib_p.h
diff --git a/src/gui/kernel/qguiplatformplugin.cpp b/src/widgets/kernel/qguiplatformplugin.cpp
similarity index 100%
rename from src/gui/kernel/qguiplatformplugin.cpp
rename to src/widgets/kernel/qguiplatformplugin.cpp
diff --git a/src/gui/kernel/qguiplatformplugin_p.h b/src/widgets/kernel/qguiplatformplugin_p.h
similarity index 100%
rename from src/gui/kernel/qguiplatformplugin_p.h
rename to src/widgets/kernel/qguiplatformplugin_p.h
diff --git a/src/gui/kernel/qicon.cpp b/src/widgets/kernel/qicon.cpp
similarity index 100%
rename from src/gui/kernel/qicon.cpp
rename to src/widgets/kernel/qicon.cpp
diff --git a/src/gui/kernel/qicon.h b/src/widgets/kernel/qicon.h
similarity index 100%
rename from src/gui/kernel/qicon.h
rename to src/widgets/kernel/qicon.h
diff --git a/src/gui/kernel/qicon_p.h b/src/widgets/kernel/qicon_p.h
similarity index 100%
rename from src/gui/kernel/qicon_p.h
rename to src/widgets/kernel/qicon_p.h
diff --git a/src/gui/kernel/qiconengine.cpp b/src/widgets/kernel/qiconengine.cpp
similarity index 100%
rename from src/gui/kernel/qiconengine.cpp
rename to src/widgets/kernel/qiconengine.cpp
diff --git a/src/gui/kernel/qiconengine.h b/src/widgets/kernel/qiconengine.h
similarity index 100%
rename from src/gui/kernel/qiconengine.h
rename to src/widgets/kernel/qiconengine.h
diff --git a/src/gui/kernel/qiconengineplugin.cpp b/src/widgets/kernel/qiconengineplugin.cpp
similarity index 100%
rename from src/gui/kernel/qiconengineplugin.cpp
rename to src/widgets/kernel/qiconengineplugin.cpp
diff --git a/src/gui/kernel/qiconengineplugin.h b/src/widgets/kernel/qiconengineplugin.h
similarity index 100%
rename from src/gui/kernel/qiconengineplugin.h
rename to src/widgets/kernel/qiconengineplugin.h
diff --git a/src/gui/kernel/qiconloader.cpp b/src/widgets/kernel/qiconloader.cpp
similarity index 100%
rename from src/gui/kernel/qiconloader.cpp
rename to src/widgets/kernel/qiconloader.cpp
diff --git a/src/gui/kernel/qiconloader_p.h b/src/widgets/kernel/qiconloader_p.h
similarity index 100%
rename from src/gui/kernel/qiconloader_p.h
rename to src/widgets/kernel/qiconloader_p.h
diff --git a/src/gui/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
similarity index 100%
rename from src/gui/kernel/qlayout.cpp
rename to src/widgets/kernel/qlayout.cpp
diff --git a/src/gui/kernel/qlayout.h b/src/widgets/kernel/qlayout.h
similarity index 100%
rename from src/gui/kernel/qlayout.h
rename to src/widgets/kernel/qlayout.h
diff --git a/src/gui/kernel/qlayout_p.h b/src/widgets/kernel/qlayout_p.h
similarity index 100%
rename from src/gui/kernel/qlayout_p.h
rename to src/widgets/kernel/qlayout_p.h
diff --git a/src/gui/kernel/qlayoutengine.cpp b/src/widgets/kernel/qlayoutengine.cpp
similarity index 100%
rename from src/gui/kernel/qlayoutengine.cpp
rename to src/widgets/kernel/qlayoutengine.cpp
diff --git a/src/gui/kernel/qlayoutengine_p.h b/src/widgets/kernel/qlayoutengine_p.h
similarity index 100%
rename from src/gui/kernel/qlayoutengine_p.h
rename to src/widgets/kernel/qlayoutengine_p.h
diff --git a/src/gui/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
similarity index 100%
rename from src/gui/kernel/qlayoutitem.cpp
rename to src/widgets/kernel/qlayoutitem.cpp
diff --git a/src/gui/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h
similarity index 100%
rename from src/gui/kernel/qlayoutitem.h
rename to src/widgets/kernel/qlayoutitem.h
diff --git a/src/gui/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h
similarity index 100%
rename from src/gui/kernel/qsizepolicy.h
rename to src/widgets/kernel/qsizepolicy.h
diff --git a/src/gui/kernel/qsizepolicy.qdoc b/src/widgets/kernel/qsizepolicy.qdoc
similarity index 100%
rename from src/gui/kernel/qsizepolicy.qdoc
rename to src/widgets/kernel/qsizepolicy.qdoc
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/widgets/kernel/qsoftkeymanager.cpp
similarity index 100%
rename from src/gui/kernel/qsoftkeymanager.cpp
rename to src/widgets/kernel/qsoftkeymanager.cpp
diff --git a/src/gui/kernel/qsoftkeymanager_common_p.h b/src/widgets/kernel/qsoftkeymanager_common_p.h
similarity index 100%
rename from src/gui/kernel/qsoftkeymanager_common_p.h
rename to src/widgets/kernel/qsoftkeymanager_common_p.h
diff --git a/src/gui/kernel/qsoftkeymanager_p.h b/src/widgets/kernel/qsoftkeymanager_p.h
similarity index 100%
rename from src/gui/kernel/qsoftkeymanager_p.h
rename to src/widgets/kernel/qsoftkeymanager_p.h
diff --git a/src/gui/kernel/qsound.cpp b/src/widgets/kernel/qsound.cpp
similarity index 100%
rename from src/gui/kernel/qsound.cpp
rename to src/widgets/kernel/qsound.cpp
diff --git a/src/gui/kernel/qsound.h b/src/widgets/kernel/qsound.h
similarity index 100%
rename from src/gui/kernel/qsound.h
rename to src/widgets/kernel/qsound.h
diff --git a/src/gui/kernel/qsound_p.h b/src/widgets/kernel/qsound_p.h
similarity index 100%
rename from src/gui/kernel/qsound_p.h
rename to src/widgets/kernel/qsound_p.h
diff --git a/src/gui/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp
similarity index 100%
rename from src/gui/kernel/qstackedlayout.cpp
rename to src/widgets/kernel/qstackedlayout.cpp
diff --git a/src/gui/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h
similarity index 100%
rename from src/gui/kernel/qstackedlayout.h
rename to src/widgets/kernel/qstackedlayout.h
diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/widgets/kernel/qstandardgestures.cpp
similarity index 100%
rename from src/gui/kernel/qstandardgestures.cpp
rename to src/widgets/kernel/qstandardgestures.cpp
diff --git a/src/gui/kernel/qstandardgestures_p.h b/src/widgets/kernel/qstandardgestures_p.h
similarity index 100%
rename from src/gui/kernel/qstandardgestures_p.h
rename to src/widgets/kernel/qstandardgestures_p.h
diff --git a/src/gui/kernel/qt_gui_pch.h b/src/widgets/kernel/qt_gui_pch.h
similarity index 100%
rename from src/gui/kernel/qt_gui_pch.h
rename to src/widgets/kernel/qt_gui_pch.h
diff --git a/src/gui/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
similarity index 100%
rename from src/gui/kernel/qtooltip.cpp
rename to src/widgets/kernel/qtooltip.cpp
diff --git a/src/gui/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h
similarity index 100%
rename from src/gui/kernel/qtooltip.h
rename to src/widgets/kernel/qtooltip.h
diff --git a/src/gui/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp
similarity index 100%
rename from src/gui/kernel/qwhatsthis.cpp
rename to src/widgets/kernel/qwhatsthis.cpp
diff --git a/src/gui/kernel/qwhatsthis.h b/src/widgets/kernel/qwhatsthis.h
similarity index 100%
rename from src/gui/kernel/qwhatsthis.h
rename to src/widgets/kernel/qwhatsthis.h
diff --git a/src/gui/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
similarity index 100%
rename from src/gui/kernel/qwidget.cpp
rename to src/widgets/kernel/qwidget.cpp
diff --git a/src/gui/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
similarity index 100%
rename from src/gui/kernel/qwidget.h
rename to src/widgets/kernel/qwidget.h
diff --git a/src/gui/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
similarity index 100%
rename from src/gui/kernel/qwidget_p.h
rename to src/widgets/kernel/qwidget_p.h
diff --git a/src/gui/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qwidget_qpa.cpp
rename to src/widgets/kernel/qwidget_qpa.cpp
diff --git a/src/gui/kernel/qwidgetaction.cpp b/src/widgets/kernel/qwidgetaction.cpp
similarity index 100%
rename from src/gui/kernel/qwidgetaction.cpp
rename to src/widgets/kernel/qwidgetaction.cpp
diff --git a/src/gui/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h
similarity index 100%
rename from src/gui/kernel/qwidgetaction.h
rename to src/widgets/kernel/qwidgetaction.h
diff --git a/src/gui/kernel/qwidgetaction_p.h b/src/widgets/kernel/qwidgetaction_p.h
similarity index 100%
rename from src/gui/kernel/qwidgetaction_p.h
rename to src/widgets/kernel/qwidgetaction_p.h
diff --git a/src/gui/kernel/qwidgetwindow_qpa.cpp b/src/widgets/kernel/qwidgetwindow_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qwidgetwindow_qpa.cpp
rename to src/widgets/kernel/qwidgetwindow_qpa.cpp
diff --git a/src/gui/kernel/qwidgetwindow_qpa_p.h b/src/widgets/kernel/qwidgetwindow_qpa_p.h
similarity index 100%
rename from src/gui/kernel/qwidgetwindow_qpa_p.h
rename to src/widgets/kernel/qwidgetwindow_qpa_p.h
diff --git a/src/gui/kernel/symbian.pri b/src/widgets/kernel/symbian.pri
similarity index 100%
rename from src/gui/kernel/symbian.pri
rename to src/widgets/kernel/symbian.pri
diff --git a/src/gui/kernel/win.pri b/src/widgets/kernel/win.pri
similarity index 100%
rename from src/gui/kernel/win.pri
rename to src/widgets/kernel/win.pri
diff --git a/src/gui/kernel/x11.pri b/src/widgets/kernel/x11.pri
similarity index 100%
rename from src/gui/kernel/x11.pri
rename to src/widgets/kernel/x11.pri
diff --git a/src/gui/mac/images/copyarrowcursor.png b/src/widgets/mac/images/copyarrowcursor.png
similarity index 100%
rename from src/gui/mac/images/copyarrowcursor.png
rename to src/widgets/mac/images/copyarrowcursor.png
diff --git a/src/gui/mac/images/forbiddencursor.png b/src/widgets/mac/images/forbiddencursor.png
similarity index 100%
rename from src/gui/mac/images/forbiddencursor.png
rename to src/widgets/mac/images/forbiddencursor.png
diff --git a/src/gui/mac/images/leopard-unified-toolbar-on.png b/src/widgets/mac/images/leopard-unified-toolbar-on.png
similarity index 100%
rename from src/gui/mac/images/leopard-unified-toolbar-on.png
rename to src/widgets/mac/images/leopard-unified-toolbar-on.png
diff --git a/src/gui/mac/images/pluscursor.png b/src/widgets/mac/images/pluscursor.png
similarity index 100%
rename from src/gui/mac/images/pluscursor.png
rename to src/widgets/mac/images/pluscursor.png
diff --git a/src/gui/mac/images/spincursor.png b/src/widgets/mac/images/spincursor.png
similarity index 100%
rename from src/gui/mac/images/spincursor.png
rename to src/widgets/mac/images/spincursor.png
diff --git a/src/gui/mac/images/waitcursor.png b/src/widgets/mac/images/waitcursor.png
similarity index 100%
rename from src/gui/mac/images/waitcursor.png
rename to src/widgets/mac/images/waitcursor.png
diff --git a/src/gui/mac/macresources.qrc b/src/widgets/mac/macresources.qrc
similarity index 100%
rename from src/gui/mac/macresources.qrc
rename to src/widgets/mac/macresources.qrc
diff --git a/src/gui/mac/qt_menu.nib/classes.nib b/src/widgets/mac/qt_menu.nib/classes.nib
similarity index 100%
rename from src/gui/mac/qt_menu.nib/classes.nib
rename to src/widgets/mac/qt_menu.nib/classes.nib
diff --git a/src/gui/mac/qt_menu.nib/info.nib b/src/widgets/mac/qt_menu.nib/info.nib
similarity index 100%
rename from src/gui/mac/qt_menu.nib/info.nib
rename to src/widgets/mac/qt_menu.nib/info.nib
diff --git a/src/gui/mac/qt_menu.nib/keyedobjects.nib b/src/widgets/mac/qt_menu.nib/keyedobjects.nib
similarity index 100%
rename from src/gui/mac/qt_menu.nib/keyedobjects.nib
rename to src/widgets/mac/qt_menu.nib/keyedobjects.nib
diff --git a/src/gui/platforms/mac/qapplication_mac.mm b/src/widgets/platforms/mac/qapplication_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qapplication_mac.mm
rename to src/widgets/platforms/mac/qapplication_mac.mm
diff --git a/src/gui/platforms/mac/qclipboard_mac.cpp b/src/widgets/platforms/mac/qclipboard_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qclipboard_mac.cpp
rename to src/widgets/platforms/mac/qclipboard_mac.cpp
diff --git a/src/gui/platforms/mac/qcocoaapplication_mac.mm b/src/widgets/platforms/mac/qcocoaapplication_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qcocoaapplication_mac.mm
rename to src/widgets/platforms/mac/qcocoaapplication_mac.mm
diff --git a/src/gui/platforms/mac/qcocoaapplication_mac_p.h b/src/widgets/platforms/mac/qcocoaapplication_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qcocoaapplication_mac_p.h
rename to src/widgets/platforms/mac/qcocoaapplication_mac_p.h
diff --git a/src/gui/platforms/mac/qcocoaapplicationdelegate_mac.mm b/src/widgets/platforms/mac/qcocoaapplicationdelegate_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qcocoaapplicationdelegate_mac.mm
rename to src/widgets/platforms/mac/qcocoaapplicationdelegate_mac.mm
diff --git a/src/gui/platforms/mac/qcocoaapplicationdelegate_mac_p.h b/src/widgets/platforms/mac/qcocoaapplicationdelegate_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qcocoaapplicationdelegate_mac_p.h
rename to src/widgets/platforms/mac/qcocoaapplicationdelegate_mac_p.h
diff --git a/src/gui/platforms/mac/qcocoaintrospection_mac.mm b/src/widgets/platforms/mac/qcocoaintrospection_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qcocoaintrospection_mac.mm
rename to src/widgets/platforms/mac/qcocoaintrospection_mac.mm
diff --git a/src/gui/platforms/mac/qcocoaintrospection_p.h b/src/widgets/platforms/mac/qcocoaintrospection_p.h
similarity index 100%
rename from src/gui/platforms/mac/qcocoaintrospection_p.h
rename to src/widgets/platforms/mac/qcocoaintrospection_p.h
diff --git a/src/gui/platforms/mac/qcocoamenuloader_mac.mm b/src/widgets/platforms/mac/qcocoamenuloader_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qcocoamenuloader_mac.mm
rename to src/widgets/platforms/mac/qcocoamenuloader_mac.mm
diff --git a/src/gui/platforms/mac/qcocoamenuloader_mac_p.h b/src/widgets/platforms/mac/qcocoamenuloader_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qcocoamenuloader_mac_p.h
rename to src/widgets/platforms/mac/qcocoamenuloader_mac_p.h
diff --git a/src/gui/platforms/mac/qcocoapanel_mac.mm b/src/widgets/platforms/mac/qcocoapanel_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qcocoapanel_mac.mm
rename to src/widgets/platforms/mac/qcocoapanel_mac.mm
diff --git a/src/gui/platforms/mac/qcocoapanel_mac_p.h b/src/widgets/platforms/mac/qcocoapanel_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qcocoapanel_mac_p.h
rename to src/widgets/platforms/mac/qcocoapanel_mac_p.h
diff --git a/src/gui/platforms/mac/qcocoasharedwindowmethods_mac_p.h b/src/widgets/platforms/mac/qcocoasharedwindowmethods_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qcocoasharedwindowmethods_mac_p.h
rename to src/widgets/platforms/mac/qcocoasharedwindowmethods_mac_p.h
diff --git a/src/gui/platforms/mac/qcocoaview_mac.mm b/src/widgets/platforms/mac/qcocoaview_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qcocoaview_mac.mm
rename to src/widgets/platforms/mac/qcocoaview_mac.mm
diff --git a/src/gui/platforms/mac/qcocoaview_mac_p.h b/src/widgets/platforms/mac/qcocoaview_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qcocoaview_mac_p.h
rename to src/widgets/platforms/mac/qcocoaview_mac_p.h
diff --git a/src/gui/platforms/mac/qcocoawindow_mac.mm b/src/widgets/platforms/mac/qcocoawindow_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qcocoawindow_mac.mm
rename to src/widgets/platforms/mac/qcocoawindow_mac.mm
diff --git a/src/gui/platforms/mac/qcocoawindow_mac_p.h b/src/widgets/platforms/mac/qcocoawindow_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qcocoawindow_mac_p.h
rename to src/widgets/platforms/mac/qcocoawindow_mac_p.h
diff --git a/src/gui/platforms/mac/qcocoawindowcustomthemeframe_mac.mm b/src/widgets/platforms/mac/qcocoawindowcustomthemeframe_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qcocoawindowcustomthemeframe_mac.mm
rename to src/widgets/platforms/mac/qcocoawindowcustomthemeframe_mac.mm
diff --git a/src/gui/platforms/mac/qcocoawindowcustomthemeframe_mac_p.h b/src/widgets/platforms/mac/qcocoawindowcustomthemeframe_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qcocoawindowcustomthemeframe_mac_p.h
rename to src/widgets/platforms/mac/qcocoawindowcustomthemeframe_mac_p.h
diff --git a/src/gui/platforms/mac/qcocoawindowdelegate_mac.mm b/src/widgets/platforms/mac/qcocoawindowdelegate_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qcocoawindowdelegate_mac.mm
rename to src/widgets/platforms/mac/qcocoawindowdelegate_mac.mm
diff --git a/src/gui/platforms/mac/qcocoawindowdelegate_mac_p.h b/src/widgets/platforms/mac/qcocoawindowdelegate_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qcocoawindowdelegate_mac_p.h
rename to src/widgets/platforms/mac/qcocoawindowdelegate_mac_p.h
diff --git a/src/gui/platforms/mac/qcolormap_mac.cpp b/src/widgets/platforms/mac/qcolormap_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qcolormap_mac.cpp
rename to src/widgets/platforms/mac/qcolormap_mac.cpp
diff --git a/src/gui/platforms/mac/qcursor_mac.mm b/src/widgets/platforms/mac/qcursor_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qcursor_mac.mm
rename to src/widgets/platforms/mac/qcursor_mac.mm
diff --git a/src/gui/platforms/mac/qdesktopwidget_mac.mm b/src/widgets/platforms/mac/qdesktopwidget_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qdesktopwidget_mac.mm
rename to src/widgets/platforms/mac/qdesktopwidget_mac.mm
diff --git a/src/gui/platforms/mac/qdesktopwidget_mac_p.h b/src/widgets/platforms/mac/qdesktopwidget_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qdesktopwidget_mac_p.h
rename to src/widgets/platforms/mac/qdesktopwidget_mac_p.h
diff --git a/src/gui/platforms/mac/qdnd_mac.mm b/src/widgets/platforms/mac/qdnd_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qdnd_mac.mm
rename to src/widgets/platforms/mac/qdnd_mac.mm
diff --git a/src/gui/platforms/mac/qeventdispatcher_mac.mm b/src/widgets/platforms/mac/qeventdispatcher_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qeventdispatcher_mac.mm
rename to src/widgets/platforms/mac/qeventdispatcher_mac.mm
diff --git a/src/gui/platforms/mac/qeventdispatcher_mac_p.h b/src/widgets/platforms/mac/qeventdispatcher_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qeventdispatcher_mac_p.h
rename to src/widgets/platforms/mac/qeventdispatcher_mac_p.h
diff --git a/src/gui/platforms/mac/qfont_mac.cpp b/src/widgets/platforms/mac/qfont_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qfont_mac.cpp
rename to src/widgets/platforms/mac/qfont_mac.cpp
diff --git a/src/gui/platforms/mac/qfontdatabase_mac.cpp b/src/widgets/platforms/mac/qfontdatabase_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qfontdatabase_mac.cpp
rename to src/widgets/platforms/mac/qfontdatabase_mac.cpp
diff --git a/src/gui/platforms/mac/qfontengine_coretext.mm b/src/widgets/platforms/mac/qfontengine_coretext.mm
similarity index 100%
rename from src/gui/platforms/mac/qfontengine_coretext.mm
rename to src/widgets/platforms/mac/qfontengine_coretext.mm
diff --git a/src/gui/platforms/mac/qfontengine_coretext_p.h b/src/widgets/platforms/mac/qfontengine_coretext_p.h
similarity index 100%
rename from src/gui/platforms/mac/qfontengine_coretext_p.h
rename to src/widgets/platforms/mac/qfontengine_coretext_p.h
diff --git a/src/gui/platforms/mac/qfontengine_mac.mm b/src/widgets/platforms/mac/qfontengine_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qfontengine_mac.mm
rename to src/widgets/platforms/mac/qfontengine_mac.mm
diff --git a/src/gui/platforms/mac/qfontengine_mac_p.h b/src/widgets/platforms/mac/qfontengine_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qfontengine_mac_p.h
rename to src/widgets/platforms/mac/qfontengine_mac_p.h
diff --git a/src/gui/platforms/mac/qkeymapper_mac.cpp b/src/widgets/platforms/mac/qkeymapper_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qkeymapper_mac.cpp
rename to src/widgets/platforms/mac/qkeymapper_mac.cpp
diff --git a/src/gui/platforms/mac/qmacdefines_mac.h b/src/widgets/platforms/mac/qmacdefines_mac.h
similarity index 100%
rename from src/gui/platforms/mac/qmacdefines_mac.h
rename to src/widgets/platforms/mac/qmacdefines_mac.h
diff --git a/src/gui/platforms/mac/qmacgesturerecognizer_mac.mm b/src/widgets/platforms/mac/qmacgesturerecognizer_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qmacgesturerecognizer_mac.mm
rename to src/widgets/platforms/mac/qmacgesturerecognizer_mac.mm
diff --git a/src/gui/platforms/mac/qmacgesturerecognizer_mac_p.h b/src/widgets/platforms/mac/qmacgesturerecognizer_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qmacgesturerecognizer_mac_p.h
rename to src/widgets/platforms/mac/qmacgesturerecognizer_mac_p.h
diff --git a/src/gui/platforms/mac/qmime_mac.cpp b/src/widgets/platforms/mac/qmime_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qmime_mac.cpp
rename to src/widgets/platforms/mac/qmime_mac.cpp
diff --git a/src/gui/platforms/mac/qmultitouch_mac.mm b/src/widgets/platforms/mac/qmultitouch_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qmultitouch_mac.mm
rename to src/widgets/platforms/mac/qmultitouch_mac.mm
diff --git a/src/gui/platforms/mac/qmultitouch_mac_p.h b/src/widgets/platforms/mac/qmultitouch_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qmultitouch_mac_p.h
rename to src/widgets/platforms/mac/qmultitouch_mac_p.h
diff --git a/src/gui/platforms/mac/qnsframeview_mac_p.h b/src/widgets/platforms/mac/qnsframeview_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qnsframeview_mac_p.h
rename to src/widgets/platforms/mac/qnsframeview_mac_p.h
diff --git a/src/gui/platforms/mac/qnsthemeframe_mac_p.h b/src/widgets/platforms/mac/qnsthemeframe_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qnsthemeframe_mac_p.h
rename to src/widgets/platforms/mac/qnsthemeframe_mac_p.h
diff --git a/src/gui/platforms/mac/qnstitledframe_mac_p.h b/src/widgets/platforms/mac/qnstitledframe_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qnstitledframe_mac_p.h
rename to src/widgets/platforms/mac/qnstitledframe_mac_p.h
diff --git a/src/gui/platforms/mac/qpaintdevice_mac.cpp b/src/widgets/platforms/mac/qpaintdevice_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qpaintdevice_mac.cpp
rename to src/widgets/platforms/mac/qpaintdevice_mac.cpp
diff --git a/src/gui/platforms/mac/qpaintengine_mac.cpp b/src/widgets/platforms/mac/qpaintengine_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qpaintengine_mac.cpp
rename to src/widgets/platforms/mac/qpaintengine_mac.cpp
diff --git a/src/gui/platforms/mac/qpaintengine_mac_p.h b/src/widgets/platforms/mac/qpaintengine_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qpaintengine_mac_p.h
rename to src/widgets/platforms/mac/qpaintengine_mac_p.h
diff --git a/src/gui/platforms/mac/qpixmap_mac.cpp b/src/widgets/platforms/mac/qpixmap_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qpixmap_mac.cpp
rename to src/widgets/platforms/mac/qpixmap_mac.cpp
diff --git a/src/gui/platforms/mac/qpixmap_mac_p.h b/src/widgets/platforms/mac/qpixmap_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qpixmap_mac_p.h
rename to src/widgets/platforms/mac/qpixmap_mac_p.h
diff --git a/src/gui/platforms/mac/qprintengine_mac.mm b/src/widgets/platforms/mac/qprintengine_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qprintengine_mac.mm
rename to src/widgets/platforms/mac/qprintengine_mac.mm
diff --git a/src/gui/platforms/mac/qprintengine_mac_p.h b/src/widgets/platforms/mac/qprintengine_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qprintengine_mac_p.h
rename to src/widgets/platforms/mac/qprintengine_mac_p.h
diff --git a/src/gui/platforms/mac/qprinterinfo_mac.cpp b/src/widgets/platforms/mac/qprinterinfo_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qprinterinfo_mac.cpp
rename to src/widgets/platforms/mac/qprinterinfo_mac.cpp
diff --git a/src/gui/platforms/mac/qrawfont_mac.cpp b/src/widgets/platforms/mac/qrawfont_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qrawfont_mac.cpp
rename to src/widgets/platforms/mac/qrawfont_mac.cpp
diff --git a/src/gui/platforms/mac/qregion_mac.cpp b/src/widgets/platforms/mac/qregion_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qregion_mac.cpp
rename to src/widgets/platforms/mac/qregion_mac.cpp
diff --git a/src/gui/platforms/mac/qsound_mac.mm b/src/widgets/platforms/mac/qsound_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qsound_mac.mm
rename to src/widgets/platforms/mac/qsound_mac.mm
diff --git a/src/gui/platforms/mac/qt_cocoa_helpers_mac.mm b/src/widgets/platforms/mac/qt_cocoa_helpers_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qt_cocoa_helpers_mac.mm
rename to src/widgets/platforms/mac/qt_cocoa_helpers_mac.mm
diff --git a/src/gui/platforms/mac/qt_cocoa_helpers_mac_p.h b/src/widgets/platforms/mac/qt_cocoa_helpers_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qt_cocoa_helpers_mac_p.h
rename to src/widgets/platforms/mac/qt_cocoa_helpers_mac_p.h
diff --git a/src/gui/platforms/mac/qt_mac.cpp b/src/widgets/platforms/mac/qt_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qt_mac.cpp
rename to src/widgets/platforms/mac/qt_mac.cpp
diff --git a/src/gui/platforms/mac/qt_mac_p.h b/src/widgets/platforms/mac/qt_mac_p.h
similarity index 100%
rename from src/gui/platforms/mac/qt_mac_p.h
rename to src/widgets/platforms/mac/qt_mac_p.h
diff --git a/src/gui/platforms/mac/qtextengine_mac.cpp b/src/widgets/platforms/mac/qtextengine_mac.cpp
similarity index 100%
rename from src/gui/platforms/mac/qtextengine_mac.cpp
rename to src/widgets/platforms/mac/qtextengine_mac.cpp
diff --git a/src/gui/platforms/mac/qwidget_mac.mm b/src/widgets/platforms/mac/qwidget_mac.mm
similarity index 100%
rename from src/gui/platforms/mac/qwidget_mac.mm
rename to src/widgets/platforms/mac/qwidget_mac.mm
diff --git a/src/gui/platforms/s60/qapplication_s60.cpp b/src/widgets/platforms/s60/qapplication_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qapplication_s60.cpp
rename to src/widgets/platforms/s60/qapplication_s60.cpp
diff --git a/src/gui/platforms/s60/qclipboard_s60.cpp b/src/widgets/platforms/s60/qclipboard_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qclipboard_s60.cpp
rename to src/widgets/platforms/s60/qclipboard_s60.cpp
diff --git a/src/gui/platforms/s60/qcolormap_s60.cpp b/src/widgets/platforms/s60/qcolormap_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qcolormap_s60.cpp
rename to src/widgets/platforms/s60/qcolormap_s60.cpp
diff --git a/src/gui/platforms/s60/qcursor_s60.cpp b/src/widgets/platforms/s60/qcursor_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qcursor_s60.cpp
rename to src/widgets/platforms/s60/qcursor_s60.cpp
diff --git a/src/gui/platforms/s60/qdesktopwidget_s60.cpp b/src/widgets/platforms/s60/qdesktopwidget_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qdesktopwidget_s60.cpp
rename to src/widgets/platforms/s60/qdesktopwidget_s60.cpp
diff --git a/src/gui/platforms/s60/qdnd_s60.cpp b/src/widgets/platforms/s60/qdnd_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qdnd_s60.cpp
rename to src/widgets/platforms/s60/qdnd_s60.cpp
diff --git a/src/gui/platforms/s60/qeventdispatcher_s60.cpp b/src/widgets/platforms/s60/qeventdispatcher_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qeventdispatcher_s60.cpp
rename to src/widgets/platforms/s60/qeventdispatcher_s60.cpp
diff --git a/src/gui/platforms/s60/qeventdispatcher_s60_p.h b/src/widgets/platforms/s60/qeventdispatcher_s60_p.h
similarity index 100%
rename from src/gui/platforms/s60/qeventdispatcher_s60_p.h
rename to src/widgets/platforms/s60/qeventdispatcher_s60_p.h
diff --git a/src/gui/platforms/s60/qfont_s60.cpp b/src/widgets/platforms/s60/qfont_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qfont_s60.cpp
rename to src/widgets/platforms/s60/qfont_s60.cpp
diff --git a/src/gui/platforms/s60/qfontdatabase_s60.cpp b/src/widgets/platforms/s60/qfontdatabase_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qfontdatabase_s60.cpp
rename to src/widgets/platforms/s60/qfontdatabase_s60.cpp
diff --git a/src/gui/platforms/s60/qfontengine_s60.cpp b/src/widgets/platforms/s60/qfontengine_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qfontengine_s60.cpp
rename to src/widgets/platforms/s60/qfontengine_s60.cpp
diff --git a/src/gui/platforms/s60/qfontengine_s60_p.h b/src/widgets/platforms/s60/qfontengine_s60_p.h
similarity index 100%
rename from src/gui/platforms/s60/qfontengine_s60_p.h
rename to src/widgets/platforms/s60/qfontengine_s60_p.h
diff --git a/src/gui/platforms/s60/qkeymapper_s60.cpp b/src/widgets/platforms/s60/qkeymapper_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qkeymapper_s60.cpp
rename to src/widgets/platforms/s60/qkeymapper_s60.cpp
diff --git a/src/gui/platforms/s60/qpaintengine_s60.cpp b/src/widgets/platforms/s60/qpaintengine_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qpaintengine_s60.cpp
rename to src/widgets/platforms/s60/qpaintengine_s60.cpp
diff --git a/src/gui/platforms/s60/qpaintengine_s60_p.h b/src/widgets/platforms/s60/qpaintengine_s60_p.h
similarity index 100%
rename from src/gui/platforms/s60/qpaintengine_s60_p.h
rename to src/widgets/platforms/s60/qpaintengine_s60_p.h
diff --git a/src/gui/platforms/s60/qpixmap_s60.cpp b/src/widgets/platforms/s60/qpixmap_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qpixmap_s60.cpp
rename to src/widgets/platforms/s60/qpixmap_s60.cpp
diff --git a/src/gui/platforms/s60/qpixmap_s60_p.h b/src/widgets/platforms/s60/qpixmap_s60_p.h
similarity index 100%
rename from src/gui/platforms/s60/qpixmap_s60_p.h
rename to src/widgets/platforms/s60/qpixmap_s60_p.h
diff --git a/src/gui/platforms/s60/qregion_s60.cpp b/src/widgets/platforms/s60/qregion_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qregion_s60.cpp
rename to src/widgets/platforms/s60/qregion_s60.cpp
diff --git a/src/gui/platforms/s60/qsoftkeymanager_s60.cpp b/src/widgets/platforms/s60/qsoftkeymanager_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qsoftkeymanager_s60.cpp
rename to src/widgets/platforms/s60/qsoftkeymanager_s60.cpp
diff --git a/src/gui/platforms/s60/qsoftkeymanager_s60_p.h b/src/widgets/platforms/s60/qsoftkeymanager_s60_p.h
similarity index 100%
rename from src/gui/platforms/s60/qsoftkeymanager_s60_p.h
rename to src/widgets/platforms/s60/qsoftkeymanager_s60_p.h
diff --git a/src/gui/platforms/s60/qsound_s60.cpp b/src/widgets/platforms/s60/qsound_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qsound_s60.cpp
rename to src/widgets/platforms/s60/qsound_s60.cpp
diff --git a/src/gui/platforms/s60/qt_s60_p.h b/src/widgets/platforms/s60/qt_s60_p.h
similarity index 100%
rename from src/gui/platforms/s60/qt_s60_p.h
rename to src/widgets/platforms/s60/qt_s60_p.h
diff --git a/src/gui/platforms/s60/qwidget_s60.cpp b/src/widgets/platforms/s60/qwidget_s60.cpp
similarity index 100%
rename from src/gui/platforms/s60/qwidget_s60.cpp
rename to src/widgets/platforms/s60/qwidget_s60.cpp
diff --git a/src/gui/platforms/win/qapplication_win.cpp b/src/widgets/platforms/win/qapplication_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qapplication_win.cpp
rename to src/widgets/platforms/win/qapplication_win.cpp
diff --git a/src/gui/platforms/win/qclipboard_win.cpp b/src/widgets/platforms/win/qclipboard_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qclipboard_win.cpp
rename to src/widgets/platforms/win/qclipboard_win.cpp
diff --git a/src/gui/platforms/win/qcolormap_win.cpp b/src/widgets/platforms/win/qcolormap_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qcolormap_win.cpp
rename to src/widgets/platforms/win/qcolormap_win.cpp
diff --git a/src/gui/platforms/win/qcursor_win.cpp b/src/widgets/platforms/win/qcursor_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qcursor_win.cpp
rename to src/widgets/platforms/win/qcursor_win.cpp
diff --git a/src/gui/platforms/win/qdesktopwidget_win.cpp b/src/widgets/platforms/win/qdesktopwidget_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qdesktopwidget_win.cpp
rename to src/widgets/platforms/win/qdesktopwidget_win.cpp
diff --git a/src/gui/platforms/win/qdnd_win.cpp b/src/widgets/platforms/win/qdnd_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qdnd_win.cpp
rename to src/widgets/platforms/win/qdnd_win.cpp
diff --git a/src/gui/platforms/win/qfont_win.cpp b/src/widgets/platforms/win/qfont_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qfont_win.cpp
rename to src/widgets/platforms/win/qfont_win.cpp
diff --git a/src/gui/platforms/win/qfontdatabase_win.cpp b/src/widgets/platforms/win/qfontdatabase_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qfontdatabase_win.cpp
rename to src/widgets/platforms/win/qfontdatabase_win.cpp
diff --git a/src/gui/platforms/win/qfontengine_win.cpp b/src/widgets/platforms/win/qfontengine_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qfontengine_win.cpp
rename to src/widgets/platforms/win/qfontengine_win.cpp
diff --git a/src/gui/platforms/win/qfontengine_win_p.h b/src/widgets/platforms/win/qfontengine_win_p.h
similarity index 100%
rename from src/gui/platforms/win/qfontengine_win_p.h
rename to src/widgets/platforms/win/qfontengine_win_p.h
diff --git a/src/gui/platforms/win/qguifunctions_wince.cpp b/src/widgets/platforms/win/qguifunctions_wince.cpp
similarity index 100%
rename from src/gui/platforms/win/qguifunctions_wince.cpp
rename to src/widgets/platforms/win/qguifunctions_wince.cpp
diff --git a/src/gui/platforms/win/qguifunctions_wince.h b/src/widgets/platforms/win/qguifunctions_wince.h
similarity index 100%
rename from src/gui/platforms/win/qguifunctions_wince.h
rename to src/widgets/platforms/win/qguifunctions_wince.h
diff --git a/src/gui/platforms/win/qkeymapper_win.cpp b/src/widgets/platforms/win/qkeymapper_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qkeymapper_win.cpp
rename to src/widgets/platforms/win/qkeymapper_win.cpp
diff --git a/src/gui/platforms/win/qmime_win.cpp b/src/widgets/platforms/win/qmime_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qmime_win.cpp
rename to src/widgets/platforms/win/qmime_win.cpp
diff --git a/src/gui/platforms/win/qole_win.cpp b/src/widgets/platforms/win/qole_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qole_win.cpp
rename to src/widgets/platforms/win/qole_win.cpp
diff --git a/src/gui/platforms/win/qpaintdevice_win.cpp b/src/widgets/platforms/win/qpaintdevice_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qpaintdevice_win.cpp
rename to src/widgets/platforms/win/qpaintdevice_win.cpp
diff --git a/src/gui/platforms/win/qpixmap_win.cpp b/src/widgets/platforms/win/qpixmap_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qpixmap_win.cpp
rename to src/widgets/platforms/win/qpixmap_win.cpp
diff --git a/src/gui/platforms/win/qprintengine_win.cpp b/src/widgets/platforms/win/qprintengine_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qprintengine_win.cpp
rename to src/widgets/platforms/win/qprintengine_win.cpp
diff --git a/src/gui/platforms/win/qprintengine_win_p.h b/src/widgets/platforms/win/qprintengine_win_p.h
similarity index 100%
rename from src/gui/platforms/win/qprintengine_win_p.h
rename to src/widgets/platforms/win/qprintengine_win_p.h
diff --git a/src/gui/platforms/win/qprinterinfo_win.cpp b/src/widgets/platforms/win/qprinterinfo_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qprinterinfo_win.cpp
rename to src/widgets/platforms/win/qprinterinfo_win.cpp
diff --git a/src/gui/platforms/win/qrawfont_win.cpp b/src/widgets/platforms/win/qrawfont_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qrawfont_win.cpp
rename to src/widgets/platforms/win/qrawfont_win.cpp
diff --git a/src/gui/platforms/win/qregion_win.cpp b/src/widgets/platforms/win/qregion_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qregion_win.cpp
rename to src/widgets/platforms/win/qregion_win.cpp
diff --git a/src/gui/platforms/win/qsound_win.cpp b/src/widgets/platforms/win/qsound_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qsound_win.cpp
rename to src/widgets/platforms/win/qsound_win.cpp
diff --git a/src/gui/platforms/win/qwidget_win.cpp b/src/widgets/platforms/win/qwidget_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qwidget_win.cpp
rename to src/widgets/platforms/win/qwidget_win.cpp
diff --git a/src/gui/platforms/win/qwidget_wince.cpp b/src/widgets/platforms/win/qwidget_wince.cpp
similarity index 100%
rename from src/gui/platforms/win/qwidget_wince.cpp
rename to src/widgets/platforms/win/qwidget_wince.cpp
diff --git a/src/gui/platforms/win/qwindowdefs_win.h b/src/widgets/platforms/win/qwindowdefs_win.h
similarity index 100%
rename from src/gui/platforms/win/qwindowdefs_win.h
rename to src/widgets/platforms/win/qwindowdefs_win.h
diff --git a/src/gui/platforms/win/qwinnativepangesturerecognizer_win.cpp b/src/widgets/platforms/win/qwinnativepangesturerecognizer_win.cpp
similarity index 100%
rename from src/gui/platforms/win/qwinnativepangesturerecognizer_win.cpp
rename to src/widgets/platforms/win/qwinnativepangesturerecognizer_win.cpp
diff --git a/src/gui/platforms/win/qwinnativepangesturerecognizer_win_p.h b/src/widgets/platforms/win/qwinnativepangesturerecognizer_win_p.h
similarity index 100%
rename from src/gui/platforms/win/qwinnativepangesturerecognizer_win_p.h
rename to src/widgets/platforms/win/qwinnativepangesturerecognizer_win_p.h
diff --git a/src/gui/platforms/x11/qapplication_x11.cpp b/src/widgets/platforms/x11/qapplication_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qapplication_x11.cpp
rename to src/widgets/platforms/x11/qapplication_x11.cpp
diff --git a/src/gui/platforms/x11/qclipboard_x11.cpp b/src/widgets/platforms/x11/qclipboard_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qclipboard_x11.cpp
rename to src/widgets/platforms/x11/qclipboard_x11.cpp
diff --git a/src/gui/platforms/x11/qcolormap_x11.cpp b/src/widgets/platforms/x11/qcolormap_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qcolormap_x11.cpp
rename to src/widgets/platforms/x11/qcolormap_x11.cpp
diff --git a/src/gui/platforms/x11/qcursor_x11.cpp b/src/widgets/platforms/x11/qcursor_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qcursor_x11.cpp
rename to src/widgets/platforms/x11/qcursor_x11.cpp
diff --git a/src/gui/platforms/x11/qdesktopwidget_x11.cpp b/src/widgets/platforms/x11/qdesktopwidget_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qdesktopwidget_x11.cpp
rename to src/widgets/platforms/x11/qdesktopwidget_x11.cpp
diff --git a/src/gui/platforms/x11/qdnd_x11.cpp b/src/widgets/platforms/x11/qdnd_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qdnd_x11.cpp
rename to src/widgets/platforms/x11/qdnd_x11.cpp
diff --git a/src/gui/platforms/x11/qeventdispatcher_x11.cpp b/src/widgets/platforms/x11/qeventdispatcher_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qeventdispatcher_x11.cpp
rename to src/widgets/platforms/x11/qeventdispatcher_x11.cpp
diff --git a/src/gui/platforms/x11/qeventdispatcher_x11_p.h b/src/widgets/platforms/x11/qeventdispatcher_x11_p.h
similarity index 100%
rename from src/gui/platforms/x11/qeventdispatcher_x11_p.h
rename to src/widgets/platforms/x11/qeventdispatcher_x11_p.h
diff --git a/src/gui/platforms/x11/qfont_x11.cpp b/src/widgets/platforms/x11/qfont_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qfont_x11.cpp
rename to src/widgets/platforms/x11/qfont_x11.cpp
diff --git a/src/gui/platforms/x11/qfontdatabase_x11.cpp b/src/widgets/platforms/x11/qfontdatabase_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qfontdatabase_x11.cpp
rename to src/widgets/platforms/x11/qfontdatabase_x11.cpp
diff --git a/src/gui/platforms/x11/qfontengine_x11.cpp b/src/widgets/platforms/x11/qfontengine_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qfontengine_x11.cpp
rename to src/widgets/platforms/x11/qfontengine_x11.cpp
diff --git a/src/gui/platforms/x11/qfontengine_x11_p.h b/src/widgets/platforms/x11/qfontengine_x11_p.h
similarity index 100%
rename from src/gui/platforms/x11/qfontengine_x11_p.h
rename to src/widgets/platforms/x11/qfontengine_x11_p.h
diff --git a/src/gui/platforms/x11/qkde.cpp b/src/widgets/platforms/x11/qkde.cpp
similarity index 100%
rename from src/gui/platforms/x11/qkde.cpp
rename to src/widgets/platforms/x11/qkde.cpp
diff --git a/src/gui/platforms/x11/qkde_p.h b/src/widgets/platforms/x11/qkde_p.h
similarity index 100%
rename from src/gui/platforms/x11/qkde_p.h
rename to src/widgets/platforms/x11/qkde_p.h
diff --git a/src/gui/platforms/x11/qkeymapper_x11.cpp b/src/widgets/platforms/x11/qkeymapper_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qkeymapper_x11.cpp
rename to src/widgets/platforms/x11/qkeymapper_x11.cpp
diff --git a/src/gui/platforms/x11/qkeymapper_x11_p.cpp b/src/widgets/platforms/x11/qkeymapper_x11_p.cpp
similarity index 100%
rename from src/gui/platforms/x11/qkeymapper_x11_p.cpp
rename to src/widgets/platforms/x11/qkeymapper_x11_p.cpp
diff --git a/src/gui/platforms/x11/qmotifdnd_x11.cpp b/src/widgets/platforms/x11/qmotifdnd_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qmotifdnd_x11.cpp
rename to src/widgets/platforms/x11/qmotifdnd_x11.cpp
diff --git a/src/gui/platforms/x11/qpaintdevice_x11.cpp b/src/widgets/platforms/x11/qpaintdevice_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qpaintdevice_x11.cpp
rename to src/widgets/platforms/x11/qpaintdevice_x11.cpp
diff --git a/src/gui/platforms/x11/qpaintengine_x11.cpp b/src/widgets/platforms/x11/qpaintengine_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qpaintengine_x11.cpp
rename to src/widgets/platforms/x11/qpaintengine_x11.cpp
diff --git a/src/gui/platforms/x11/qpaintengine_x11_p.h b/src/widgets/platforms/x11/qpaintengine_x11_p.h
similarity index 100%
rename from src/gui/platforms/x11/qpaintengine_x11_p.h
rename to src/widgets/platforms/x11/qpaintengine_x11_p.h
diff --git a/src/gui/platforms/x11/qpixmap_x11.cpp b/src/widgets/platforms/x11/qpixmap_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qpixmap_x11.cpp
rename to src/widgets/platforms/x11/qpixmap_x11.cpp
diff --git a/src/gui/platforms/x11/qpixmap_x11_p.h b/src/widgets/platforms/x11/qpixmap_x11_p.h
similarity index 100%
rename from src/gui/platforms/x11/qpixmap_x11_p.h
rename to src/widgets/platforms/x11/qpixmap_x11_p.h
diff --git a/src/gui/platforms/x11/qregion_x11.cpp b/src/widgets/platforms/x11/qregion_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qregion_x11.cpp
rename to src/widgets/platforms/x11/qregion_x11.cpp
diff --git a/src/gui/platforms/x11/qsound_x11.cpp b/src/widgets/platforms/x11/qsound_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qsound_x11.cpp
rename to src/widgets/platforms/x11/qsound_x11.cpp
diff --git a/src/gui/platforms/x11/qt_x11_p.h b/src/widgets/platforms/x11/qt_x11_p.h
similarity index 100%
rename from src/gui/platforms/x11/qt_x11_p.h
rename to src/widgets/platforms/x11/qt_x11_p.h
diff --git a/src/gui/platforms/x11/qwidget_x11.cpp b/src/widgets/platforms/x11/qwidget_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qwidget_x11.cpp
rename to src/widgets/platforms/x11/qwidget_x11.cpp
diff --git a/src/gui/platforms/x11/qwidgetcreate_x11.cpp b/src/widgets/platforms/x11/qwidgetcreate_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qwidgetcreate_x11.cpp
rename to src/widgets/platforms/x11/qwidgetcreate_x11.cpp
diff --git a/src/gui/platforms/x11/qx11embed_x11.cpp b/src/widgets/platforms/x11/qx11embed_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qx11embed_x11.cpp
rename to src/widgets/platforms/x11/qx11embed_x11.cpp
diff --git a/src/gui/platforms/x11/qx11embed_x11.h b/src/widgets/platforms/x11/qx11embed_x11.h
similarity index 100%
rename from src/gui/platforms/x11/qx11embed_x11.h
rename to src/widgets/platforms/x11/qx11embed_x11.h
diff --git a/src/gui/platforms/x11/qx11info_x11.cpp b/src/widgets/platforms/x11/qx11info_x11.cpp
similarity index 100%
rename from src/gui/platforms/x11/qx11info_x11.cpp
rename to src/widgets/platforms/x11/qx11info_x11.cpp
diff --git a/src/gui/platforms/x11/qx11info_x11.h b/src/widgets/platforms/x11/qx11info_x11.h
similarity index 100%
rename from src/gui/platforms/x11/qx11info_x11.h
rename to src/widgets/platforms/x11/qx11info_x11.h
diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/widgets/s60framework/qs60mainapplication.cpp
similarity index 100%
rename from src/gui/s60framework/qs60mainapplication.cpp
rename to src/widgets/s60framework/qs60mainapplication.cpp
diff --git a/src/gui/s60framework/qs60mainapplication.h b/src/widgets/s60framework/qs60mainapplication.h
similarity index 100%
rename from src/gui/s60framework/qs60mainapplication.h
rename to src/widgets/s60framework/qs60mainapplication.h
diff --git a/src/gui/s60framework/qs60mainapplication_p.h b/src/widgets/s60framework/qs60mainapplication_p.h
similarity index 100%
rename from src/gui/s60framework/qs60mainapplication_p.h
rename to src/widgets/s60framework/qs60mainapplication_p.h
diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/widgets/s60framework/qs60mainappui.cpp
similarity index 100%
rename from src/gui/s60framework/qs60mainappui.cpp
rename to src/widgets/s60framework/qs60mainappui.cpp
diff --git a/src/gui/s60framework/qs60mainappui.h b/src/widgets/s60framework/qs60mainappui.h
similarity index 100%
rename from src/gui/s60framework/qs60mainappui.h
rename to src/widgets/s60framework/qs60mainappui.h
diff --git a/src/gui/s60framework/qs60maindocument.cpp b/src/widgets/s60framework/qs60maindocument.cpp
similarity index 100%
rename from src/gui/s60framework/qs60maindocument.cpp
rename to src/widgets/s60framework/qs60maindocument.cpp
diff --git a/src/gui/s60framework/qs60maindocument.h b/src/widgets/s60framework/qs60maindocument.h
similarity index 100%
rename from src/gui/s60framework/qs60maindocument.h
rename to src/widgets/s60framework/qs60maindocument.h
diff --git a/src/gui/s60framework/s60framework.pri b/src/widgets/s60framework/s60framework.pri
similarity index 100%
rename from src/gui/s60framework/s60framework.pri
rename to src/widgets/s60framework/s60framework.pri
diff --git a/src/gui/s60framework/s60main.rss b/src/widgets/s60framework/s60main.rss
similarity index 100%
rename from src/gui/s60framework/s60main.rss
rename to src/widgets/s60framework/s60main.rss
diff --git a/src/gui/statemachine/qbasickeyeventtransition.cpp b/src/widgets/statemachine/qbasickeyeventtransition.cpp
similarity index 100%
rename from src/gui/statemachine/qbasickeyeventtransition.cpp
rename to src/widgets/statemachine/qbasickeyeventtransition.cpp
diff --git a/src/gui/statemachine/qbasickeyeventtransition_p.h b/src/widgets/statemachine/qbasickeyeventtransition_p.h
similarity index 100%
rename from src/gui/statemachine/qbasickeyeventtransition_p.h
rename to src/widgets/statemachine/qbasickeyeventtransition_p.h
diff --git a/src/gui/statemachine/qbasicmouseeventtransition.cpp b/src/widgets/statemachine/qbasicmouseeventtransition.cpp
similarity index 100%
rename from src/gui/statemachine/qbasicmouseeventtransition.cpp
rename to src/widgets/statemachine/qbasicmouseeventtransition.cpp
diff --git a/src/gui/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h
similarity index 100%
rename from src/gui/statemachine/qbasicmouseeventtransition_p.h
rename to src/widgets/statemachine/qbasicmouseeventtransition_p.h
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp
similarity index 100%
rename from src/gui/statemachine/qguistatemachine.cpp
rename to src/widgets/statemachine/qguistatemachine.cpp
diff --git a/src/gui/statemachine/qkeyeventtransition.cpp b/src/widgets/statemachine/qkeyeventtransition.cpp
similarity index 100%
rename from src/gui/statemachine/qkeyeventtransition.cpp
rename to src/widgets/statemachine/qkeyeventtransition.cpp
diff --git a/src/gui/statemachine/qkeyeventtransition.h b/src/widgets/statemachine/qkeyeventtransition.h
similarity index 100%
rename from src/gui/statemachine/qkeyeventtransition.h
rename to src/widgets/statemachine/qkeyeventtransition.h
diff --git a/src/gui/statemachine/qmouseeventtransition.cpp b/src/widgets/statemachine/qmouseeventtransition.cpp
similarity index 100%
rename from src/gui/statemachine/qmouseeventtransition.cpp
rename to src/widgets/statemachine/qmouseeventtransition.cpp
diff --git a/src/gui/statemachine/qmouseeventtransition.h b/src/widgets/statemachine/qmouseeventtransition.h
similarity index 100%
rename from src/gui/statemachine/qmouseeventtransition.h
rename to src/widgets/statemachine/qmouseeventtransition.h
diff --git a/src/gui/statemachine/statemachine.pri b/src/widgets/statemachine/statemachine.pri
similarity index 100%
rename from src/gui/statemachine/statemachine.pri
rename to src/widgets/statemachine/statemachine.pri
diff --git a/src/gui/styles/images/cdr-128.png b/src/widgets/styles/images/cdr-128.png
similarity index 100%
rename from src/gui/styles/images/cdr-128.png
rename to src/widgets/styles/images/cdr-128.png
diff --git a/src/gui/styles/images/cdr-16.png b/src/widgets/styles/images/cdr-16.png
similarity index 100%
rename from src/gui/styles/images/cdr-16.png
rename to src/widgets/styles/images/cdr-16.png
diff --git a/src/gui/styles/images/cdr-32.png b/src/widgets/styles/images/cdr-32.png
similarity index 100%
rename from src/gui/styles/images/cdr-32.png
rename to src/widgets/styles/images/cdr-32.png
diff --git a/src/gui/styles/images/closedock-16.png b/src/widgets/styles/images/closedock-16.png
similarity index 100%
rename from src/gui/styles/images/closedock-16.png
rename to src/widgets/styles/images/closedock-16.png
diff --git a/src/gui/styles/images/closedock-down-16.png b/src/widgets/styles/images/closedock-down-16.png
similarity index 100%
rename from src/gui/styles/images/closedock-down-16.png
rename to src/widgets/styles/images/closedock-down-16.png
diff --git a/src/gui/styles/images/computer-16.png b/src/widgets/styles/images/computer-16.png
similarity index 100%
rename from src/gui/styles/images/computer-16.png
rename to src/widgets/styles/images/computer-16.png
diff --git a/src/gui/styles/images/computer-32.png b/src/widgets/styles/images/computer-32.png
similarity index 100%
rename from src/gui/styles/images/computer-32.png
rename to src/widgets/styles/images/computer-32.png
diff --git a/src/gui/styles/images/defaults60theme.blob b/src/widgets/styles/images/defaults60theme.blob
similarity index 100%
rename from src/gui/styles/images/defaults60theme.blob
rename to src/widgets/styles/images/defaults60theme.blob
diff --git a/src/gui/styles/images/desktop-16.png b/src/widgets/styles/images/desktop-16.png
similarity index 100%
rename from src/gui/styles/images/desktop-16.png
rename to src/widgets/styles/images/desktop-16.png
diff --git a/src/gui/styles/images/desktop-32.png b/src/widgets/styles/images/desktop-32.png
similarity index 100%
rename from src/gui/styles/images/desktop-32.png
rename to src/widgets/styles/images/desktop-32.png
diff --git a/src/gui/styles/images/dirclosed-128.png b/src/widgets/styles/images/dirclosed-128.png
similarity index 100%
rename from src/gui/styles/images/dirclosed-128.png
rename to src/widgets/styles/images/dirclosed-128.png
diff --git a/src/gui/styles/images/dirclosed-16.png b/src/widgets/styles/images/dirclosed-16.png
similarity index 100%
rename from src/gui/styles/images/dirclosed-16.png
rename to src/widgets/styles/images/dirclosed-16.png
diff --git a/src/gui/styles/images/dirclosed-32.png b/src/widgets/styles/images/dirclosed-32.png
similarity index 100%
rename from src/gui/styles/images/dirclosed-32.png
rename to src/widgets/styles/images/dirclosed-32.png
diff --git a/src/gui/styles/images/dirlink-128.png b/src/widgets/styles/images/dirlink-128.png
similarity index 100%
rename from src/gui/styles/images/dirlink-128.png
rename to src/widgets/styles/images/dirlink-128.png
diff --git a/src/gui/styles/images/dirlink-16.png b/src/widgets/styles/images/dirlink-16.png
similarity index 100%
rename from src/gui/styles/images/dirlink-16.png
rename to src/widgets/styles/images/dirlink-16.png
diff --git a/src/gui/styles/images/dirlink-32.png b/src/widgets/styles/images/dirlink-32.png
similarity index 100%
rename from src/gui/styles/images/dirlink-32.png
rename to src/widgets/styles/images/dirlink-32.png
diff --git a/src/gui/styles/images/diropen-128.png b/src/widgets/styles/images/diropen-128.png
similarity index 100%
rename from src/gui/styles/images/diropen-128.png
rename to src/widgets/styles/images/diropen-128.png
diff --git a/src/gui/styles/images/diropen-16.png b/src/widgets/styles/images/diropen-16.png
similarity index 100%
rename from src/gui/styles/images/diropen-16.png
rename to src/widgets/styles/images/diropen-16.png
diff --git a/src/gui/styles/images/diropen-32.png b/src/widgets/styles/images/diropen-32.png
similarity index 100%
rename from src/gui/styles/images/diropen-32.png
rename to src/widgets/styles/images/diropen-32.png
diff --git a/src/gui/styles/images/dockdock-16.png b/src/widgets/styles/images/dockdock-16.png
similarity index 100%
rename from src/gui/styles/images/dockdock-16.png
rename to src/widgets/styles/images/dockdock-16.png
diff --git a/src/gui/styles/images/dockdock-down-16.png b/src/widgets/styles/images/dockdock-down-16.png
similarity index 100%
rename from src/gui/styles/images/dockdock-down-16.png
rename to src/widgets/styles/images/dockdock-down-16.png
diff --git a/src/gui/styles/images/down-128.png b/src/widgets/styles/images/down-128.png
similarity index 100%
rename from src/gui/styles/images/down-128.png
rename to src/widgets/styles/images/down-128.png
diff --git a/src/gui/styles/images/down-16.png b/src/widgets/styles/images/down-16.png
similarity index 100%
rename from src/gui/styles/images/down-16.png
rename to src/widgets/styles/images/down-16.png
diff --git a/src/gui/styles/images/down-32.png b/src/widgets/styles/images/down-32.png
similarity index 100%
rename from src/gui/styles/images/down-32.png
rename to src/widgets/styles/images/down-32.png
diff --git a/src/gui/styles/images/dvd-128.png b/src/widgets/styles/images/dvd-128.png
similarity index 100%
rename from src/gui/styles/images/dvd-128.png
rename to src/widgets/styles/images/dvd-128.png
diff --git a/src/gui/styles/images/dvd-16.png b/src/widgets/styles/images/dvd-16.png
similarity index 100%
rename from src/gui/styles/images/dvd-16.png
rename to src/widgets/styles/images/dvd-16.png
diff --git a/src/gui/styles/images/dvd-32.png b/src/widgets/styles/images/dvd-32.png
similarity index 100%
rename from src/gui/styles/images/dvd-32.png
rename to src/widgets/styles/images/dvd-32.png
diff --git a/src/gui/styles/images/file-128.png b/src/widgets/styles/images/file-128.png
similarity index 100%
rename from src/gui/styles/images/file-128.png
rename to src/widgets/styles/images/file-128.png
diff --git a/src/gui/styles/images/file-16.png b/src/widgets/styles/images/file-16.png
similarity index 100%
rename from src/gui/styles/images/file-16.png
rename to src/widgets/styles/images/file-16.png
diff --git a/src/gui/styles/images/file-32.png b/src/widgets/styles/images/file-32.png
similarity index 100%
rename from src/gui/styles/images/file-32.png
rename to src/widgets/styles/images/file-32.png
diff --git a/src/gui/styles/images/filecontents-128.png b/src/widgets/styles/images/filecontents-128.png
similarity index 100%
rename from src/gui/styles/images/filecontents-128.png
rename to src/widgets/styles/images/filecontents-128.png
diff --git a/src/gui/styles/images/filecontents-16.png b/src/widgets/styles/images/filecontents-16.png
similarity index 100%
rename from src/gui/styles/images/filecontents-16.png
rename to src/widgets/styles/images/filecontents-16.png
diff --git a/src/gui/styles/images/filecontents-32.png b/src/widgets/styles/images/filecontents-32.png
similarity index 100%
rename from src/gui/styles/images/filecontents-32.png
rename to src/widgets/styles/images/filecontents-32.png
diff --git a/src/gui/styles/images/fileinfo-128.png b/src/widgets/styles/images/fileinfo-128.png
similarity index 100%
rename from src/gui/styles/images/fileinfo-128.png
rename to src/widgets/styles/images/fileinfo-128.png
diff --git a/src/gui/styles/images/fileinfo-16.png b/src/widgets/styles/images/fileinfo-16.png
similarity index 100%
rename from src/gui/styles/images/fileinfo-16.png
rename to src/widgets/styles/images/fileinfo-16.png
diff --git a/src/gui/styles/images/fileinfo-32.png b/src/widgets/styles/images/fileinfo-32.png
similarity index 100%
rename from src/gui/styles/images/fileinfo-32.png
rename to src/widgets/styles/images/fileinfo-32.png
diff --git a/src/gui/styles/images/filelink-128.png b/src/widgets/styles/images/filelink-128.png
similarity index 100%
rename from src/gui/styles/images/filelink-128.png
rename to src/widgets/styles/images/filelink-128.png
diff --git a/src/gui/styles/images/filelink-16.png b/src/widgets/styles/images/filelink-16.png
similarity index 100%
rename from src/gui/styles/images/filelink-16.png
rename to src/widgets/styles/images/filelink-16.png
diff --git a/src/gui/styles/images/filelink-32.png b/src/widgets/styles/images/filelink-32.png
similarity index 100%
rename from src/gui/styles/images/filelink-32.png
rename to src/widgets/styles/images/filelink-32.png
diff --git a/src/gui/styles/images/floppy-128.png b/src/widgets/styles/images/floppy-128.png
similarity index 100%
rename from src/gui/styles/images/floppy-128.png
rename to src/widgets/styles/images/floppy-128.png
diff --git a/src/gui/styles/images/floppy-16.png b/src/widgets/styles/images/floppy-16.png
similarity index 100%
rename from src/gui/styles/images/floppy-16.png
rename to src/widgets/styles/images/floppy-16.png
diff --git a/src/gui/styles/images/floppy-32.png b/src/widgets/styles/images/floppy-32.png
similarity index 100%
rename from src/gui/styles/images/floppy-32.png
rename to src/widgets/styles/images/floppy-32.png
diff --git a/src/gui/styles/images/fontbitmap-16.png b/src/widgets/styles/images/fontbitmap-16.png
similarity index 100%
rename from src/gui/styles/images/fontbitmap-16.png
rename to src/widgets/styles/images/fontbitmap-16.png
diff --git a/src/gui/styles/images/fonttruetype-16.png b/src/widgets/styles/images/fonttruetype-16.png
similarity index 100%
rename from src/gui/styles/images/fonttruetype-16.png
rename to src/widgets/styles/images/fonttruetype-16.png
diff --git a/src/gui/styles/images/harddrive-128.png b/src/widgets/styles/images/harddrive-128.png
similarity index 100%
rename from src/gui/styles/images/harddrive-128.png
rename to src/widgets/styles/images/harddrive-128.png
diff --git a/src/gui/styles/images/harddrive-16.png b/src/widgets/styles/images/harddrive-16.png
similarity index 100%
rename from src/gui/styles/images/harddrive-16.png
rename to src/widgets/styles/images/harddrive-16.png
diff --git a/src/gui/styles/images/harddrive-32.png b/src/widgets/styles/images/harddrive-32.png
similarity index 100%
rename from src/gui/styles/images/harddrive-32.png
rename to src/widgets/styles/images/harddrive-32.png
diff --git a/src/gui/styles/images/left-128.png b/src/widgets/styles/images/left-128.png
similarity index 100%
rename from src/gui/styles/images/left-128.png
rename to src/widgets/styles/images/left-128.png
diff --git a/src/gui/styles/images/left-16.png b/src/widgets/styles/images/left-16.png
similarity index 100%
rename from src/gui/styles/images/left-16.png
rename to src/widgets/styles/images/left-16.png
diff --git a/src/gui/styles/images/left-32.png b/src/widgets/styles/images/left-32.png
similarity index 100%
rename from src/gui/styles/images/left-32.png
rename to src/widgets/styles/images/left-32.png
diff --git a/src/gui/styles/images/media-pause-16.png b/src/widgets/styles/images/media-pause-16.png
similarity index 100%
rename from src/gui/styles/images/media-pause-16.png
rename to src/widgets/styles/images/media-pause-16.png
diff --git a/src/gui/styles/images/media-pause-32.png b/src/widgets/styles/images/media-pause-32.png
similarity index 100%
rename from src/gui/styles/images/media-pause-32.png
rename to src/widgets/styles/images/media-pause-32.png
diff --git a/src/gui/styles/images/media-play-16.png b/src/widgets/styles/images/media-play-16.png
similarity index 100%
rename from src/gui/styles/images/media-play-16.png
rename to src/widgets/styles/images/media-play-16.png
diff --git a/src/gui/styles/images/media-play-32.png b/src/widgets/styles/images/media-play-32.png
similarity index 100%
rename from src/gui/styles/images/media-play-32.png
rename to src/widgets/styles/images/media-play-32.png
diff --git a/src/gui/styles/images/media-seek-backward-16.png b/src/widgets/styles/images/media-seek-backward-16.png
similarity index 100%
rename from src/gui/styles/images/media-seek-backward-16.png
rename to src/widgets/styles/images/media-seek-backward-16.png
diff --git a/src/gui/styles/images/media-seek-backward-32.png b/src/widgets/styles/images/media-seek-backward-32.png
similarity index 100%
rename from src/gui/styles/images/media-seek-backward-32.png
rename to src/widgets/styles/images/media-seek-backward-32.png
diff --git a/src/gui/styles/images/media-seek-forward-16.png b/src/widgets/styles/images/media-seek-forward-16.png
similarity index 100%
rename from src/gui/styles/images/media-seek-forward-16.png
rename to src/widgets/styles/images/media-seek-forward-16.png
diff --git a/src/gui/styles/images/media-seek-forward-32.png b/src/widgets/styles/images/media-seek-forward-32.png
similarity index 100%
rename from src/gui/styles/images/media-seek-forward-32.png
rename to src/widgets/styles/images/media-seek-forward-32.png
diff --git a/src/gui/styles/images/media-skip-backward-16.png b/src/widgets/styles/images/media-skip-backward-16.png
similarity index 100%
rename from src/gui/styles/images/media-skip-backward-16.png
rename to src/widgets/styles/images/media-skip-backward-16.png
diff --git a/src/gui/styles/images/media-skip-backward-32.png b/src/widgets/styles/images/media-skip-backward-32.png
similarity index 100%
rename from src/gui/styles/images/media-skip-backward-32.png
rename to src/widgets/styles/images/media-skip-backward-32.png
diff --git a/src/gui/styles/images/media-skip-forward-16.png b/src/widgets/styles/images/media-skip-forward-16.png
similarity index 100%
rename from src/gui/styles/images/media-skip-forward-16.png
rename to src/widgets/styles/images/media-skip-forward-16.png
diff --git a/src/gui/styles/images/media-skip-forward-32.png b/src/widgets/styles/images/media-skip-forward-32.png
similarity index 100%
rename from src/gui/styles/images/media-skip-forward-32.png
rename to src/widgets/styles/images/media-skip-forward-32.png
diff --git a/src/gui/styles/images/media-stop-16.png b/src/widgets/styles/images/media-stop-16.png
similarity index 100%
rename from src/gui/styles/images/media-stop-16.png
rename to src/widgets/styles/images/media-stop-16.png
diff --git a/src/gui/styles/images/media-stop-32.png b/src/widgets/styles/images/media-stop-32.png
similarity index 100%
rename from src/gui/styles/images/media-stop-32.png
rename to src/widgets/styles/images/media-stop-32.png
diff --git a/src/gui/styles/images/media-volume-16.png b/src/widgets/styles/images/media-volume-16.png
similarity index 100%
rename from src/gui/styles/images/media-volume-16.png
rename to src/widgets/styles/images/media-volume-16.png
diff --git a/src/gui/styles/images/media-volume-muted-16.png b/src/widgets/styles/images/media-volume-muted-16.png
similarity index 100%
rename from src/gui/styles/images/media-volume-muted-16.png
rename to src/widgets/styles/images/media-volume-muted-16.png
diff --git a/src/gui/styles/images/networkdrive-128.png b/src/widgets/styles/images/networkdrive-128.png
similarity index 100%
rename from src/gui/styles/images/networkdrive-128.png
rename to src/widgets/styles/images/networkdrive-128.png
diff --git a/src/gui/styles/images/networkdrive-16.png b/src/widgets/styles/images/networkdrive-16.png
similarity index 100%
rename from src/gui/styles/images/networkdrive-16.png
rename to src/widgets/styles/images/networkdrive-16.png
diff --git a/src/gui/styles/images/networkdrive-32.png b/src/widgets/styles/images/networkdrive-32.png
similarity index 100%
rename from src/gui/styles/images/networkdrive-32.png
rename to src/widgets/styles/images/networkdrive-32.png
diff --git a/src/gui/styles/images/newdirectory-128.png b/src/widgets/styles/images/newdirectory-128.png
similarity index 100%
rename from src/gui/styles/images/newdirectory-128.png
rename to src/widgets/styles/images/newdirectory-128.png
diff --git a/src/gui/styles/images/newdirectory-16.png b/src/widgets/styles/images/newdirectory-16.png
similarity index 100%
rename from src/gui/styles/images/newdirectory-16.png
rename to src/widgets/styles/images/newdirectory-16.png
diff --git a/src/gui/styles/images/newdirectory-32.png b/src/widgets/styles/images/newdirectory-32.png
similarity index 100%
rename from src/gui/styles/images/newdirectory-32.png
rename to src/widgets/styles/images/newdirectory-32.png
diff --git a/src/gui/styles/images/parentdir-128.png b/src/widgets/styles/images/parentdir-128.png
similarity index 100%
rename from src/gui/styles/images/parentdir-128.png
rename to src/widgets/styles/images/parentdir-128.png
diff --git a/src/gui/styles/images/parentdir-16.png b/src/widgets/styles/images/parentdir-16.png
similarity index 100%
rename from src/gui/styles/images/parentdir-16.png
rename to src/widgets/styles/images/parentdir-16.png
diff --git a/src/gui/styles/images/parentdir-32.png b/src/widgets/styles/images/parentdir-32.png
similarity index 100%
rename from src/gui/styles/images/parentdir-32.png
rename to src/widgets/styles/images/parentdir-32.png
diff --git a/src/gui/styles/images/refresh-24.png b/src/widgets/styles/images/refresh-24.png
similarity index 100%
rename from src/gui/styles/images/refresh-24.png
rename to src/widgets/styles/images/refresh-24.png
diff --git a/src/gui/styles/images/refresh-32.png b/src/widgets/styles/images/refresh-32.png
similarity index 100%
rename from src/gui/styles/images/refresh-32.png
rename to src/widgets/styles/images/refresh-32.png
diff --git a/src/gui/styles/images/right-128.png b/src/widgets/styles/images/right-128.png
similarity index 100%
rename from src/gui/styles/images/right-128.png
rename to src/widgets/styles/images/right-128.png
diff --git a/src/gui/styles/images/right-16.png b/src/widgets/styles/images/right-16.png
similarity index 100%
rename from src/gui/styles/images/right-16.png
rename to src/widgets/styles/images/right-16.png
diff --git a/src/gui/styles/images/right-32.png b/src/widgets/styles/images/right-32.png
similarity index 100%
rename from src/gui/styles/images/right-32.png
rename to src/widgets/styles/images/right-32.png
diff --git a/src/gui/styles/images/standardbutton-apply-128.png b/src/widgets/styles/images/standardbutton-apply-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-apply-128.png
rename to src/widgets/styles/images/standardbutton-apply-128.png
diff --git a/src/gui/styles/images/standardbutton-apply-16.png b/src/widgets/styles/images/standardbutton-apply-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-apply-16.png
rename to src/widgets/styles/images/standardbutton-apply-16.png
diff --git a/src/gui/styles/images/standardbutton-apply-32.png b/src/widgets/styles/images/standardbutton-apply-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-apply-32.png
rename to src/widgets/styles/images/standardbutton-apply-32.png
diff --git a/src/gui/styles/images/standardbutton-cancel-128.png b/src/widgets/styles/images/standardbutton-cancel-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-cancel-128.png
rename to src/widgets/styles/images/standardbutton-cancel-128.png
diff --git a/src/gui/styles/images/standardbutton-cancel-16.png b/src/widgets/styles/images/standardbutton-cancel-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-cancel-16.png
rename to src/widgets/styles/images/standardbutton-cancel-16.png
diff --git a/src/gui/styles/images/standardbutton-cancel-32.png b/src/widgets/styles/images/standardbutton-cancel-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-cancel-32.png
rename to src/widgets/styles/images/standardbutton-cancel-32.png
diff --git a/src/gui/styles/images/standardbutton-clear-128.png b/src/widgets/styles/images/standardbutton-clear-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-clear-128.png
rename to src/widgets/styles/images/standardbutton-clear-128.png
diff --git a/src/gui/styles/images/standardbutton-clear-16.png b/src/widgets/styles/images/standardbutton-clear-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-clear-16.png
rename to src/widgets/styles/images/standardbutton-clear-16.png
diff --git a/src/gui/styles/images/standardbutton-clear-32.png b/src/widgets/styles/images/standardbutton-clear-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-clear-32.png
rename to src/widgets/styles/images/standardbutton-clear-32.png
diff --git a/src/gui/styles/images/standardbutton-close-128.png b/src/widgets/styles/images/standardbutton-close-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-close-128.png
rename to src/widgets/styles/images/standardbutton-close-128.png
diff --git a/src/gui/styles/images/standardbutton-close-16.png b/src/widgets/styles/images/standardbutton-close-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-close-16.png
rename to src/widgets/styles/images/standardbutton-close-16.png
diff --git a/src/gui/styles/images/standardbutton-close-32.png b/src/widgets/styles/images/standardbutton-close-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-close-32.png
rename to src/widgets/styles/images/standardbutton-close-32.png
diff --git a/src/gui/styles/images/standardbutton-closetab-16.png b/src/widgets/styles/images/standardbutton-closetab-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-closetab-16.png
rename to src/widgets/styles/images/standardbutton-closetab-16.png
diff --git a/src/gui/styles/images/standardbutton-closetab-down-16.png b/src/widgets/styles/images/standardbutton-closetab-down-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-closetab-down-16.png
rename to src/widgets/styles/images/standardbutton-closetab-down-16.png
diff --git a/src/gui/styles/images/standardbutton-closetab-hover-16.png b/src/widgets/styles/images/standardbutton-closetab-hover-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-closetab-hover-16.png
rename to src/widgets/styles/images/standardbutton-closetab-hover-16.png
diff --git a/src/gui/styles/images/standardbutton-delete-128.png b/src/widgets/styles/images/standardbutton-delete-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-delete-128.png
rename to src/widgets/styles/images/standardbutton-delete-128.png
diff --git a/src/gui/styles/images/standardbutton-delete-16.png b/src/widgets/styles/images/standardbutton-delete-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-delete-16.png
rename to src/widgets/styles/images/standardbutton-delete-16.png
diff --git a/src/gui/styles/images/standardbutton-delete-32.png b/src/widgets/styles/images/standardbutton-delete-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-delete-32.png
rename to src/widgets/styles/images/standardbutton-delete-32.png
diff --git a/src/gui/styles/images/standardbutton-help-128.png b/src/widgets/styles/images/standardbutton-help-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-help-128.png
rename to src/widgets/styles/images/standardbutton-help-128.png
diff --git a/src/gui/styles/images/standardbutton-help-16.png b/src/widgets/styles/images/standardbutton-help-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-help-16.png
rename to src/widgets/styles/images/standardbutton-help-16.png
diff --git a/src/gui/styles/images/standardbutton-help-32.png b/src/widgets/styles/images/standardbutton-help-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-help-32.png
rename to src/widgets/styles/images/standardbutton-help-32.png
diff --git a/src/gui/styles/images/standardbutton-no-128.png b/src/widgets/styles/images/standardbutton-no-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-no-128.png
rename to src/widgets/styles/images/standardbutton-no-128.png
diff --git a/src/gui/styles/images/standardbutton-no-16.png b/src/widgets/styles/images/standardbutton-no-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-no-16.png
rename to src/widgets/styles/images/standardbutton-no-16.png
diff --git a/src/gui/styles/images/standardbutton-no-32.png b/src/widgets/styles/images/standardbutton-no-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-no-32.png
rename to src/widgets/styles/images/standardbutton-no-32.png
diff --git a/src/gui/styles/images/standardbutton-ok-128.png b/src/widgets/styles/images/standardbutton-ok-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-ok-128.png
rename to src/widgets/styles/images/standardbutton-ok-128.png
diff --git a/src/gui/styles/images/standardbutton-ok-16.png b/src/widgets/styles/images/standardbutton-ok-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-ok-16.png
rename to src/widgets/styles/images/standardbutton-ok-16.png
diff --git a/src/gui/styles/images/standardbutton-ok-32.png b/src/widgets/styles/images/standardbutton-ok-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-ok-32.png
rename to src/widgets/styles/images/standardbutton-ok-32.png
diff --git a/src/gui/styles/images/standardbutton-open-128.png b/src/widgets/styles/images/standardbutton-open-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-open-128.png
rename to src/widgets/styles/images/standardbutton-open-128.png
diff --git a/src/gui/styles/images/standardbutton-open-16.png b/src/widgets/styles/images/standardbutton-open-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-open-16.png
rename to src/widgets/styles/images/standardbutton-open-16.png
diff --git a/src/gui/styles/images/standardbutton-open-32.png b/src/widgets/styles/images/standardbutton-open-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-open-32.png
rename to src/widgets/styles/images/standardbutton-open-32.png
diff --git a/src/gui/styles/images/standardbutton-save-128.png b/src/widgets/styles/images/standardbutton-save-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-save-128.png
rename to src/widgets/styles/images/standardbutton-save-128.png
diff --git a/src/gui/styles/images/standardbutton-save-16.png b/src/widgets/styles/images/standardbutton-save-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-save-16.png
rename to src/widgets/styles/images/standardbutton-save-16.png
diff --git a/src/gui/styles/images/standardbutton-save-32.png b/src/widgets/styles/images/standardbutton-save-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-save-32.png
rename to src/widgets/styles/images/standardbutton-save-32.png
diff --git a/src/gui/styles/images/standardbutton-yes-128.png b/src/widgets/styles/images/standardbutton-yes-128.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-yes-128.png
rename to src/widgets/styles/images/standardbutton-yes-128.png
diff --git a/src/gui/styles/images/standardbutton-yes-16.png b/src/widgets/styles/images/standardbutton-yes-16.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-yes-16.png
rename to src/widgets/styles/images/standardbutton-yes-16.png
diff --git a/src/gui/styles/images/standardbutton-yes-32.png b/src/widgets/styles/images/standardbutton-yes-32.png
similarity index 100%
rename from src/gui/styles/images/standardbutton-yes-32.png
rename to src/widgets/styles/images/standardbutton-yes-32.png
diff --git a/src/gui/styles/images/stop-24.png b/src/widgets/styles/images/stop-24.png
similarity index 100%
rename from src/gui/styles/images/stop-24.png
rename to src/widgets/styles/images/stop-24.png
diff --git a/src/gui/styles/images/stop-32.png b/src/widgets/styles/images/stop-32.png
similarity index 100%
rename from src/gui/styles/images/stop-32.png
rename to src/widgets/styles/images/stop-32.png
diff --git a/src/gui/styles/images/trash-128.png b/src/widgets/styles/images/trash-128.png
similarity index 100%
rename from src/gui/styles/images/trash-128.png
rename to src/widgets/styles/images/trash-128.png
diff --git a/src/gui/styles/images/trash-16.png b/src/widgets/styles/images/trash-16.png
similarity index 100%
rename from src/gui/styles/images/trash-16.png
rename to src/widgets/styles/images/trash-16.png
diff --git a/src/gui/styles/images/trash-32.png b/src/widgets/styles/images/trash-32.png
similarity index 100%
rename from src/gui/styles/images/trash-32.png
rename to src/widgets/styles/images/trash-32.png
diff --git a/src/gui/styles/images/up-128.png b/src/widgets/styles/images/up-128.png
similarity index 100%
rename from src/gui/styles/images/up-128.png
rename to src/widgets/styles/images/up-128.png
diff --git a/src/gui/styles/images/up-16.png b/src/widgets/styles/images/up-16.png
similarity index 100%
rename from src/gui/styles/images/up-16.png
rename to src/widgets/styles/images/up-16.png
diff --git a/src/gui/styles/images/up-32.png b/src/widgets/styles/images/up-32.png
similarity index 100%
rename from src/gui/styles/images/up-32.png
rename to src/widgets/styles/images/up-32.png
diff --git a/src/gui/styles/images/viewdetailed-128.png b/src/widgets/styles/images/viewdetailed-128.png
similarity index 100%
rename from src/gui/styles/images/viewdetailed-128.png
rename to src/widgets/styles/images/viewdetailed-128.png
diff --git a/src/gui/styles/images/viewdetailed-16.png b/src/widgets/styles/images/viewdetailed-16.png
similarity index 100%
rename from src/gui/styles/images/viewdetailed-16.png
rename to src/widgets/styles/images/viewdetailed-16.png
diff --git a/src/gui/styles/images/viewdetailed-32.png b/src/widgets/styles/images/viewdetailed-32.png
similarity index 100%
rename from src/gui/styles/images/viewdetailed-32.png
rename to src/widgets/styles/images/viewdetailed-32.png
diff --git a/src/gui/styles/images/viewlist-128.png b/src/widgets/styles/images/viewlist-128.png
similarity index 100%
rename from src/gui/styles/images/viewlist-128.png
rename to src/widgets/styles/images/viewlist-128.png
diff --git a/src/gui/styles/images/viewlist-16.png b/src/widgets/styles/images/viewlist-16.png
similarity index 100%
rename from src/gui/styles/images/viewlist-16.png
rename to src/widgets/styles/images/viewlist-16.png
diff --git a/src/gui/styles/images/viewlist-32.png b/src/widgets/styles/images/viewlist-32.png
similarity index 100%
rename from src/gui/styles/images/viewlist-32.png
rename to src/widgets/styles/images/viewlist-32.png
diff --git a/src/gui/styles/qcdestyle.cpp b/src/widgets/styles/qcdestyle.cpp
similarity index 100%
rename from src/gui/styles/qcdestyle.cpp
rename to src/widgets/styles/qcdestyle.cpp
diff --git a/src/gui/styles/qcdestyle.h b/src/widgets/styles/qcdestyle.h
similarity index 100%
rename from src/gui/styles/qcdestyle.h
rename to src/widgets/styles/qcdestyle.h
diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/widgets/styles/qcleanlooksstyle.cpp
similarity index 100%
rename from src/gui/styles/qcleanlooksstyle.cpp
rename to src/widgets/styles/qcleanlooksstyle.cpp
diff --git a/src/gui/styles/qcleanlooksstyle.h b/src/widgets/styles/qcleanlooksstyle.h
similarity index 100%
rename from src/gui/styles/qcleanlooksstyle.h
rename to src/widgets/styles/qcleanlooksstyle.h
diff --git a/src/gui/styles/qcleanlooksstyle_p.h b/src/widgets/styles/qcleanlooksstyle_p.h
similarity index 100%
rename from src/gui/styles/qcleanlooksstyle_p.h
rename to src/widgets/styles/qcleanlooksstyle_p.h
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
similarity index 100%
rename from src/gui/styles/qcommonstyle.cpp
rename to src/widgets/styles/qcommonstyle.cpp
diff --git a/src/gui/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h
similarity index 100%
rename from src/gui/styles/qcommonstyle.h
rename to src/widgets/styles/qcommonstyle.h
diff --git a/src/gui/styles/qcommonstyle_p.h b/src/widgets/styles/qcommonstyle_p.h
similarity index 100%
rename from src/gui/styles/qcommonstyle_p.h
rename to src/widgets/styles/qcommonstyle_p.h
diff --git a/src/gui/styles/qcommonstylepixmaps_p.h b/src/widgets/styles/qcommonstylepixmaps_p.h
similarity index 100%
rename from src/gui/styles/qcommonstylepixmaps_p.h
rename to src/widgets/styles/qcommonstylepixmaps_p.h
diff --git a/src/gui/styles/qdrawutil.cpp b/src/widgets/styles/qdrawutil.cpp
similarity index 100%
rename from src/gui/styles/qdrawutil.cpp
rename to src/widgets/styles/qdrawutil.cpp
diff --git a/src/gui/styles/qdrawutil.h b/src/widgets/styles/qdrawutil.h
similarity index 100%
rename from src/gui/styles/qdrawutil.h
rename to src/widgets/styles/qdrawutil.h
diff --git a/src/gui/styles/qgtkpainter.cpp b/src/widgets/styles/qgtkpainter.cpp
similarity index 100%
rename from src/gui/styles/qgtkpainter.cpp
rename to src/widgets/styles/qgtkpainter.cpp
diff --git a/src/gui/styles/qgtkpainter_p.h b/src/widgets/styles/qgtkpainter_p.h
similarity index 100%
rename from src/gui/styles/qgtkpainter_p.h
rename to src/widgets/styles/qgtkpainter_p.h
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp
similarity index 100%
rename from src/gui/styles/qgtkstyle.cpp
rename to src/widgets/styles/qgtkstyle.cpp
diff --git a/src/gui/styles/qgtkstyle.h b/src/widgets/styles/qgtkstyle.h
similarity index 100%
rename from src/gui/styles/qgtkstyle.h
rename to src/widgets/styles/qgtkstyle.h
diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/widgets/styles/qgtkstyle_p.cpp
similarity index 100%
rename from src/gui/styles/qgtkstyle_p.cpp
rename to src/widgets/styles/qgtkstyle_p.cpp
diff --git a/src/gui/styles/qgtkstyle_p.h b/src/widgets/styles/qgtkstyle_p.h
similarity index 100%
rename from src/gui/styles/qgtkstyle_p.h
rename to src/widgets/styles/qgtkstyle_p.h
diff --git a/src/gui/styles/qmacstyle.qdoc b/src/widgets/styles/qmacstyle.qdoc
similarity index 100%
rename from src/gui/styles/qmacstyle.qdoc
rename to src/widgets/styles/qmacstyle.qdoc
diff --git a/src/gui/styles/qmacstyle_mac.h b/src/widgets/styles/qmacstyle_mac.h
similarity index 100%
rename from src/gui/styles/qmacstyle_mac.h
rename to src/widgets/styles/qmacstyle_mac.h
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
similarity index 100%
rename from src/gui/styles/qmacstyle_mac.mm
rename to src/widgets/styles/qmacstyle_mac.mm
diff --git a/src/gui/styles/qmacstyle_mac_p.h b/src/widgets/styles/qmacstyle_mac_p.h
similarity index 100%
rename from src/gui/styles/qmacstyle_mac_p.h
rename to src/widgets/styles/qmacstyle_mac_p.h
diff --git a/src/gui/styles/qmacstylepixmaps_mac_p.h b/src/widgets/styles/qmacstylepixmaps_mac_p.h
similarity index 100%
rename from src/gui/styles/qmacstylepixmaps_mac_p.h
rename to src/widgets/styles/qmacstylepixmaps_mac_p.h
diff --git a/src/gui/styles/qmotifstyle.cpp b/src/widgets/styles/qmotifstyle.cpp
similarity index 100%
rename from src/gui/styles/qmotifstyle.cpp
rename to src/widgets/styles/qmotifstyle.cpp
diff --git a/src/gui/styles/qmotifstyle.h b/src/widgets/styles/qmotifstyle.h
similarity index 100%
rename from src/gui/styles/qmotifstyle.h
rename to src/widgets/styles/qmotifstyle.h
diff --git a/src/gui/styles/qmotifstyle_p.h b/src/widgets/styles/qmotifstyle_p.h
similarity index 100%
rename from src/gui/styles/qmotifstyle_p.h
rename to src/widgets/styles/qmotifstyle_p.h
diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/widgets/styles/qplastiquestyle.cpp
similarity index 100%
rename from src/gui/styles/qplastiquestyle.cpp
rename to src/widgets/styles/qplastiquestyle.cpp
diff --git a/src/gui/styles/qplastiquestyle.h b/src/widgets/styles/qplastiquestyle.h
similarity index 100%
rename from src/gui/styles/qplastiquestyle.h
rename to src/widgets/styles/qplastiquestyle.h
diff --git a/src/gui/styles/qproxystyle.cpp b/src/widgets/styles/qproxystyle.cpp
similarity index 100%
rename from src/gui/styles/qproxystyle.cpp
rename to src/widgets/styles/qproxystyle.cpp
diff --git a/src/gui/styles/qproxystyle.h b/src/widgets/styles/qproxystyle.h
similarity index 100%
rename from src/gui/styles/qproxystyle.h
rename to src/widgets/styles/qproxystyle.h
diff --git a/src/gui/styles/qproxystyle_p.h b/src/widgets/styles/qproxystyle_p.h
similarity index 100%
rename from src/gui/styles/qproxystyle_p.h
rename to src/widgets/styles/qproxystyle_p.h
diff --git a/src/gui/styles/qs60style.cpp b/src/widgets/styles/qs60style.cpp
similarity index 100%
rename from src/gui/styles/qs60style.cpp
rename to src/widgets/styles/qs60style.cpp
diff --git a/src/gui/styles/qs60style.h b/src/widgets/styles/qs60style.h
similarity index 100%
rename from src/gui/styles/qs60style.h
rename to src/widgets/styles/qs60style.h
diff --git a/src/gui/styles/qs60style_p.h b/src/widgets/styles/qs60style_p.h
similarity index 100%
rename from src/gui/styles/qs60style_p.h
rename to src/widgets/styles/qs60style_p.h
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/widgets/styles/qs60style_s60.cpp
similarity index 100%
rename from src/gui/styles/qs60style_s60.cpp
rename to src/widgets/styles/qs60style_s60.cpp
diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/widgets/styles/qs60style_simulated.cpp
similarity index 100%
rename from src/gui/styles/qs60style_simulated.cpp
rename to src/widgets/styles/qs60style_simulated.cpp
diff --git a/src/gui/styles/qs60style_stub.cpp b/src/widgets/styles/qs60style_stub.cpp
similarity index 100%
rename from src/gui/styles/qs60style_stub.cpp
rename to src/widgets/styles/qs60style_stub.cpp
diff --git a/src/gui/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
similarity index 100%
rename from src/gui/styles/qstyle.cpp
rename to src/widgets/styles/qstyle.cpp
diff --git a/src/gui/styles/qstyle.h b/src/widgets/styles/qstyle.h
similarity index 100%
rename from src/gui/styles/qstyle.h
rename to src/widgets/styles/qstyle.h
diff --git a/src/gui/styles/qstyle.qrc b/src/widgets/styles/qstyle.qrc
similarity index 100%
rename from src/gui/styles/qstyle.qrc
rename to src/widgets/styles/qstyle.qrc
diff --git a/src/gui/styles/qstyle_p.h b/src/widgets/styles/qstyle_p.h
similarity index 100%
rename from src/gui/styles/qstyle_p.h
rename to src/widgets/styles/qstyle_p.h
diff --git a/src/gui/styles/qstyle_s60.qrc b/src/widgets/styles/qstyle_s60.qrc
similarity index 100%
rename from src/gui/styles/qstyle_s60.qrc
rename to src/widgets/styles/qstyle_s60.qrc
diff --git a/src/gui/styles/qstyle_s60_simulated.qrc b/src/widgets/styles/qstyle_s60_simulated.qrc
similarity index 100%
rename from src/gui/styles/qstyle_s60_simulated.qrc
rename to src/widgets/styles/qstyle_s60_simulated.qrc
diff --git a/src/gui/styles/qstyle_wince.qrc b/src/widgets/styles/qstyle_wince.qrc
similarity index 100%
rename from src/gui/styles/qstyle_wince.qrc
rename to src/widgets/styles/qstyle_wince.qrc
diff --git a/src/gui/styles/qstylefactory.cpp b/src/widgets/styles/qstylefactory.cpp
similarity index 100%
rename from src/gui/styles/qstylefactory.cpp
rename to src/widgets/styles/qstylefactory.cpp
diff --git a/src/gui/styles/qstylefactory.h b/src/widgets/styles/qstylefactory.h
similarity index 100%
rename from src/gui/styles/qstylefactory.h
rename to src/widgets/styles/qstylefactory.h
diff --git a/src/gui/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp
similarity index 100%
rename from src/gui/styles/qstylehelper.cpp
rename to src/widgets/styles/qstylehelper.cpp
diff --git a/src/gui/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h
similarity index 100%
rename from src/gui/styles/qstylehelper_p.h
rename to src/widgets/styles/qstylehelper_p.h
diff --git a/src/gui/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
similarity index 100%
rename from src/gui/styles/qstyleoption.cpp
rename to src/widgets/styles/qstyleoption.cpp
diff --git a/src/gui/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h
similarity index 100%
rename from src/gui/styles/qstyleoption.h
rename to src/widgets/styles/qstyleoption.h
diff --git a/src/gui/styles/qstylepainter.cpp b/src/widgets/styles/qstylepainter.cpp
similarity index 100%
rename from src/gui/styles/qstylepainter.cpp
rename to src/widgets/styles/qstylepainter.cpp
diff --git a/src/gui/styles/qstylepainter.h b/src/widgets/styles/qstylepainter.h
similarity index 100%
rename from src/gui/styles/qstylepainter.h
rename to src/widgets/styles/qstylepainter.h
diff --git a/src/gui/styles/qstyleplugin.cpp b/src/widgets/styles/qstyleplugin.cpp
similarity index 100%
rename from src/gui/styles/qstyleplugin.cpp
rename to src/widgets/styles/qstyleplugin.cpp
diff --git a/src/gui/styles/qstyleplugin.h b/src/widgets/styles/qstyleplugin.h
similarity index 100%
rename from src/gui/styles/qstyleplugin.h
rename to src/widgets/styles/qstyleplugin.h
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
similarity index 100%
rename from src/gui/styles/qstylesheetstyle.cpp
rename to src/widgets/styles/qstylesheetstyle.cpp
diff --git a/src/gui/styles/qstylesheetstyle_default.cpp b/src/widgets/styles/qstylesheetstyle_default.cpp
similarity index 100%
rename from src/gui/styles/qstylesheetstyle_default.cpp
rename to src/widgets/styles/qstylesheetstyle_default.cpp
diff --git a/src/gui/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h
similarity index 100%
rename from src/gui/styles/qstylesheetstyle_p.h
rename to src/widgets/styles/qstylesheetstyle_p.h
diff --git a/src/gui/styles/qwindowscestyle.cpp b/src/widgets/styles/qwindowscestyle.cpp
similarity index 100%
rename from src/gui/styles/qwindowscestyle.cpp
rename to src/widgets/styles/qwindowscestyle.cpp
diff --git a/src/gui/styles/qwindowscestyle.h b/src/widgets/styles/qwindowscestyle.h
similarity index 100%
rename from src/gui/styles/qwindowscestyle.h
rename to src/widgets/styles/qwindowscestyle.h
diff --git a/src/gui/styles/qwindowscestyle_p.h b/src/widgets/styles/qwindowscestyle_p.h
similarity index 100%
rename from src/gui/styles/qwindowscestyle_p.h
rename to src/widgets/styles/qwindowscestyle_p.h
diff --git a/src/gui/styles/qwindowsmobilestyle.cpp b/src/widgets/styles/qwindowsmobilestyle.cpp
similarity index 100%
rename from src/gui/styles/qwindowsmobilestyle.cpp
rename to src/widgets/styles/qwindowsmobilestyle.cpp
diff --git a/src/gui/styles/qwindowsmobilestyle.h b/src/widgets/styles/qwindowsmobilestyle.h
similarity index 100%
rename from src/gui/styles/qwindowsmobilestyle.h
rename to src/widgets/styles/qwindowsmobilestyle.h
diff --git a/src/gui/styles/qwindowsmobilestyle_p.h b/src/widgets/styles/qwindowsmobilestyle_p.h
similarity index 100%
rename from src/gui/styles/qwindowsmobilestyle_p.h
rename to src/widgets/styles/qwindowsmobilestyle_p.h
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
similarity index 100%
rename from src/gui/styles/qwindowsstyle.cpp
rename to src/widgets/styles/qwindowsstyle.cpp
diff --git a/src/gui/styles/qwindowsstyle.h b/src/widgets/styles/qwindowsstyle.h
similarity index 100%
rename from src/gui/styles/qwindowsstyle.h
rename to src/widgets/styles/qwindowsstyle.h
diff --git a/src/gui/styles/qwindowsstyle_p.h b/src/widgets/styles/qwindowsstyle_p.h
similarity index 100%
rename from src/gui/styles/qwindowsstyle_p.h
rename to src/widgets/styles/qwindowsstyle_p.h
diff --git a/src/gui/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp
similarity index 100%
rename from src/gui/styles/qwindowsvistastyle.cpp
rename to src/widgets/styles/qwindowsvistastyle.cpp
diff --git a/src/gui/styles/qwindowsvistastyle.h b/src/widgets/styles/qwindowsvistastyle.h
similarity index 100%
rename from src/gui/styles/qwindowsvistastyle.h
rename to src/widgets/styles/qwindowsvistastyle.h
diff --git a/src/gui/styles/qwindowsvistastyle_p.h b/src/widgets/styles/qwindowsvistastyle_p.h
similarity index 100%
rename from src/gui/styles/qwindowsvistastyle_p.h
rename to src/widgets/styles/qwindowsvistastyle_p.h
diff --git a/src/gui/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp
similarity index 100%
rename from src/gui/styles/qwindowsxpstyle.cpp
rename to src/widgets/styles/qwindowsxpstyle.cpp
diff --git a/src/gui/styles/qwindowsxpstyle.h b/src/widgets/styles/qwindowsxpstyle.h
similarity index 100%
rename from src/gui/styles/qwindowsxpstyle.h
rename to src/widgets/styles/qwindowsxpstyle.h
diff --git a/src/gui/styles/qwindowsxpstyle_p.h b/src/widgets/styles/qwindowsxpstyle_p.h
similarity index 100%
rename from src/gui/styles/qwindowsxpstyle_p.h
rename to src/widgets/styles/qwindowsxpstyle_p.h
diff --git a/src/gui/styles/styles.pri b/src/widgets/styles/styles.pri
similarity index 100%
rename from src/gui/styles/styles.pri
rename to src/widgets/styles/styles.pri
diff --git a/src/gui/symbian/images/blank.png b/src/widgets/symbian/images/blank.png
similarity index 100%
rename from src/gui/symbian/images/blank.png
rename to src/widgets/symbian/images/blank.png
diff --git a/src/gui/symbian/images/busy12.png b/src/widgets/symbian/images/busy12.png
similarity index 100%
rename from src/gui/symbian/images/busy12.png
rename to src/widgets/symbian/images/busy12.png
diff --git a/src/gui/symbian/images/busy3.png b/src/widgets/symbian/images/busy3.png
similarity index 100%
rename from src/gui/symbian/images/busy3.png
rename to src/widgets/symbian/images/busy3.png
diff --git a/src/gui/symbian/images/busy6.png b/src/widgets/symbian/images/busy6.png
similarity index 100%
rename from src/gui/symbian/images/busy6.png
rename to src/widgets/symbian/images/busy6.png
diff --git a/src/gui/symbian/images/busy9.png b/src/widgets/symbian/images/busy9.png
similarity index 100%
rename from src/gui/symbian/images/busy9.png
rename to src/widgets/symbian/images/busy9.png
diff --git a/src/gui/symbian/images/closehand.png b/src/widgets/symbian/images/closehand.png
similarity index 100%
rename from src/gui/symbian/images/closehand.png
rename to src/widgets/symbian/images/closehand.png
diff --git a/src/gui/symbian/images/cross.png b/src/widgets/symbian/images/cross.png
similarity index 100%
rename from src/gui/symbian/images/cross.png
rename to src/widgets/symbian/images/cross.png
diff --git a/src/gui/symbian/images/forbidden.png b/src/widgets/symbian/images/forbidden.png
similarity index 100%
rename from src/gui/symbian/images/forbidden.png
rename to src/widgets/symbian/images/forbidden.png
diff --git a/src/gui/symbian/images/handpoint.png b/src/widgets/symbian/images/handpoint.png
similarity index 100%
rename from src/gui/symbian/images/handpoint.png
rename to src/widgets/symbian/images/handpoint.png
diff --git a/src/gui/symbian/images/ibeam.png b/src/widgets/symbian/images/ibeam.png
similarity index 100%
rename from src/gui/symbian/images/ibeam.png
rename to src/widgets/symbian/images/ibeam.png
diff --git a/src/gui/symbian/images/openhand.png b/src/widgets/symbian/images/openhand.png
similarity index 100%
rename from src/gui/symbian/images/openhand.png
rename to src/widgets/symbian/images/openhand.png
diff --git a/src/gui/symbian/images/pointer.png b/src/widgets/symbian/images/pointer.png
similarity index 100%
rename from src/gui/symbian/images/pointer.png
rename to src/widgets/symbian/images/pointer.png
diff --git a/src/gui/symbian/images/sizeall.png b/src/widgets/symbian/images/sizeall.png
similarity index 100%
rename from src/gui/symbian/images/sizeall.png
rename to src/widgets/symbian/images/sizeall.png
diff --git a/src/gui/symbian/images/sizebdiag.png b/src/widgets/symbian/images/sizebdiag.png
similarity index 100%
rename from src/gui/symbian/images/sizebdiag.png
rename to src/widgets/symbian/images/sizebdiag.png
diff --git a/src/gui/symbian/images/sizefdiag.png b/src/widgets/symbian/images/sizefdiag.png
similarity index 100%
rename from src/gui/symbian/images/sizefdiag.png
rename to src/widgets/symbian/images/sizefdiag.png
diff --git a/src/gui/symbian/images/sizehor.png b/src/widgets/symbian/images/sizehor.png
similarity index 100%
rename from src/gui/symbian/images/sizehor.png
rename to src/widgets/symbian/images/sizehor.png
diff --git a/src/gui/symbian/images/sizever.png b/src/widgets/symbian/images/sizever.png
similarity index 100%
rename from src/gui/symbian/images/sizever.png
rename to src/widgets/symbian/images/sizever.png
diff --git a/src/gui/symbian/images/splith.png b/src/widgets/symbian/images/splith.png
similarity index 100%
rename from src/gui/symbian/images/splith.png
rename to src/widgets/symbian/images/splith.png
diff --git a/src/gui/symbian/images/splitv.png b/src/widgets/symbian/images/splitv.png
similarity index 100%
rename from src/gui/symbian/images/splitv.png
rename to src/widgets/symbian/images/splitv.png
diff --git a/src/gui/symbian/images/uparrow.png b/src/widgets/symbian/images/uparrow.png
similarity index 100%
rename from src/gui/symbian/images/uparrow.png
rename to src/widgets/symbian/images/uparrow.png
diff --git a/src/gui/symbian/images/wait1.png b/src/widgets/symbian/images/wait1.png
similarity index 100%
rename from src/gui/symbian/images/wait1.png
rename to src/widgets/symbian/images/wait1.png
diff --git a/src/gui/symbian/images/wait10.png b/src/widgets/symbian/images/wait10.png
similarity index 100%
rename from src/gui/symbian/images/wait10.png
rename to src/widgets/symbian/images/wait10.png
diff --git a/src/gui/symbian/images/wait11.png b/src/widgets/symbian/images/wait11.png
similarity index 100%
rename from src/gui/symbian/images/wait11.png
rename to src/widgets/symbian/images/wait11.png
diff --git a/src/gui/symbian/images/wait12.png b/src/widgets/symbian/images/wait12.png
similarity index 100%
rename from src/gui/symbian/images/wait12.png
rename to src/widgets/symbian/images/wait12.png
diff --git a/src/gui/symbian/images/wait2.png b/src/widgets/symbian/images/wait2.png
similarity index 100%
rename from src/gui/symbian/images/wait2.png
rename to src/widgets/symbian/images/wait2.png
diff --git a/src/gui/symbian/images/wait3.png b/src/widgets/symbian/images/wait3.png
similarity index 100%
rename from src/gui/symbian/images/wait3.png
rename to src/widgets/symbian/images/wait3.png
diff --git a/src/gui/symbian/images/wait4.png b/src/widgets/symbian/images/wait4.png
similarity index 100%
rename from src/gui/symbian/images/wait4.png
rename to src/widgets/symbian/images/wait4.png
diff --git a/src/gui/symbian/images/wait5.png b/src/widgets/symbian/images/wait5.png
similarity index 100%
rename from src/gui/symbian/images/wait5.png
rename to src/widgets/symbian/images/wait5.png
diff --git a/src/gui/symbian/images/wait6.png b/src/widgets/symbian/images/wait6.png
similarity index 100%
rename from src/gui/symbian/images/wait6.png
rename to src/widgets/symbian/images/wait6.png
diff --git a/src/gui/symbian/images/wait7.png b/src/widgets/symbian/images/wait7.png
similarity index 100%
rename from src/gui/symbian/images/wait7.png
rename to src/widgets/symbian/images/wait7.png
diff --git a/src/gui/symbian/images/wait8.png b/src/widgets/symbian/images/wait8.png
similarity index 100%
rename from src/gui/symbian/images/wait8.png
rename to src/widgets/symbian/images/wait8.png
diff --git a/src/gui/symbian/images/wait9.png b/src/widgets/symbian/images/wait9.png
similarity index 100%
rename from src/gui/symbian/images/wait9.png
rename to src/widgets/symbian/images/wait9.png
diff --git a/src/gui/symbian/images/whatsthis.png b/src/widgets/symbian/images/whatsthis.png
similarity index 100%
rename from src/gui/symbian/images/whatsthis.png
rename to src/widgets/symbian/images/whatsthis.png
diff --git a/src/gui/symbian/qsymbianevent.cpp b/src/widgets/symbian/qsymbianevent.cpp
similarity index 100%
rename from src/gui/symbian/qsymbianevent.cpp
rename to src/widgets/symbian/qsymbianevent.cpp
diff --git a/src/gui/symbian/qsymbianevent.h b/src/widgets/symbian/qsymbianevent.h
similarity index 100%
rename from src/gui/symbian/qsymbianevent.h
rename to src/widgets/symbian/qsymbianevent.h
diff --git a/src/gui/symbian/symbianresources.qrc b/src/widgets/symbian/symbianresources.qrc
similarity index 100%
rename from src/gui/symbian/symbianresources.qrc
rename to src/widgets/symbian/symbianresources.qrc
diff --git a/src/gui/to_be_moved/qdnd.cpp b/src/widgets/to_be_moved/qdnd.cpp
similarity index 100%
rename from src/gui/to_be_moved/qdnd.cpp
rename to src/widgets/to_be_moved/qdnd.cpp
diff --git a/src/gui/to_be_moved/qdnd_p.h b/src/widgets/to_be_moved/qdnd_p.h
similarity index 100%
rename from src/gui/to_be_moved/qdnd_p.h
rename to src/widgets/to_be_moved/qdnd_p.h
diff --git a/src/gui/to_be_moved/qdnd_qpa.cpp b/src/widgets/to_be_moved/qdnd_qpa.cpp
similarity index 100%
rename from src/gui/to_be_moved/qdnd_qpa.cpp
rename to src/widgets/to_be_moved/qdnd_qpa.cpp
diff --git a/src/gui/to_be_moved/qdrag.cpp b/src/widgets/to_be_moved/qdrag.cpp
similarity index 100%
rename from src/gui/to_be_moved/qdrag.cpp
rename to src/widgets/to_be_moved/qdrag.cpp
diff --git a/src/gui/to_be_moved/qdrag.h b/src/widgets/to_be_moved/qdrag.h
similarity index 100%
rename from src/gui/to_be_moved/qdrag.h
rename to src/widgets/to_be_moved/qdrag.h
diff --git a/src/gui/to_be_moved/qlinecontrol.cpp b/src/widgets/to_be_moved/qlinecontrol.cpp
similarity index 100%
rename from src/gui/to_be_moved/qlinecontrol.cpp
rename to src/widgets/to_be_moved/qlinecontrol.cpp
diff --git a/src/gui/to_be_moved/qlinecontrol_p.h b/src/widgets/to_be_moved/qlinecontrol_p.h
similarity index 100%
rename from src/gui/to_be_moved/qlinecontrol_p.h
rename to src/widgets/to_be_moved/qlinecontrol_p.h
diff --git a/src/gui/to_be_moved/qshortcut.cpp b/src/widgets/to_be_moved/qshortcut.cpp
similarity index 100%
rename from src/gui/to_be_moved/qshortcut.cpp
rename to src/widgets/to_be_moved/qshortcut.cpp
diff --git a/src/gui/to_be_moved/qshortcut.h b/src/widgets/to_be_moved/qshortcut.h
similarity index 100%
rename from src/gui/to_be_moved/qshortcut.h
rename to src/widgets/to_be_moved/qshortcut.h
diff --git a/src/gui/to_be_moved/qshortcutmap.cpp b/src/widgets/to_be_moved/qshortcutmap.cpp
similarity index 100%
rename from src/gui/to_be_moved/qshortcutmap.cpp
rename to src/widgets/to_be_moved/qshortcutmap.cpp
diff --git a/src/gui/to_be_moved/qshortcutmap_p.h b/src/widgets/to_be_moved/qshortcutmap_p.h
similarity index 100%
rename from src/gui/to_be_moved/qshortcutmap_p.h
rename to src/widgets/to_be_moved/qshortcutmap_p.h
diff --git a/src/gui/to_be_moved/qtextcontrol.cpp b/src/widgets/to_be_moved/qtextcontrol.cpp
similarity index 100%
rename from src/gui/to_be_moved/qtextcontrol.cpp
rename to src/widgets/to_be_moved/qtextcontrol.cpp
diff --git a/src/gui/to_be_moved/qtextcontrol_p.h b/src/widgets/to_be_moved/qtextcontrol_p.h
similarity index 100%
rename from src/gui/to_be_moved/qtextcontrol_p.h
rename to src/widgets/to_be_moved/qtextcontrol_p.h
diff --git a/src/gui/to_be_moved/qtextcontrol_p_p.h b/src/widgets/to_be_moved/qtextcontrol_p_p.h
similarity index 100%
rename from src/gui/to_be_moved/qtextcontrol_p_p.h
rename to src/widgets/to_be_moved/qtextcontrol_p_p.h
diff --git a/src/gui/to_be_moved/to_be_moved.pri b/src/widgets/to_be_moved/to_be_moved.pri
similarity index 100%
rename from src/gui/to_be_moved/to_be_moved.pri
rename to src/widgets/to_be_moved/to_be_moved.pri
diff --git a/src/gui/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
similarity index 100%
rename from src/gui/util/qcompleter.cpp
rename to src/widgets/util/qcompleter.cpp
diff --git a/src/gui/util/qcompleter.h b/src/widgets/util/qcompleter.h
similarity index 100%
rename from src/gui/util/qcompleter.h
rename to src/widgets/util/qcompleter.h
diff --git a/src/gui/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h
similarity index 100%
rename from src/gui/util/qcompleter_p.h
rename to src/widgets/util/qcompleter_p.h
diff --git a/src/gui/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp
similarity index 100%
rename from src/gui/util/qflickgesture.cpp
rename to src/widgets/util/qflickgesture.cpp
diff --git a/src/gui/util/qflickgesture_p.h b/src/widgets/util/qflickgesture_p.h
similarity index 100%
rename from src/gui/util/qflickgesture_p.h
rename to src/widgets/util/qflickgesture_p.h
diff --git a/src/gui/util/qscroller.cpp b/src/widgets/util/qscroller.cpp
similarity index 100%
rename from src/gui/util/qscroller.cpp
rename to src/widgets/util/qscroller.cpp
diff --git a/src/gui/util/qscroller.h b/src/widgets/util/qscroller.h
similarity index 100%
rename from src/gui/util/qscroller.h
rename to src/widgets/util/qscroller.h
diff --git a/src/gui/util/qscroller_mac.mm b/src/widgets/util/qscroller_mac.mm
similarity index 100%
rename from src/gui/util/qscroller_mac.mm
rename to src/widgets/util/qscroller_mac.mm
diff --git a/src/gui/util/qscroller_p.h b/src/widgets/util/qscroller_p.h
similarity index 100%
rename from src/gui/util/qscroller_p.h
rename to src/widgets/util/qscroller_p.h
diff --git a/src/gui/util/qscrollerproperties.cpp b/src/widgets/util/qscrollerproperties.cpp
similarity index 100%
rename from src/gui/util/qscrollerproperties.cpp
rename to src/widgets/util/qscrollerproperties.cpp
diff --git a/src/gui/util/qscrollerproperties.h b/src/widgets/util/qscrollerproperties.h
similarity index 100%
rename from src/gui/util/qscrollerproperties.h
rename to src/widgets/util/qscrollerproperties.h
diff --git a/src/gui/util/qscrollerproperties_p.h b/src/widgets/util/qscrollerproperties_p.h
similarity index 100%
rename from src/gui/util/qscrollerproperties_p.h
rename to src/widgets/util/qscrollerproperties_p.h
diff --git a/src/gui/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
similarity index 100%
rename from src/gui/util/qsystemtrayicon.cpp
rename to src/widgets/util/qsystemtrayicon.cpp
diff --git a/src/gui/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h
similarity index 100%
rename from src/gui/util/qsystemtrayicon.h
rename to src/widgets/util/qsystemtrayicon.h
diff --git a/src/gui/util/qsystemtrayicon_mac.mm b/src/widgets/util/qsystemtrayicon_mac.mm
similarity index 100%
rename from src/gui/util/qsystemtrayicon_mac.mm
rename to src/widgets/util/qsystemtrayicon_mac.mm
diff --git a/src/gui/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h
similarity index 100%
rename from src/gui/util/qsystemtrayicon_p.h
rename to src/widgets/util/qsystemtrayicon_p.h
diff --git a/src/gui/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp
similarity index 100%
rename from src/gui/util/qsystemtrayicon_qpa.cpp
rename to src/widgets/util/qsystemtrayicon_qpa.cpp
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/widgets/util/qsystemtrayicon_win.cpp
similarity index 100%
rename from src/gui/util/qsystemtrayicon_win.cpp
rename to src/widgets/util/qsystemtrayicon_win.cpp
diff --git a/src/gui/util/qsystemtrayicon_wince.cpp b/src/widgets/util/qsystemtrayicon_wince.cpp
similarity index 100%
rename from src/gui/util/qsystemtrayicon_wince.cpp
rename to src/widgets/util/qsystemtrayicon_wince.cpp
diff --git a/src/gui/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
similarity index 100%
rename from src/gui/util/qsystemtrayicon_x11.cpp
rename to src/widgets/util/qsystemtrayicon_x11.cpp
diff --git a/src/gui/util/qundogroup.cpp b/src/widgets/util/qundogroup.cpp
similarity index 100%
rename from src/gui/util/qundogroup.cpp
rename to src/widgets/util/qundogroup.cpp
diff --git a/src/gui/util/qundogroup.h b/src/widgets/util/qundogroup.h
similarity index 100%
rename from src/gui/util/qundogroup.h
rename to src/widgets/util/qundogroup.h
diff --git a/src/gui/util/qundostack.cpp b/src/widgets/util/qundostack.cpp
similarity index 100%
rename from src/gui/util/qundostack.cpp
rename to src/widgets/util/qundostack.cpp
diff --git a/src/gui/util/qundostack.h b/src/widgets/util/qundostack.h
similarity index 100%
rename from src/gui/util/qundostack.h
rename to src/widgets/util/qundostack.h
diff --git a/src/gui/util/qundostack_p.h b/src/widgets/util/qundostack_p.h
similarity index 100%
rename from src/gui/util/qundostack_p.h
rename to src/widgets/util/qundostack_p.h
diff --git a/src/gui/util/qundoview.cpp b/src/widgets/util/qundoview.cpp
similarity index 100%
rename from src/gui/util/qundoview.cpp
rename to src/widgets/util/qundoview.cpp
diff --git a/src/gui/util/qundoview.h b/src/widgets/util/qundoview.h
similarity index 100%
rename from src/gui/util/qundoview.h
rename to src/widgets/util/qundoview.h
diff --git a/src/gui/util/util.pri b/src/widgets/util/util.pri
similarity index 100%
rename from src/gui/util/util.pri
rename to src/widgets/util/util.pri
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
new file mode 100644
index 00000000000..36f36be499d
--- /dev/null
+++ b/src/widgets/widgets.pro
@@ -0,0 +1,222 @@
+TARGET = QtGui
+QPRO_PWD = $$PWD
+QT = core-private
+
+CONFIG += module
+MODULE_PRI = ../modules/qt_gui.pri
+
+DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
+win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
+irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
+
+!win32:!qpa:!mac:!symbian:CONFIG += x11
+
+unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
+
+include(../qbase.pri)
+
+contains(QT_CONFIG, x11sm):CONFIG += x11sm
+
+#platforms
+x11:include(kernel/x11.pri)
+mac:include(kernel/mac.pri)
+win32:include(kernel/win.pri)
+symbian {
+ include(kernel/symbian.pri)
+ include(s60framework/s60framework.pri)
+}
+
+# to be moved into QtGui
+include(to_be_moved/to_be_moved.pri)
+
+#modules
+include(animation/animation.pri)
+include(kernel/kernel.pri)
+include(styles/styles.pri)
+include(widgets/widgets.pri)
+include(dialogs/dialogs.pri)
+include(accessible/accessible.pri)
+include(itemviews/itemviews.pri)
+include(inputmethod/inputmethod.pri)
+include(graphicsview/graphicsview.pri)
+include(util/util.pri)
+include(statemachine/statemachine.pri)
+include(effects/effects.pri)
+
+
+QMAKE_LIBS += $$QMAKE_LIBS_GUI
+
+contains(DEFINES,QT_EVAL):include($$QT_SOURCE_TREE/src/corelib/eval.pri)
+
+QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist
+
+DEFINES += Q_INTERNAL_QAPP_SRC
+symbian {
+ TARGET.UID3=0x2001B2DD
+
+ # ro-section in gui can exceed default allocated space, so move rw-section a little further
+ QMAKE_LFLAGS.ARMCC += --rw-base 0x800000
+ QMAKE_LFLAGS.GCCE += -Tdata 0x800000
+}
+
+neon:*-g++* {
+ DEFINES += QT_HAVE_NEON
+ HEADERS += $$NEON_HEADERS
+
+ DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM
+
+ neon_compiler.commands = $$QMAKE_CXX -c
+ neon_compiler.commands += $(CXXFLAGS) -mfpu=neon $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ neon_compiler.dependency_type = TYPE_C
+ neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+ neon_compiler.input = DRAWHELPER_NEON_ASM_FILES NEON_SOURCES
+ neon_compiler.variable_out = OBJECTS
+ neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN}
+ silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands
+ QMAKE_EXTRA_COMPILERS += neon_compiler
+}
+
+win32:!contains(QT_CONFIG, directwrite) {
+ DEFINES += QT_NO_DIRECTWRITE
+}
+
+contains(QMAKE_MAC_XARCH, no) {
+ DEFINES += QT_NO_MAC_XARCH
+} else {
+ win32-g++*|!win32:!win32-icc*:!macx-icc* {
+ mmx {
+ mmx_compiler.commands = $$QMAKE_CXX -c -Winline
+
+ mac {
+ mmx_compiler.commands += -Xarch_i386 -mmmx
+ mmx_compiler.commands += -Xarch_x86_64 -mmmx
+ } else {
+ mmx_compiler.commands += -mmmx
+ }
+
+ mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ mmx_compiler.dependency_type = TYPE_C
+ mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+ mmx_compiler.input = MMX_SOURCES
+ mmx_compiler.variable_out = OBJECTS
+ mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
+ silent:mmx_compiler.commands = @echo compiling[mmx] ${QMAKE_FILE_IN} && $$mmx_compiler.commands
+ QMAKE_EXTRA_COMPILERS += mmx_compiler
+ }
+ 3dnow {
+ mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
+
+ mac {
+ mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx
+ mmx3dnow_compiler.commands += -Xarch_x86_64 -m3dnow -Xarch_x86_64 -mmmx
+ } else {
+ mmx3dnow_compiler.commands += -m3dnow -mmmx
+ }
+
+ mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ mmx3dnow_compiler.dependency_type = TYPE_C
+ mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+ mmx3dnow_compiler.input = MMX3DNOW_SOURCES
+ mmx3dnow_compiler.variable_out = OBJECTS
+ mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN}
+ silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands
+ QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
+ sse {
+ sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
+
+ mac {
+ sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse
+ sse3dnow_compiler.commands += -Xarch_x86_64 -m3dnow -Xarch_x86_64 -msse
+ } else {
+ sse3dnow_compiler.commands += -m3dnow -msse
+ }
+
+ sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ sse3dnow_compiler.dependency_type = TYPE_C
+ sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+ sse3dnow_compiler.input = SSE3DNOW_SOURCES
+ sse3dnow_compiler.variable_out = OBJECTS
+ sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
+ silent:sse3dnow_compiler.commands = @echo compiling[sse3dnow] ${QMAKE_FILE_IN} && $$sse3dnow_compiler.commands
+ QMAKE_EXTRA_COMPILERS += sse3dnow_compiler
+ }
+ }
+ sse {
+ sse_compiler.commands = $$QMAKE_CXX -c -Winline
+
+ mac {
+ sse_compiler.commands += -Xarch_i386 -msse
+ sse_compiler.commands += -Xarch_x86_64 -msse
+ } else {
+ sse_compiler.commands += -msse
+ }
+
+ sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ sse_compiler.dependency_type = TYPE_C
+ sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+ sse_compiler.input = SSE_SOURCES
+ sse_compiler.variable_out = OBJECTS
+ sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
+ silent:sse_compiler.commands = @echo compiling[sse] ${QMAKE_FILE_IN} && $$sse_compiler.commands
+ QMAKE_EXTRA_COMPILERS += sse_compiler
+ }
+ sse2 {
+ sse2_compiler.commands = $$QMAKE_CXX -c -Winline
+
+ mac {
+ sse2_compiler.commands += -Xarch_i386 -msse2
+ sse2_compiler.commands += -Xarch_x86_64 -msse2
+ } else {
+ sse2_compiler.commands += -msse2
+ }
+
+ sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ sse2_compiler.dependency_type = TYPE_C
+ sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+ sse2_compiler.input = SSE2_SOURCES
+ sse2_compiler.variable_out = OBJECTS
+ sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
+ silent:sse2_compiler.commands = @echo compiling[sse2] ${QMAKE_FILE_IN} && $$sse2_compiler.commands
+ QMAKE_EXTRA_COMPILERS += sse2_compiler
+ }
+ ssse3 {
+ ssse3_compiler.commands = $$QMAKE_CXX -c -Winline
+
+ mac {
+ ssse3_compiler.commands += -Xarch_i386 -mssse3
+ ssse3_compiler.commands += -Xarch_x86_64 -mssse3
+ } else {
+ ssse3_compiler.commands += -mssse3
+ }
+
+ ssse3_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ ssse3_compiler.dependency_type = TYPE_C
+ ssse3_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+ ssse3_compiler.input = SSSE3_SOURCES
+ ssse3_compiler.variable_out = OBJECTS
+ ssse3_compiler.name = compiling[ssse3] ${QMAKE_FILE_IN}
+ silent:ssse3_compiler.commands = @echo compiling[ssse3] ${QMAKE_FILE_IN} && $$ssse3_compiler.commands
+ QMAKE_EXTRA_COMPILERS += ssse3_compiler
+ }
+ iwmmxt {
+ iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
+ iwmmxt_compiler.commands += -mcpu=iwmmxt
+ iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ iwmmxt_compiler.dependency_type = TYPE_C
+ iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+ iwmmxt_compiler.input = IWMMXT_SOURCES
+ iwmmxt_compiler.variable_out = OBJECTS
+ iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN}
+ silent:iwmmxt_compiler.commands = @echo compiling[iwmmxt] ${QMAKE_FILE_IN} && $$iwmmxt_compiler.commands
+ QMAKE_EXTRA_COMPILERS += iwmmxt_compiler
+ }
+ } else {
+ mmx: SOURCES += $$MMX_SOURCES
+ 3dnow: SOURCES += $$MMX3DNOW_SOURCES
+ 3dnow:sse: SOURCES += $$SSE3DNOW_SOURCES
+ sse: SOURCES += $$SSE_SOURCES
+ sse2: SOURCES += $$SSE2_SOURCES
+ ssse3: SOURCES += $$SSSE3_SOURCES
+ iwmmxt: SOURCES += $$IWMMXT_SOURCES
+ }
+}
diff --git a/src/gui/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
similarity index 100%
rename from src/gui/widgets/qabstractbutton.cpp
rename to src/widgets/widgets/qabstractbutton.cpp
diff --git a/src/gui/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h
similarity index 100%
rename from src/gui/widgets/qabstractbutton.h
rename to src/widgets/widgets/qabstractbutton.h
diff --git a/src/gui/widgets/qabstractbutton_p.h b/src/widgets/widgets/qabstractbutton_p.h
similarity index 100%
rename from src/gui/widgets/qabstractbutton_p.h
rename to src/widgets/widgets/qabstractbutton_p.h
diff --git a/src/gui/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
similarity index 100%
rename from src/gui/widgets/qabstractscrollarea.cpp
rename to src/widgets/widgets/qabstractscrollarea.cpp
diff --git a/src/gui/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h
similarity index 100%
rename from src/gui/widgets/qabstractscrollarea.h
rename to src/widgets/widgets/qabstractscrollarea.h
diff --git a/src/gui/widgets/qabstractscrollarea_p.h b/src/widgets/widgets/qabstractscrollarea_p.h
similarity index 100%
rename from src/gui/widgets/qabstractscrollarea_p.h
rename to src/widgets/widgets/qabstractscrollarea_p.h
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp
similarity index 100%
rename from src/gui/widgets/qabstractslider.cpp
rename to src/widgets/widgets/qabstractslider.cpp
diff --git a/src/gui/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h
similarity index 100%
rename from src/gui/widgets/qabstractslider.h
rename to src/widgets/widgets/qabstractslider.h
diff --git a/src/gui/widgets/qabstractslider_p.h b/src/widgets/widgets/qabstractslider_p.h
similarity index 100%
rename from src/gui/widgets/qabstractslider_p.h
rename to src/widgets/widgets/qabstractslider_p.h
diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
similarity index 100%
rename from src/gui/widgets/qabstractspinbox.cpp
rename to src/widgets/widgets/qabstractspinbox.cpp
diff --git a/src/gui/widgets/qabstractspinbox.h b/src/widgets/widgets/qabstractspinbox.h
similarity index 100%
rename from src/gui/widgets/qabstractspinbox.h
rename to src/widgets/widgets/qabstractspinbox.h
diff --git a/src/gui/widgets/qabstractspinbox_p.h b/src/widgets/widgets/qabstractspinbox_p.h
similarity index 100%
rename from src/gui/widgets/qabstractspinbox_p.h
rename to src/widgets/widgets/qabstractspinbox_p.h
diff --git a/src/gui/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp
similarity index 100%
rename from src/gui/widgets/qbuttongroup.cpp
rename to src/widgets/widgets/qbuttongroup.cpp
diff --git a/src/gui/widgets/qbuttongroup.h b/src/widgets/widgets/qbuttongroup.h
similarity index 100%
rename from src/gui/widgets/qbuttongroup.h
rename to src/widgets/widgets/qbuttongroup.h
diff --git a/src/gui/widgets/qcalendartextnavigator_p.h b/src/widgets/widgets/qcalendartextnavigator_p.h
similarity index 100%
rename from src/gui/widgets/qcalendartextnavigator_p.h
rename to src/widgets/widgets/qcalendartextnavigator_p.h
diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
similarity index 100%
rename from src/gui/widgets/qcalendarwidget.cpp
rename to src/widgets/widgets/qcalendarwidget.cpp
diff --git a/src/gui/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h
similarity index 100%
rename from src/gui/widgets/qcalendarwidget.h
rename to src/widgets/widgets/qcalendarwidget.h
diff --git a/src/gui/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp
similarity index 100%
rename from src/gui/widgets/qcheckbox.cpp
rename to src/widgets/widgets/qcheckbox.cpp
diff --git a/src/gui/widgets/qcheckbox.h b/src/widgets/widgets/qcheckbox.h
similarity index 100%
rename from src/gui/widgets/qcheckbox.h
rename to src/widgets/widgets/qcheckbox.h
diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/widgets/widgets/qcocoamenu_mac.mm
similarity index 100%
rename from src/gui/widgets/qcocoamenu_mac.mm
rename to src/widgets/widgets/qcocoamenu_mac.mm
diff --git a/src/gui/widgets/qcocoamenu_mac_p.h b/src/widgets/widgets/qcocoamenu_mac_p.h
similarity index 100%
rename from src/gui/widgets/qcocoamenu_mac_p.h
rename to src/widgets/widgets/qcocoamenu_mac_p.h
diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac.mm b/src/widgets/widgets/qcocoatoolbardelegate_mac.mm
similarity index 100%
rename from src/gui/widgets/qcocoatoolbardelegate_mac.mm
rename to src/widgets/widgets/qcocoatoolbardelegate_mac.mm
diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac_p.h b/src/widgets/widgets/qcocoatoolbardelegate_mac_p.h
similarity index 100%
rename from src/gui/widgets/qcocoatoolbardelegate_mac_p.h
rename to src/widgets/widgets/qcocoatoolbardelegate_mac_p.h
diff --git a/src/gui/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
similarity index 100%
rename from src/gui/widgets/qcombobox.cpp
rename to src/widgets/widgets/qcombobox.cpp
diff --git a/src/gui/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
similarity index 100%
rename from src/gui/widgets/qcombobox.h
rename to src/widgets/widgets/qcombobox.h
diff --git a/src/gui/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
similarity index 100%
rename from src/gui/widgets/qcombobox_p.h
rename to src/widgets/widgets/qcombobox_p.h
diff --git a/src/gui/widgets/qcommandlinkbutton.cpp b/src/widgets/widgets/qcommandlinkbutton.cpp
similarity index 100%
rename from src/gui/widgets/qcommandlinkbutton.cpp
rename to src/widgets/widgets/qcommandlinkbutton.cpp
diff --git a/src/gui/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h
similarity index 100%
rename from src/gui/widgets/qcommandlinkbutton.h
rename to src/widgets/widgets/qcommandlinkbutton.h
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
similarity index 100%
rename from src/gui/widgets/qdatetimeedit.cpp
rename to src/widgets/widgets/qdatetimeedit.cpp
diff --git a/src/gui/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h
similarity index 100%
rename from src/gui/widgets/qdatetimeedit.h
rename to src/widgets/widgets/qdatetimeedit.h
diff --git a/src/gui/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h
similarity index 100%
rename from src/gui/widgets/qdatetimeedit_p.h
rename to src/widgets/widgets/qdatetimeedit_p.h
diff --git a/src/gui/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp
similarity index 100%
rename from src/gui/widgets/qdial.cpp
rename to src/widgets/widgets/qdial.cpp
diff --git a/src/gui/widgets/qdial.h b/src/widgets/widgets/qdial.h
similarity index 100%
rename from src/gui/widgets/qdial.h
rename to src/widgets/widgets/qdial.h
diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
similarity index 100%
rename from src/gui/widgets/qdialogbuttonbox.cpp
rename to src/widgets/widgets/qdialogbuttonbox.cpp
diff --git a/src/gui/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h
similarity index 100%
rename from src/gui/widgets/qdialogbuttonbox.h
rename to src/widgets/widgets/qdialogbuttonbox.h
diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
similarity index 100%
rename from src/gui/widgets/qdockarealayout.cpp
rename to src/widgets/widgets/qdockarealayout.cpp
diff --git a/src/gui/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h
similarity index 100%
rename from src/gui/widgets/qdockarealayout_p.h
rename to src/widgets/widgets/qdockarealayout_p.h
diff --git a/src/gui/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
similarity index 100%
rename from src/gui/widgets/qdockwidget.cpp
rename to src/widgets/widgets/qdockwidget.cpp
diff --git a/src/gui/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h
similarity index 100%
rename from src/gui/widgets/qdockwidget.h
rename to src/widgets/widgets/qdockwidget.h
diff --git a/src/gui/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h
similarity index 100%
rename from src/gui/widgets/qdockwidget_p.h
rename to src/widgets/widgets/qdockwidget_p.h
diff --git a/src/gui/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp
similarity index 100%
rename from src/gui/widgets/qeffects.cpp
rename to src/widgets/widgets/qeffects.cpp
diff --git a/src/gui/widgets/qeffects_p.h b/src/widgets/widgets/qeffects_p.h
similarity index 100%
rename from src/gui/widgets/qeffects_p.h
rename to src/widgets/widgets/qeffects_p.h
diff --git a/src/gui/widgets/qfocusframe.cpp b/src/widgets/widgets/qfocusframe.cpp
similarity index 100%
rename from src/gui/widgets/qfocusframe.cpp
rename to src/widgets/widgets/qfocusframe.cpp
diff --git a/src/gui/widgets/qfocusframe.h b/src/widgets/widgets/qfocusframe.h
similarity index 100%
rename from src/gui/widgets/qfocusframe.h
rename to src/widgets/widgets/qfocusframe.h
diff --git a/src/gui/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp
similarity index 100%
rename from src/gui/widgets/qfontcombobox.cpp
rename to src/widgets/widgets/qfontcombobox.cpp
diff --git a/src/gui/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h
similarity index 100%
rename from src/gui/widgets/qfontcombobox.h
rename to src/widgets/widgets/qfontcombobox.h
diff --git a/src/gui/widgets/qframe.cpp b/src/widgets/widgets/qframe.cpp
similarity index 100%
rename from src/gui/widgets/qframe.cpp
rename to src/widgets/widgets/qframe.cpp
diff --git a/src/gui/widgets/qframe.h b/src/widgets/widgets/qframe.h
similarity index 100%
rename from src/gui/widgets/qframe.h
rename to src/widgets/widgets/qframe.h
diff --git a/src/gui/widgets/qframe_p.h b/src/widgets/widgets/qframe_p.h
similarity index 100%
rename from src/gui/widgets/qframe_p.h
rename to src/widgets/widgets/qframe_p.h
diff --git a/src/gui/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp
similarity index 100%
rename from src/gui/widgets/qgroupbox.cpp
rename to src/widgets/widgets/qgroupbox.cpp
diff --git a/src/gui/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h
similarity index 100%
rename from src/gui/widgets/qgroupbox.h
rename to src/widgets/widgets/qgroupbox.h
diff --git a/src/gui/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
similarity index 100%
rename from src/gui/widgets/qlabel.cpp
rename to src/widgets/widgets/qlabel.cpp
diff --git a/src/gui/widgets/qlabel.h b/src/widgets/widgets/qlabel.h
similarity index 100%
rename from src/gui/widgets/qlabel.h
rename to src/widgets/widgets/qlabel.h
diff --git a/src/gui/widgets/qlabel_p.h b/src/widgets/widgets/qlabel_p.h
similarity index 100%
rename from src/gui/widgets/qlabel_p.h
rename to src/widgets/widgets/qlabel_p.h
diff --git a/src/gui/widgets/qlcdnumber.cpp b/src/widgets/widgets/qlcdnumber.cpp
similarity index 100%
rename from src/gui/widgets/qlcdnumber.cpp
rename to src/widgets/widgets/qlcdnumber.cpp
diff --git a/src/gui/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h
similarity index 100%
rename from src/gui/widgets/qlcdnumber.h
rename to src/widgets/widgets/qlcdnumber.h
diff --git a/src/gui/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
similarity index 100%
rename from src/gui/widgets/qlineedit.cpp
rename to src/widgets/widgets/qlineedit.cpp
diff --git a/src/gui/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h
similarity index 100%
rename from src/gui/widgets/qlineedit.h
rename to src/widgets/widgets/qlineedit.h
diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
similarity index 100%
rename from src/gui/widgets/qlineedit_p.cpp
rename to src/widgets/widgets/qlineedit_p.cpp
diff --git a/src/gui/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h
similarity index 100%
rename from src/gui/widgets/qlineedit_p.h
rename to src/widgets/widgets/qlineedit_p.h
diff --git a/src/gui/widgets/qmaccocoaviewcontainer_mac.h b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h
similarity index 100%
rename from src/gui/widgets/qmaccocoaviewcontainer_mac.h
rename to src/widgets/widgets/qmaccocoaviewcontainer_mac.h
diff --git a/src/gui/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
similarity index 100%
rename from src/gui/widgets/qmaccocoaviewcontainer_mac.mm
rename to src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
diff --git a/src/gui/widgets/qmacnativewidget_mac.h b/src/widgets/widgets/qmacnativewidget_mac.h
similarity index 100%
rename from src/gui/widgets/qmacnativewidget_mac.h
rename to src/widgets/widgets/qmacnativewidget_mac.h
diff --git a/src/gui/widgets/qmacnativewidget_mac.mm b/src/widgets/widgets/qmacnativewidget_mac.mm
similarity index 100%
rename from src/gui/widgets/qmacnativewidget_mac.mm
rename to src/widgets/widgets/qmacnativewidget_mac.mm
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
similarity index 100%
rename from src/gui/widgets/qmainwindow.cpp
rename to src/widgets/widgets/qmainwindow.cpp
diff --git a/src/gui/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h
similarity index 100%
rename from src/gui/widgets/qmainwindow.h
rename to src/widgets/widgets/qmainwindow.h
diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
similarity index 100%
rename from src/gui/widgets/qmainwindowlayout.cpp
rename to src/widgets/widgets/qmainwindowlayout.cpp
diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/widgets/widgets/qmainwindowlayout_mac.mm
similarity index 100%
rename from src/gui/widgets/qmainwindowlayout_mac.mm
rename to src/widgets/widgets/qmainwindowlayout_mac.mm
diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h
similarity index 100%
rename from src/gui/widgets/qmainwindowlayout_p.h
rename to src/widgets/widgets/qmainwindowlayout_p.h
diff --git a/src/gui/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
similarity index 100%
rename from src/gui/widgets/qmdiarea.cpp
rename to src/widgets/widgets/qmdiarea.cpp
diff --git a/src/gui/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h
similarity index 100%
rename from src/gui/widgets/qmdiarea.h
rename to src/widgets/widgets/qmdiarea.h
diff --git a/src/gui/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h
similarity index 100%
rename from src/gui/widgets/qmdiarea_p.h
rename to src/widgets/widgets/qmdiarea_p.h
diff --git a/src/gui/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp
similarity index 100%
rename from src/gui/widgets/qmdisubwindow.cpp
rename to src/widgets/widgets/qmdisubwindow.cpp
diff --git a/src/gui/widgets/qmdisubwindow.h b/src/widgets/widgets/qmdisubwindow.h
similarity index 100%
rename from src/gui/widgets/qmdisubwindow.h
rename to src/widgets/widgets/qmdisubwindow.h
diff --git a/src/gui/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h
similarity index 100%
rename from src/gui/widgets/qmdisubwindow_p.h
rename to src/widgets/widgets/qmdisubwindow_p.h
diff --git a/src/gui/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
similarity index 100%
rename from src/gui/widgets/qmenu.cpp
rename to src/widgets/widgets/qmenu.cpp
diff --git a/src/gui/widgets/qmenu.h b/src/widgets/widgets/qmenu.h
similarity index 100%
rename from src/gui/widgets/qmenu.h
rename to src/widgets/widgets/qmenu.h
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/widgets/widgets/qmenu_mac.mm
similarity index 100%
rename from src/gui/widgets/qmenu_mac.mm
rename to src/widgets/widgets/qmenu_mac.mm
diff --git a/src/gui/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h
similarity index 100%
rename from src/gui/widgets/qmenu_p.h
rename to src/widgets/widgets/qmenu_p.h
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/widgets/widgets/qmenu_symbian.cpp
similarity index 100%
rename from src/gui/widgets/qmenu_symbian.cpp
rename to src/widgets/widgets/qmenu_symbian.cpp
diff --git a/src/gui/widgets/qmenu_wince.cpp b/src/widgets/widgets/qmenu_wince.cpp
similarity index 100%
rename from src/gui/widgets/qmenu_wince.cpp
rename to src/widgets/widgets/qmenu_wince.cpp
diff --git a/src/gui/widgets/qmenu_wince.rc b/src/widgets/widgets/qmenu_wince.rc
similarity index 100%
rename from src/gui/widgets/qmenu_wince.rc
rename to src/widgets/widgets/qmenu_wince.rc
diff --git a/src/gui/widgets/qmenu_wince_resource_p.h b/src/widgets/widgets/qmenu_wince_resource_p.h
similarity index 100%
rename from src/gui/widgets/qmenu_wince_resource_p.h
rename to src/widgets/widgets/qmenu_wince_resource_p.h
diff --git a/src/gui/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
similarity index 100%
rename from src/gui/widgets/qmenubar.cpp
rename to src/widgets/widgets/qmenubar.cpp
diff --git a/src/gui/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h
similarity index 100%
rename from src/gui/widgets/qmenubar.h
rename to src/widgets/widgets/qmenubar.h
diff --git a/src/gui/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h
similarity index 100%
rename from src/gui/widgets/qmenubar_p.h
rename to src/widgets/widgets/qmenubar_p.h
diff --git a/src/gui/widgets/qmenudata.cpp b/src/widgets/widgets/qmenudata.cpp
similarity index 100%
rename from src/gui/widgets/qmenudata.cpp
rename to src/widgets/widgets/qmenudata.cpp
diff --git a/src/gui/widgets/qmenudata.h b/src/widgets/widgets/qmenudata.h
similarity index 100%
rename from src/gui/widgets/qmenudata.h
rename to src/widgets/widgets/qmenudata.h
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
similarity index 100%
rename from src/gui/widgets/qplaintextedit.cpp
rename to src/widgets/widgets/qplaintextedit.cpp
diff --git a/src/gui/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h
similarity index 100%
rename from src/gui/widgets/qplaintextedit.h
rename to src/widgets/widgets/qplaintextedit.h
diff --git a/src/gui/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h
similarity index 100%
rename from src/gui/widgets/qplaintextedit_p.h
rename to src/widgets/widgets/qplaintextedit_p.h
diff --git a/src/gui/widgets/qprintpreviewwidget.cpp b/src/widgets/widgets/qprintpreviewwidget.cpp
similarity index 100%
rename from src/gui/widgets/qprintpreviewwidget.cpp
rename to src/widgets/widgets/qprintpreviewwidget.cpp
diff --git a/src/gui/widgets/qprintpreviewwidget.h b/src/widgets/widgets/qprintpreviewwidget.h
similarity index 100%
rename from src/gui/widgets/qprintpreviewwidget.h
rename to src/widgets/widgets/qprintpreviewwidget.h
diff --git a/src/gui/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp
similarity index 100%
rename from src/gui/widgets/qprogressbar.cpp
rename to src/widgets/widgets/qprogressbar.cpp
diff --git a/src/gui/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h
similarity index 100%
rename from src/gui/widgets/qprogressbar.h
rename to src/widgets/widgets/qprogressbar.h
diff --git a/src/gui/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
similarity index 100%
rename from src/gui/widgets/qpushbutton.cpp
rename to src/widgets/widgets/qpushbutton.cpp
diff --git a/src/gui/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h
similarity index 100%
rename from src/gui/widgets/qpushbutton.h
rename to src/widgets/widgets/qpushbutton.h
diff --git a/src/gui/widgets/qpushbutton_p.h b/src/widgets/widgets/qpushbutton_p.h
similarity index 100%
rename from src/gui/widgets/qpushbutton_p.h
rename to src/widgets/widgets/qpushbutton_p.h
diff --git a/src/gui/widgets/qradiobutton.cpp b/src/widgets/widgets/qradiobutton.cpp
similarity index 100%
rename from src/gui/widgets/qradiobutton.cpp
rename to src/widgets/widgets/qradiobutton.cpp
diff --git a/src/gui/widgets/qradiobutton.h b/src/widgets/widgets/qradiobutton.h
similarity index 100%
rename from src/gui/widgets/qradiobutton.h
rename to src/widgets/widgets/qradiobutton.h
diff --git a/src/gui/widgets/qrubberband.cpp b/src/widgets/widgets/qrubberband.cpp
similarity index 100%
rename from src/gui/widgets/qrubberband.cpp
rename to src/widgets/widgets/qrubberband.cpp
diff --git a/src/gui/widgets/qrubberband.h b/src/widgets/widgets/qrubberband.h
similarity index 100%
rename from src/gui/widgets/qrubberband.h
rename to src/widgets/widgets/qrubberband.h
diff --git a/src/gui/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp
similarity index 100%
rename from src/gui/widgets/qscrollarea.cpp
rename to src/widgets/widgets/qscrollarea.cpp
diff --git a/src/gui/widgets/qscrollarea.h b/src/widgets/widgets/qscrollarea.h
similarity index 100%
rename from src/gui/widgets/qscrollarea.h
rename to src/widgets/widgets/qscrollarea.h
diff --git a/src/gui/widgets/qscrollarea_p.h b/src/widgets/widgets/qscrollarea_p.h
similarity index 100%
rename from src/gui/widgets/qscrollarea_p.h
rename to src/widgets/widgets/qscrollarea_p.h
diff --git a/src/gui/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp
similarity index 100%
rename from src/gui/widgets/qscrollbar.cpp
rename to src/widgets/widgets/qscrollbar.cpp
diff --git a/src/gui/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h
similarity index 100%
rename from src/gui/widgets/qscrollbar.h
rename to src/widgets/widgets/qscrollbar.h
diff --git a/src/gui/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp
similarity index 100%
rename from src/gui/widgets/qsizegrip.cpp
rename to src/widgets/widgets/qsizegrip.cpp
diff --git a/src/gui/widgets/qsizegrip.h b/src/widgets/widgets/qsizegrip.h
similarity index 100%
rename from src/gui/widgets/qsizegrip.h
rename to src/widgets/widgets/qsizegrip.h
diff --git a/src/gui/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp
similarity index 100%
rename from src/gui/widgets/qslider.cpp
rename to src/widgets/widgets/qslider.cpp
diff --git a/src/gui/widgets/qslider.h b/src/widgets/widgets/qslider.h
similarity index 100%
rename from src/gui/widgets/qslider.h
rename to src/widgets/widgets/qslider.h
diff --git a/src/gui/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp
similarity index 100%
rename from src/gui/widgets/qspinbox.cpp
rename to src/widgets/widgets/qspinbox.cpp
diff --git a/src/gui/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h
similarity index 100%
rename from src/gui/widgets/qspinbox.h
rename to src/widgets/widgets/qspinbox.h
diff --git a/src/gui/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp
similarity index 100%
rename from src/gui/widgets/qsplashscreen.cpp
rename to src/widgets/widgets/qsplashscreen.cpp
diff --git a/src/gui/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h
similarity index 100%
rename from src/gui/widgets/qsplashscreen.h
rename to src/widgets/widgets/qsplashscreen.h
diff --git a/src/gui/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
similarity index 100%
rename from src/gui/widgets/qsplitter.cpp
rename to src/widgets/widgets/qsplitter.cpp
diff --git a/src/gui/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h
similarity index 100%
rename from src/gui/widgets/qsplitter.h
rename to src/widgets/widgets/qsplitter.h
diff --git a/src/gui/widgets/qsplitter_p.h b/src/widgets/widgets/qsplitter_p.h
similarity index 100%
rename from src/gui/widgets/qsplitter_p.h
rename to src/widgets/widgets/qsplitter_p.h
diff --git a/src/gui/widgets/qstackedwidget.cpp b/src/widgets/widgets/qstackedwidget.cpp
similarity index 100%
rename from src/gui/widgets/qstackedwidget.cpp
rename to src/widgets/widgets/qstackedwidget.cpp
diff --git a/src/gui/widgets/qstackedwidget.h b/src/widgets/widgets/qstackedwidget.h
similarity index 100%
rename from src/gui/widgets/qstackedwidget.h
rename to src/widgets/widgets/qstackedwidget.h
diff --git a/src/gui/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp
similarity index 100%
rename from src/gui/widgets/qstatusbar.cpp
rename to src/widgets/widgets/qstatusbar.cpp
diff --git a/src/gui/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h
similarity index 100%
rename from src/gui/widgets/qstatusbar.h
rename to src/widgets/widgets/qstatusbar.h
diff --git a/src/gui/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
similarity index 100%
rename from src/gui/widgets/qtabbar.cpp
rename to src/widgets/widgets/qtabbar.cpp
diff --git a/src/gui/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h
similarity index 100%
rename from src/gui/widgets/qtabbar.h
rename to src/widgets/widgets/qtabbar.h
diff --git a/src/gui/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h
similarity index 100%
rename from src/gui/widgets/qtabbar_p.h
rename to src/widgets/widgets/qtabbar_p.h
diff --git a/src/gui/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
similarity index 100%
rename from src/gui/widgets/qtabwidget.cpp
rename to src/widgets/widgets/qtabwidget.cpp
diff --git a/src/gui/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h
similarity index 100%
rename from src/gui/widgets/qtabwidget.h
rename to src/widgets/widgets/qtabwidget.h
diff --git a/src/gui/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
similarity index 100%
rename from src/gui/widgets/qtextbrowser.cpp
rename to src/widgets/widgets/qtextbrowser.cpp
diff --git a/src/gui/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h
similarity index 100%
rename from src/gui/widgets/qtextbrowser.h
rename to src/widgets/widgets/qtextbrowser.h
diff --git a/src/gui/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
similarity index 100%
rename from src/gui/widgets/qtextedit.cpp
rename to src/widgets/widgets/qtextedit.cpp
diff --git a/src/gui/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h
similarity index 100%
rename from src/gui/widgets/qtextedit.h
rename to src/widgets/widgets/qtextedit.h
diff --git a/src/gui/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h
similarity index 100%
rename from src/gui/widgets/qtextedit_p.h
rename to src/widgets/widgets/qtextedit_p.h
diff --git a/src/gui/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
similarity index 100%
rename from src/gui/widgets/qtoolbar.cpp
rename to src/widgets/widgets/qtoolbar.cpp
diff --git a/src/gui/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h
similarity index 100%
rename from src/gui/widgets/qtoolbar.h
rename to src/widgets/widgets/qtoolbar.h
diff --git a/src/gui/widgets/qtoolbar_p.h b/src/widgets/widgets/qtoolbar_p.h
similarity index 100%
rename from src/gui/widgets/qtoolbar_p.h
rename to src/widgets/widgets/qtoolbar_p.h
diff --git a/src/gui/widgets/qtoolbararealayout.cpp b/src/widgets/widgets/qtoolbararealayout.cpp
similarity index 100%
rename from src/gui/widgets/qtoolbararealayout.cpp
rename to src/widgets/widgets/qtoolbararealayout.cpp
diff --git a/src/gui/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h
similarity index 100%
rename from src/gui/widgets/qtoolbararealayout_p.h
rename to src/widgets/widgets/qtoolbararealayout_p.h
diff --git a/src/gui/widgets/qtoolbarextension.cpp b/src/widgets/widgets/qtoolbarextension.cpp
similarity index 100%
rename from src/gui/widgets/qtoolbarextension.cpp
rename to src/widgets/widgets/qtoolbarextension.cpp
diff --git a/src/gui/widgets/qtoolbarextension_p.h b/src/widgets/widgets/qtoolbarextension_p.h
similarity index 100%
rename from src/gui/widgets/qtoolbarextension_p.h
rename to src/widgets/widgets/qtoolbarextension_p.h
diff --git a/src/gui/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp
similarity index 100%
rename from src/gui/widgets/qtoolbarlayout.cpp
rename to src/widgets/widgets/qtoolbarlayout.cpp
diff --git a/src/gui/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h
similarity index 100%
rename from src/gui/widgets/qtoolbarlayout_p.h
rename to src/widgets/widgets/qtoolbarlayout_p.h
diff --git a/src/gui/widgets/qtoolbarseparator.cpp b/src/widgets/widgets/qtoolbarseparator.cpp
similarity index 100%
rename from src/gui/widgets/qtoolbarseparator.cpp
rename to src/widgets/widgets/qtoolbarseparator.cpp
diff --git a/src/gui/widgets/qtoolbarseparator_p.h b/src/widgets/widgets/qtoolbarseparator_p.h
similarity index 100%
rename from src/gui/widgets/qtoolbarseparator_p.h
rename to src/widgets/widgets/qtoolbarseparator_p.h
diff --git a/src/gui/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp
similarity index 100%
rename from src/gui/widgets/qtoolbox.cpp
rename to src/widgets/widgets/qtoolbox.cpp
diff --git a/src/gui/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h
similarity index 100%
rename from src/gui/widgets/qtoolbox.h
rename to src/widgets/widgets/qtoolbox.h
diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
similarity index 100%
rename from src/gui/widgets/qtoolbutton.cpp
rename to src/widgets/widgets/qtoolbutton.cpp
diff --git a/src/gui/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h
similarity index 100%
rename from src/gui/widgets/qtoolbutton.h
rename to src/widgets/widgets/qtoolbutton.h
diff --git a/src/gui/widgets/qwidgetanimator.cpp b/src/widgets/widgets/qwidgetanimator.cpp
similarity index 100%
rename from src/gui/widgets/qwidgetanimator.cpp
rename to src/widgets/widgets/qwidgetanimator.cpp
diff --git a/src/gui/widgets/qwidgetanimator_p.h b/src/widgets/widgets/qwidgetanimator_p.h
similarity index 100%
rename from src/gui/widgets/qwidgetanimator_p.h
rename to src/widgets/widgets/qwidgetanimator_p.h
diff --git a/src/gui/widgets/qwidgetresizehandler.cpp b/src/widgets/widgets/qwidgetresizehandler.cpp
similarity index 100%
rename from src/gui/widgets/qwidgetresizehandler.cpp
rename to src/widgets/widgets/qwidgetresizehandler.cpp
diff --git a/src/gui/widgets/qwidgetresizehandler_p.h b/src/widgets/widgets/qwidgetresizehandler_p.h
similarity index 100%
rename from src/gui/widgets/qwidgetresizehandler_p.h
rename to src/widgets/widgets/qwidgetresizehandler_p.h
diff --git a/src/gui/widgets/qworkspace.cpp b/src/widgets/widgets/qworkspace.cpp
similarity index 100%
rename from src/gui/widgets/qworkspace.cpp
rename to src/widgets/widgets/qworkspace.cpp
diff --git a/src/gui/widgets/qworkspace.h b/src/widgets/widgets/qworkspace.h
similarity index 100%
rename from src/gui/widgets/qworkspace.h
rename to src/widgets/widgets/qworkspace.h
diff --git a/src/gui/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
similarity index 100%
rename from src/gui/widgets/widgets.pri
rename to src/widgets/widgets/widgets.pri
diff --git a/sync.profile b/sync.profile
index 5552f558fe2..f34f1ae6128 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,6 @@
%modules = ( # path to module name map
"QtGui" => "$basedir/src/gui",
+ "QtWidgets" => "$basedir/src/widgets",
"QtOpenGL" => "$basedir/src/opengl",
"QtCore" => "$basedir/src/corelib",
"QtXml" => "$basedir/src/xml",
@@ -31,6 +32,7 @@
%mastercontent = (
"core" => "#include <QtCore/QtCore>\n",
"gui" => "#include <QtGui/QtGui>\n",
+ "widgets" => "#include <QtGui/QtWidgets>\n",
"network" => "#include <QtNetwork/QtNetwork>\n",
"opengl" => "#include <QtOpenGL/QtOpenGL>\n",
"xml" => "#include <QtXml/QtXml>\n",
@@ -41,6 +43,7 @@
"QtCore" => "$basedir/src/modules/qt_core.pri",
"QtDBus" => "$basedir/src/modules/qt_dbus.pri",
"QtGui" => "$basedir/src/modules/qt_gui.pri",
+ "QtWidgets" => "$basedir/src/modules/qt_widgets.pri",
"QtNetwork" => "$basedir/src/modules/qt_network.pri",
"QtOpenGL" => "$basedir/src/modules/qt_opengl.pri",
"QtSql" => "$basedir/src/modules/qt_sql.pri",
@@ -86,9 +89,14 @@
},
"QtGui" => {
"QtCore" => "THIS_REPOSITORY",
+ "QtGui" => "THIS_REPOSITORY",
+ },
+ "QtWidgets" => {
+ "QtCore" => "THIS_REPOSITORY",
},
"QtUiTools" => {
"QtCore" => "THIS_REPOSITORY",
"QtGui" => "THIS_REPOSITORY",
+ "QtWidgets" => "THIS_REPOSITORY",
},
);
--
GitLab