summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qglobal.h12
-rw-r--r--src/corelib/global/qnamespace.h68
-rw-r--r--src/corelib/global/qt_pch.h2
-rw-r--r--src/corelib/io/qdir.cpp2
-rw-r--r--src/corelib/io/qfsfileengine_p.h4
-rw-r--r--src/corelib/io/qprocess.cpp6
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp24
-rw-r--r--src/corelib/kernel/qcoreapplication.h20
-rw-r--r--src/corelib/kernel/qcoreapplication_win.cpp2
-rw-r--r--src/corelib/kernel/qeventdispatcher_win.cpp2
-rw-r--r--src/corelib/kernel/qmetatype.cpp41
-rw-r--r--src/corelib/kernel/qmetatype.h19
-rw-r--r--src/corelib/kernel/qobject.cpp1
-rw-r--r--src/corelib/kernel/qobject.h4
-rw-r--r--src/corelib/kernel/qvariant.h45
-rw-r--r--src/corelib/plugin/qlibrary_p.h4
-rw-r--r--src/corelib/thread/qthread.cpp4
-rw-r--r--src/corelib/tools/qdatetime.cpp4
-rw-r--r--src/corelib/tools/qlocale.cpp11
-rw-r--r--src/gui/accessible/accessible.pri25
-rw-r--r--src/gui/accessible/qaccessible.h464
-rw-r--r--src/gui/accessible/qaccessible2.h246
-rw-r--r--src/gui/accessible/qaccessibleobject.h140
-rw-r--r--src/gui/accessible/qaccessibleplugin.h87
-rw-r--r--src/gui/accessible/qaccessiblewidget.cpp1031
-rw-r--r--src/gui/accessible/qaccessiblewidget.h141
-rw-r--r--src/gui/dialogs/dialogs.pri122
-rw-r--r--src/gui/dialogs/qabstractpagesetupdialog.h82
-rw-r--r--src/gui/dialogs/qabstractprintdialog.cpp497
-rw-r--r--src/gui/dialogs/qabstractprintdialog.h129
-rw-r--r--src/gui/dialogs/qabstractprintdialog_p.h95
-rw-r--r--src/gui/dialogs/qcolordialog.cpp2114
-rw-r--r--src/gui/dialogs/qcolordialog.h150
-rw-r--r--src/gui/dialogs/qdialog.h140
-rw-r--r--src/gui/dialogs/qdialog_p.h113
-rw-r--r--src/gui/dialogs/qerrormessage.h88
-rw-r--r--src/gui/dialogs/qfiledialog.h331
-rw-r--r--src/gui/dialogs/qfilesystemmodel.h180
-rw-r--r--src/gui/dialogs/qfontdialog.cpp1077
-rw-r--r--src/gui/dialogs/qfontdialog.h147
-rw-r--r--src/gui/dialogs/qfscompleter_p.h82
-rw-r--r--src/gui/dialogs/qinputdialog.h256
-rw-r--r--src/gui/dialogs/qmessagebox.cpp2751
-rw-r--r--src/gui/dialogs/qmessagebox.h365
-rw-r--r--src/gui/dialogs/qpagesetupdialog.h112
-rw-r--r--src/gui/dialogs/qprintdialog.h174
-rw-r--r--src/gui/dialogs/qprintdialog_qws.cpp567
-rw-r--r--src/gui/dialogs/qprintdialog_unix.cpp1309
-rw-r--r--src/gui/dialogs/qprintpreviewdialog.cpp802
-rw-r--r--src/gui/dialogs/qprintpreviewdialog.h107
-rw-r--r--src/gui/dialogs/qprogressdialog.cpp907
-rw-r--r--src/gui/dialogs/qprogressdialog.h145
-rw-r--r--src/gui/dialogs/qwizard.h268
-rw-r--r--src/gui/dialogs/qwizard_win.cpp759
-rw-r--r--src/gui/effects/effects.pri4
-rw-r--r--src/gui/effects/qgraphicseffect.cpp1235
-rw-r--r--src/gui/egl/egl.pri22
-rw-r--r--src/gui/egl/qegl_qpa.cpp3
-rw-r--r--src/gui/egl/qegl_qws.cpp114
-rw-r--r--src/gui/embedded/directfb.pri40
-rw-r--r--src/gui/embedded/embedded.pri226
-rw-r--r--src/gui/embedded/qcopchannel_qws.cpp608
-rw-r--r--src/gui/embedded/qcopchannel_qws.h108
-rw-r--r--src/gui/embedded/qdecoration_qws.cpp404
-rw-r--r--src/gui/embedded/qdecoration_qws.h124
-rw-r--r--src/gui/embedded/qdecorationdefault_qws.cpp803
-rw-r--r--src/gui/embedded/qdecorationdefault_qws.h101
-rw-r--r--src/gui/embedded/qdecorationfactory_qws.cpp156
-rw-r--r--src/gui/embedded/qdecorationfactory_qws.h66
-rw-r--r--src/gui/embedded/qdecorationplugin_qws.cpp116
-rw-r--r--src/gui/embedded/qdecorationplugin_qws.h80
-rw-r--r--src/gui/embedded/qdecorationstyled_qws.cpp313
-rw-r--r--src/gui/embedded/qdecorationstyled_qws.h73
-rw-r--r--src/gui/embedded/qdecorationwindows_qws.cpp407
-rw-r--r--src/gui/embedded/qdecorationwindows_qws.h77
-rw-r--r--src/gui/embedded/qdirectpainter_qws.cpp682
-rw-r--r--src/gui/embedded/qdirectpainter_qws.h112
-rw-r--r--src/gui/embedded/qkbd_defaultmap_qws_p.h806
-rw-r--r--src/gui/embedded/qkbd_qws.cpp693
-rw-r--r--src/gui/embedded/qkbd_qws.h103
-rw-r--r--src/gui/embedded/qkbd_qws_p.h134
-rw-r--r--src/gui/embedded/qkbddriverfactory_qws.cpp187
-rw-r--r--src/gui/embedded/qkbddriverfactory_qws.h70
-rw-r--r--src/gui/embedded/qkbddriverplugin_qws.cpp124
-rw-r--r--src/gui/embedded/qkbddriverplugin_qws.h84
-rw-r--r--src/gui/embedded/qkbdintegrity_qws.cpp197
-rw-r--r--src/gui/embedded/qkbdintegrity_qws.h81
-rw-r--r--src/gui/embedded/qkbdlinuxinput_qws.cpp245
-rw-r--r--src/gui/embedded/qkbdlinuxinput_qws.h79
-rw-r--r--src/gui/embedded/qkbdqnx_qws.cpp236
-rw-r--r--src/gui/embedded/qkbdqnx_qws.h76
-rw-r--r--src/gui/embedded/qkbdtty_qws.cpp353
-rw-r--r--src/gui/embedded/qkbdtty_qws.h79
-rw-r--r--src/gui/embedded/qkbdum_qws.cpp144
-rw-r--r--src/gui/embedded/qkbdum_qws.h77
-rw-r--r--src/gui/embedded/qkbdvfb_qws.cpp124
-rw-r--r--src/gui/embedded/qkbdvfb_qws.h86
-rw-r--r--src/gui/embedded/qlock.cpp325
-rw-r--r--src/gui/embedded/qlock_p.h100
-rw-r--r--src/gui/embedded/qmouse_qws.cpp653
-rw-r--r--src/gui/embedded/qmouse_qws.h123
-rw-r--r--src/gui/embedded/qmousedriverfactory_qws.cpp197
-rw-r--r--src/gui/embedded/qmousedriverfactory_qws.h67
-rw-r--r--src/gui/embedded/qmousedriverplugin_qws.cpp124
-rw-r--r--src/gui/embedded/qmousedriverplugin_qws.h84
-rw-r--r--src/gui/embedded/qmouseintegrity_qws.cpp271
-rw-r--r--src/gui/embedded/qmouseintegrity_qws.h82
-rw-r--r--src/gui/embedded/qmouselinuxinput_qws.cpp205
-rw-r--r--src/gui/embedded/qmouselinuxinput_qws.h78
-rw-r--r--src/gui/embedded/qmouselinuxtp_qws.cpp335
-rw-r--r--src/gui/embedded/qmouselinuxtp_qws.h77
-rw-r--r--src/gui/embedded/qmousepc_qws.cpp794
-rw-r--r--src/gui/embedded/qmousepc_qws.h76
-rw-r--r--src/gui/embedded/qmouseqnx_qws.cpp190
-rw-r--r--src/gui/embedded/qmouseqnx_qws.h79
-rw-r--r--src/gui/embedded/qmousetslib_qws.cpp371
-rw-r--r--src/gui/embedded/qmousetslib_qws.h80
-rw-r--r--src/gui/embedded/qmousevfb_qws.cpp133
-rw-r--r--src/gui/embedded/qmousevfb_qws.h83
-rw-r--r--src/gui/embedded/qscreen_qws.cpp3347
-rw-r--r--src/gui/embedded/qscreen_qws.h391
-rw-r--r--src/gui/embedded/qscreendriverfactory_qws.cpp204
-rw-r--r--src/gui/embedded/qscreendriverfactory_qws.h67
-rw-r--r--src/gui/embedded/qscreendriverplugin_qws.cpp123
-rw-r--r--src/gui/embedded/qscreendriverplugin_qws.h84
-rw-r--r--src/gui/embedded/qscreenintegrityfb_qws.cpp405
-rw-r--r--src/gui/embedded/qscreenintegrityfb_qws.h83
-rw-r--r--src/gui/embedded/qscreenlinuxfb_qws.cpp1386
-rw-r--r--src/gui/embedded/qscreenlinuxfb_qws.h135
-rw-r--r--src/gui/embedded/qscreenmulti_qws.cpp486
-rw-r--r--src/gui/embedded/qscreenmulti_qws_p.h114
-rw-r--r--src/gui/embedded/qscreenproxy_qws.cpp635
-rw-r--r--src/gui/embedded/qscreenproxy_qws.h153
-rw-r--r--src/gui/embedded/qscreenqnx_qws.cpp450
-rw-r--r--src/gui/embedded/qscreenqnx_qws.h82
-rw-r--r--src/gui/embedded/qscreentransformed_qws.cpp748
-rw-r--r--src/gui/embedded/qscreentransformed_qws.h103
-rw-r--r--src/gui/embedded/qscreenvfb_qws.cpp445
-rw-r--r--src/gui/embedded/qscreenvfb_qws.h86
-rw-r--r--src/gui/embedded/qsoundqss_qws.cpp1530
-rw-r--r--src/gui/embedded/qsoundqss_qws.h177
-rw-r--r--src/gui/embedded/qtransportauth_qws.cpp1563
-rw-r--r--src/gui/embedded/qtransportauth_qws.h281
-rw-r--r--src/gui/embedded/qtransportauth_qws_p.h189
-rw-r--r--src/gui/embedded/qtransportauthdefs_qws.h174
-rw-r--r--src/gui/embedded/qunixsocket.cpp1800
-rw-r--r--src/gui/embedded/qunixsocket_p.h202
-rw-r--r--src/gui/embedded/qunixsocketserver.cpp376
-rw-r--r--src/gui/embedded/qunixsocketserver_p.h98
-rw-r--r--src/gui/embedded/qvfbhdr.h119
-rw-r--r--src/gui/embedded/qwindowsystem_p.h315
-rw-r--r--src/gui/embedded/qwindowsystem_qws.cpp4960
-rw-r--r--src/gui/embedded/qwindowsystem_qws.h508
-rw-r--r--src/gui/embedded/qwscommand_qws.cpp609
-rw-r--r--src/gui/embedded/qwscommand_qws_p.h851
-rw-r--r--src/gui/embedded/qwscursor_qws.cpp654
-rw-r--r--src/gui/embedded/qwscursor_qws.h83
-rw-r--r--src/gui/embedded/qwsdisplay_qws.h185
-rw-r--r--src/gui/embedded/qwsdisplay_qws_p.h161
-rw-r--r--src/gui/embedded/qwsembedwidget.cpp227
-rw-r--r--src/gui/embedded/qwsembedwidget.h82
-rw-r--r--src/gui/embedded/qwsevent_qws.cpp216
-rw-r--r--src/gui/embedded/qwsevent_qws.h459
-rw-r--r--src/gui/embedded/qwslock.cpp236
-rw-r--r--src/gui/embedded/qwslock_p.h85
-rw-r--r--src/gui/embedded/qwsmanager_p.h122
-rw-r--r--src/gui/embedded/qwsmanager_qws.cpp537
-rw-r--r--src/gui/embedded/qwsmanager_qws.h122
-rw-r--r--src/gui/embedded/qwsproperty_qws.cpp145
-rw-r--r--src/gui/embedded/qwsproperty_qws.h96
-rw-r--r--src/gui/embedded/qwsprotocolitem_qws.h100
-rw-r--r--src/gui/embedded/qwssharedmemory.cpp185
-rw-r--r--src/gui/embedded/qwssharedmemory_p.h105
-rw-r--r--src/gui/embedded/qwssignalhandler.cpp128
-rw-r--r--src/gui/embedded/qwssignalhandler_p.h99
-rw-r--r--src/gui/embedded/qwssocket_qws.cpp280
-rw-r--r--src/gui/embedded/qwssocket_qws.h120
-rw-r--r--src/gui/embedded/qwsutils_qws.h98
-rw-r--r--src/gui/graphicsview/qgraphicsanchorlayout.h128
-rw-r--r--src/gui/graphicsview/qgraphicsanchorlayout_p.cpp3015
-rw-r--r--src/gui/graphicsview/qgraphicsgridlayout.h144
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp11601
-rw-r--r--src/gui/graphicsview/qgraphicslayout.h100
-rw-r--r--src/gui/graphicsview/qgraphicslayout_p.h154
-rw-r--r--src/gui/graphicsview/qgraphicslayoutitem.h155
-rw-r--r--src/gui/graphicsview/qgraphicslayoutitem_p.h103
-rw-r--r--src/gui/graphicsview/qgraphicslinearlayout.h119
-rw-r--r--src/gui/graphicsview/qgraphicsproxywidget.cpp1570
-rw-r--r--src/gui/graphicsview/qgraphicsproxywidget.h147
-rw-r--r--src/gui/graphicsview/qgraphicsscene.cpp6503
-rw-r--r--src/gui/graphicsview/qgraphicsscene_p.h359
-rw-r--r--src/gui/graphicsview/qgraphicssceneevent.cpp1674
-rw-r--r--src/gui/graphicsview/qgraphicsscenelinearindex_p.h109
-rw-r--r--src/gui/graphicsview/qgraphicsview.cpp3880
-rw-r--r--src/gui/graphicsview/qgraphicsview.h316
-rw-r--r--src/gui/graphicsview/qgraphicsview_p.h233
-rw-r--r--src/gui/graphicsview/qgraphicswidget.cpp2425
-rw-r--r--src/gui/graphicsview/qgraphicswidget.h257
-rw-r--r--src/gui/graphicsview/qgraphicswidget_p.cpp906
-rw-r--r--src/gui/graphicsview/qgraphicswidget_p.h226
-rw-r--r--src/gui/gui.pro42
-rw-r--r--src/gui/image/image.pri14
-rw-r--r--src/gui/image/qbitmap.cpp94
-rw-r--r--src/gui/image/qbitmap.h23
-rw-r--r--src/gui/image/qicon.cpp1258
-rw-r--r--src/gui/image/qicon.h162
-rw-r--r--src/gui/image/qicon_p.h139
-rw-r--r--src/gui/image/qiconengine.h104
-rw-r--r--src/gui/image/qiconloader.cpp570
-rw-r--r--src/gui/image/qiconloader_p.h192
-rw-r--r--src/gui/image/qimage.cpp553
-rw-r--r--src/gui/image/qimage.h52
-rw-r--r--src/gui/image/qimage_p.h3
-rw-r--r--src/gui/image/qmovie.h20
-rw-r--r--src/gui/image/qnativeimage.cpp111
-rw-r--r--src/gui/image/qnativeimage_p.h12
-rw-r--r--src/gui/image/qpicture.cpp2
-rw-r--r--src/gui/image/qpicture.h3
-rw-r--r--src/gui/image/qpixmap.cpp254
-rw-r--r--src/gui/image/qpixmap.h36
-rw-r--r--src/gui/image/qpixmap_blitter.cpp5
-rw-r--r--src/gui/image/qpixmap_qpa.cpp5
-rw-r--r--src/gui/image/qpixmap_qws.cpp160
-rw-r--r--src/gui/image/qpixmap_raster.cpp1
-rw-r--r--src/gui/image/qpixmapdata.cpp17
-rw-r--r--src/gui/image/qpixmapdatafactory.cpp21
-rw-r--r--src/gui/image/qpixmapfilter.cpp1382
-rw-r--r--src/gui/image/qpixmapfilter_p.h196
-rw-r--r--src/gui/inputmethod/inputmethod.pri31
-rw-r--r--src/gui/inputmethod/qinputcontext.h139
-rw-r--r--src/gui/inputmethod/qmacinputcontext_p.h97
-rw-r--r--src/gui/inputmethod/qwininputcontext_p.h111
-rw-r--r--src/gui/inputmethod/qwsinputcontext_p.h97
-rw-r--r--src/gui/inputmethod/qwsinputcontext_qws.cpp246
-rw-r--r--src/gui/inputmethod/qximinputcontext_p.h142
-rw-r--r--src/gui/itemviews/itemviews.pri72
-rw-r--r--src/gui/itemviews/qabstractitemdelegate.h134
-rw-r--r--src/gui/itemviews/qabstractitemview.h380
-rw-r--r--src/gui/itemviews/qabstractitemview_p.h457
-rw-r--r--src/gui/itemviews/qcolumnview.h123
-rw-r--r--src/gui/itemviews/qcolumnview_p.h189
-rw-r--r--src/gui/itemviews/qdirmodel.h160
-rw-r--r--src/gui/itemviews/qfileiconprovider.h82
-rw-r--r--src/gui/itemviews/qheaderview.h250
-rw-r--r--src/gui/itemviews/qheaderview_p.h366
-rw-r--r--src/gui/itemviews/qidentityproxymodel.h120
-rw-r--r--src/gui/itemviews/qitemdelegate.h141
-rw-r--r--src/gui/itemviews/qlistview.cpp3212
-rw-r--r--src/gui/itemviews/qlistview.h203
-rw-r--r--src/gui/itemviews/qlistwidget.h335
-rw-r--r--src/gui/itemviews/qlistwidget_p.h175
-rw-r--r--src/gui/itemviews/qsortfilterproxymodel.h201
-rw-r--r--src/gui/itemviews/qstandarditemmodel.h456
-rw-r--r--src/gui/itemviews/qstringlistmodel.h91
-rw-r--r--src/gui/itemviews/qstyleditemdelegate.h116
-rw-r--r--src/gui/itemviews/qtableview.h198
-rw-r--r--src/gui/itemviews/qtablewidget.h377
-rw-r--r--src/gui/itemviews/qtreeview.h239
-rw-r--r--src/gui/itemviews/qtreewidget.h432
-rw-r--r--src/gui/itemviews/qtreewidget_p.h248
-rw-r--r--src/gui/kernel/kernel.pri324
-rw-r--r--src/gui/kernel/mac.pri4
-rw-r--r--src/gui/kernel/qaction.h264
-rw-r--r--src/gui/kernel/qaction_p.h144
-rw-r--r--src/gui/kernel/qactiongroup.h112
-rw-r--r--src/gui/kernel/qapplication.cpp6139
-rw-r--r--src/gui/kernel/qapplication.h430
-rw-r--r--src/gui/kernel/qapplication_p.h683
-rw-r--r--src/gui/kernel/qapplication_qpa.cpp968
-rw-r--r--src/gui/kernel/qapplication_qws.cpp3797
-rw-r--r--src/gui/kernel/qboxlayout.h173
-rw-r--r--src/gui/kernel/qclipboard.cpp2
-rw-r--r--src/gui/kernel/qclipboard.h1
-rw-r--r--src/gui/kernel/qclipboard_qpa.cpp8
-rw-r--r--src/gui/kernel/qclipboard_qws.cpp304
-rw-r--r--src/gui/kernel/qcursor.cpp12
-rw-r--r--src/gui/kernel/qcursor.h12
-rw-r--r--src/gui/kernel/qcursor_qws.cpp138
-rw-r--r--src/gui/kernel/qdesktopwidget.h110
-rw-r--r--src/gui/kernel/qdesktopwidget_qpa.cpp176
-rw-r--r--src/gui/kernel/qdesktopwidget_qws.cpp159
-rw-r--r--src/gui/kernel/qdnd.cpp23
-rw-r--r--src/gui/kernel/qdnd_p.h167
-rw-r--r--src/gui/kernel/qdnd_qpa.cpp422
-rw-r--r--src/gui/kernel/qdnd_qws.cpp426
-rw-r--r--src/gui/kernel/qdnd_x11.cpp2076
-rw-r--r--src/gui/kernel/qdrag.cpp11
-rw-r--r--src/gui/kernel/qdrag.h12
-rw-r--r--src/gui/kernel/qevent.cpp577
-rw-r--r--src/gui/kernel/qevent.h147
-rw-r--r--src/gui/kernel/qevent_p.h47
-rw-r--r--src/gui/kernel/qeventdispatcher_glib_qpa.cpp9
-rw-r--r--src/gui/kernel/qeventdispatcher_glib_qws.cpp195
-rw-r--r--src/gui/kernel/qeventdispatcher_glib_qws_p.h78
-rw-r--r--src/gui/kernel/qeventdispatcher_qpa.cpp12
-rw-r--r--src/gui/kernel/qeventdispatcher_qws.cpp168
-rw-r--r--src/gui/kernel/qeventdispatcher_qws_p.h86
-rw-r--r--src/gui/kernel/qformlayout.h163
-rw-r--r--src/gui/kernel/qgenericpluginfactory_qpa.cpp2
-rw-r--r--src/gui/kernel/qgesture.cpp807
-rw-r--r--src/gui/kernel/qgesture.h275
-rw-r--r--src/gui/kernel/qgesture_p.h197
-rw-r--r--src/gui/kernel/qgridlayout.h176
-rw-r--r--src/gui/kernel/qguiapplication.cpp1087
-rw-r--r--src/gui/kernel/qguiapplication.h149
-rw-r--r--src/gui/kernel/qguiapplication_p.h170
-rw-r--r--src/gui/kernel/qguiplatformplugin_p.h126
-rw-r--r--src/gui/kernel/qguivariant.cpp87
-rw-r--r--src/gui/kernel/qkde_p.h81
-rw-r--r--src/gui/kernel/qkeymapper.cpp6
-rw-r--r--src/gui/kernel/qkeymapper_p.h4
-rw-r--r--src/gui/kernel/qkeymapper_qpa.cpp (renamed from src/gui/kernel/qkeymapper_qws.cpp)0
-rw-r--r--src/gui/kernel/qkeysequence.cpp323
-rw-r--r--src/gui/kernel/qkeysequence.h3
-rw-r--r--src/gui/kernel/qlayout.h245
-rw-r--r--src/gui/kernel/qlayoutengine_p.h140
-rw-r--r--src/gui/kernel/qlayoutitem.h182
-rw-r--r--src/gui/kernel/qpalette.cpp321
-rw-r--r--src/gui/kernel/qpalette.h73
-rw-r--r--src/gui/kernel/qplatformclipboard_qpa.cpp4
-rw-r--r--src/gui/kernel/qplatformcursor_qpa.cpp3
-rw-r--r--src/gui/kernel/qplatformcursor_qpa.h4
-rw-r--r--src/gui/kernel/qplatformglcontext_qpa.cpp128
-rw-r--r--src/gui/kernel/qplatformglcontext_qpa.h35
-rw-r--r--src/gui/kernel/qplatformintegration_qpa.cpp18
-rw-r--r--src/gui/kernel/qplatformintegration_qpa.h10
-rw-r--r--src/gui/kernel/qplatformintegrationfactory_qpa.cpp2
-rw-r--r--src/gui/kernel/qplatformnativeinterface_qpa.cpp4
-rw-r--r--src/gui/kernel/qplatformnativeinterface_qpa.h4
-rw-r--r--src/gui/kernel/qplatformscreen_qpa.cpp31
-rw-r--r--src/gui/kernel/qplatformscreen_qpa.h8
-rw-r--r--src/gui/kernel/qplatformwindow_qpa.cpp73
-rw-r--r--src/gui/kernel/qplatformwindow_qpa.h13
-rw-r--r--src/gui/kernel/qplatformwindowformat_qpa.cpp994
-rw-r--r--src/gui/kernel/qplatformwindowformat_qpa.h234
-rw-r--r--src/gui/kernel/qsessionmanager.h4
-rw-r--r--src/gui/kernel/qsessionmanager_qpa.cpp4
-rw-r--r--src/gui/kernel/qsessionmanager_qws.cpp171
-rw-r--r--src/gui/kernel/qshortcut.h107
-rw-r--r--src/gui/kernel/qshortcutmap.cpp897
-rw-r--r--src/gui/kernel/qsoftkeymanager_p.h115
-rw-r--r--src/gui/kernel/qsound.cpp390
-rw-r--r--src/gui/kernel/qsound.h95
-rw-r--r--src/gui/kernel/qsound_qws.cpp350
-rw-r--r--src/gui/kernel/qstackedlayout.h115
-rw-r--r--src/gui/kernel/qt_gui_pch.h8
-rw-r--r--src/gui/kernel/qtooltip.h84
-rw-r--r--src/gui/kernel/qwhatsthis.cpp777
-rw-r--r--src/gui/kernel/qwidget.cpp12704
-rw-r--r--src/gui/kernel/qwidget.h1090
-rw-r--r--src/gui/kernel/qwidget_p.h1036
-rw-r--r--src/gui/kernel/qwidget_qpa.cpp890
-rw-r--r--src/gui/kernel/qwidget_qws.cpp1221
-rw-r--r--src/gui/kernel/qwidget_x11.cpp3149
-rw-r--r--src/gui/kernel/qwidgetaction.h91
-rw-r--r--src/gui/kernel/qwindow.cpp557
-rw-r--r--src/gui/kernel/qwindow.h196
-rw-r--r--src/gui/kernel/qwindow_p.h106
-rw-r--r--src/gui/kernel/qwindowcontext_qpa.cpp201
-rw-r--r--src/gui/kernel/qwindowcontext_qpa.h90
-rw-r--r--src/gui/kernel/qwindowdefs.h5
-rw-r--r--src/gui/kernel/qwindowformat_qpa.cpp406
-rw-r--r--src/gui/kernel/qwindowformat_qpa.h155
-rw-r--r--src/gui/kernel/qwindowsysteminterface_qpa.cpp73
-rw-r--r--src/gui/kernel/qwindowsysteminterface_qpa.h32
-rw-r--r--src/gui/kernel/qwindowsysteminterface_qpa_p.h38
-rw-r--r--src/gui/kernel/qx11embed_x11.h132
-rw-r--r--src/gui/painting/painting.pri78
-rw-r--r--src/gui/painting/qbackingstore.cpp1668
-rw-r--r--src/gui/painting/qbackingstore_p.h278
-rw-r--r--src/gui/painting/qbrush.cpp32
-rw-r--r--src/gui/painting/qbrush.h10
-rw-r--r--src/gui/painting/qcolor.cpp24
-rw-r--r--src/gui/painting/qcolor.h21
-rw-r--r--src/gui/painting/qcolormap_qpa.cpp5
-rw-r--r--src/gui/painting/qcolormap_qws.cpp185
-rw-r--r--src/gui/painting/qcssutil_p.h4
-rw-r--r--src/gui/painting/qcups_p.h2
-rw-r--r--src/gui/painting/qdrawhelper.cpp744
-rw-r--r--src/gui/painting/qdrawhelper_p.h145
-rw-r--r--src/gui/painting/qdrawutil.cpp1360
-rw-r--r--src/gui/painting/qdrawutil.h195
-rw-r--r--src/gui/painting/qgraphicssystem.cpp97
-rw-r--r--src/gui/painting/qgraphicssystem_mac.cpp59
-rw-r--r--src/gui/painting/qgraphicssystem_mac_p.h69
-rw-r--r--src/gui/painting/qgraphicssystem_p.h85
-rw-r--r--src/gui/painting/qgraphicssystem_qws.cpp62
-rw-r--r--src/gui/painting/qgraphicssystem_qws_p.h79
-rw-r--r--src/gui/painting/qgraphicssystem_raster.cpp72
-rw-r--r--src/gui/painting/qgraphicssystem_raster_p.h69
-rw-r--r--src/gui/painting/qgraphicssystem_runtime.cpp426
-rw-r--r--src/gui/painting/qgraphicssystem_runtime_p.h187
-rw-r--r--src/gui/painting/qgraphicssystemfactory.cpp123
-rw-r--r--src/gui/painting/qgraphicssystemfactory_p.h78
-rw-r--r--src/gui/painting/qgraphicssystemplugin.cpp56
-rw-r--r--src/gui/painting/qgraphicssystemplugin_p.h92
-rw-r--r--src/gui/painting/qmatrix.cpp36
-rw-r--r--src/gui/painting/qmatrix.h12
-rw-r--r--src/gui/painting/qmemrotate.cpp12
-rw-r--r--src/gui/painting/qpaintdevice.cpp17
-rw-r--r--src/gui/painting/qpaintdevice.h47
-rw-r--r--src/gui/painting/qpaintdevice_qpa.cpp5
-rw-r--r--src/gui/painting/qpaintdevice_qws.cpp56
-rw-r--r--src/gui/painting/qpaintdevice_x11.cpp198
-rw-r--r--src/gui/painting/qpaintengine.cpp4
-rw-r--r--src/gui/painting/qpaintengine_blitter.cpp1
-rw-r--r--src/gui/painting/qpaintengine_p.h4
-rw-r--r--src/gui/painting/qpaintengine_raster.cpp231
-rw-r--r--src/gui/painting/qpaintengine_raster_p.h65
-rw-r--r--src/gui/painting/qpaintengine_x11.cpp2504
-rw-r--r--src/gui/painting/qpaintengineex_p.h2
-rw-r--r--src/gui/painting/qpainter.cpp645
-rw-r--r--src/gui/painting/qpainter.h77
-rw-r--r--src/gui/painting/qpdf_p.h4
-rw-r--r--src/gui/painting/qprintengine_ps.cpp972
-rw-r--r--src/gui/painting/qprintengine_ps_p.h137
-rw-r--r--src/gui/painting/qprintengine_qws.cpp886
-rw-r--r--src/gui/painting/qprintengine_qws_p.h213
-rw-r--r--src/gui/painting/qprinter.cpp225
-rw-r--r--src/gui/painting/qprinter.h58
-rw-r--r--src/gui/painting/qprinter_p.h10
-rw-r--r--src/gui/painting/qprinterinfo_unix.cpp26
-rw-r--r--src/gui/painting/qregion.cpp11
-rw-r--r--src/gui/painting/qregion.h6
-rw-r--r--src/gui/painting/qregion_qws.cpp3183
-rw-r--r--src/gui/painting/qstylepainter.h112
-rw-r--r--src/gui/painting/qunifiedtoolbarsurface_mac.cpp265
-rw-r--r--src/gui/painting/qunifiedtoolbarsurface_mac_p.h140
-rw-r--r--src/gui/painting/qwindowsurface.cpp102
-rw-r--r--src/gui/painting/qwindowsurface_mac.cpp139
-rw-r--r--src/gui/painting/qwindowsurface_mac_p.h84
-rw-r--r--src/gui/painting/qwindowsurface_p.h25
-rw-r--r--src/gui/painting/qwindowsurface_qws.cpp1433
-rw-r--r--src/gui/painting/qwindowsurface_qws_p.h355
-rw-r--r--src/gui/painting/qwindowsurface_raster.cpp487
-rw-r--r--src/gui/painting/qwindowsurface_raster_p.h132
-rw-r--r--src/gui/painting/qwindowsurface_s60.cpp254
-rw-r--r--src/gui/painting/qwindowsurface_s60_p.h93
-rw-r--r--src/gui/painting/qwindowsurface_x11.cpp265
-rw-r--r--src/gui/painting/qwindowsurface_x11_p.h92
-rw-r--r--src/gui/painting/qwmatrix.h61
-rw-r--r--src/gui/s60framework/qs60mainappui.cpp430
-rw-r--r--src/gui/statemachine/qguistatemachine.cpp523
-rw-r--r--src/gui/styles/qcdestyle.h82
-rw-r--r--src/gui/styles/qcleanlooksstyle.h114
-rw-r--r--src/gui/styles/qcommonstyle.h109
-rw-r--r--src/gui/styles/qgtkpainter.cpp716
-rw-r--r--src/gui/styles/qgtkpainter_p.h129
-rw-r--r--src/gui/styles/qgtkstyle.cpp3560
-rw-r--r--src/gui/styles/qgtkstyle.h128
-rw-r--r--src/gui/styles/qgtkstyle_p.cpp1146
-rw-r--r--src/gui/styles/qgtkstyle_p.h531
-rw-r--r--src/gui/styles/qmacstyle_mac.h148
-rw-r--r--src/gui/styles/qmacstyle_mac_p.h241
-rw-r--r--src/gui/styles/qmotifstyle.cpp2721
-rw-r--r--src/gui/styles/qmotifstyle.h128
-rw-r--r--src/gui/styles/qplastiquestyle.h119
-rw-r--r--src/gui/styles/qproxystyle.h114
-rw-r--r--src/gui/styles/qs60style.h118
-rw-r--r--src/gui/styles/qstyle.cpp2493
-rw-r--r--src/gui/styles/qstyle.h889
-rw-r--r--src/gui/styles/qstyle_p.h108
-rw-r--r--src/gui/styles/qstylehelper_p.h118
-rw-r--r--src/gui/styles/qstyleoption.h970
-rw-r--r--src/gui/styles/qstylesheetstyle.cpp5898
-rw-r--r--src/gui/styles/qstylesheetstyle_p.h204
-rw-r--r--src/gui/styles/qwindowscestyle.h103
-rw-r--r--src/gui/styles/qwindowsmobilestyle.h116
-rw-r--r--src/gui/styles/qwindowsstyle.h111
-rw-r--r--src/gui/styles/qwindowsvistastyle.h108
-rw-r--r--src/gui/styles/qwindowsxpstyle.h107
-rw-r--r--src/gui/styles/styles.pri190
-rw-r--r--src/gui/text/qabstractfontengine_qws.cpp776
-rw-r--r--src/gui/text/qabstractfontengine_qws.h221
-rw-r--r--src/gui/text/qcssparser.cpp6
-rw-r--r--src/gui/text/qcssparser_p.h6
-rw-r--r--src/gui/text/qfont.cpp94
-rw-r--r--src/gui/text/qfont.h8
-rw-r--r--src/gui/text/qfont_qpa.cpp6
-rw-r--r--src/gui/text/qfont_qws.cpp135
-rw-r--r--src/gui/text/qfontdatabase.cpp48
-rw-r--r--src/gui/text/qfontdatabase.h4
-rw-r--r--src/gui/text/qfontdatabase_qpa.cpp29
-rw-r--r--src/gui/text/qfontdatabase_qws.cpp972
-rw-r--r--src/gui/text/qfontengine_qpa.cpp1
-rw-r--r--src/gui/text/qfontengine_qws.cpp665
-rw-r--r--src/gui/text/qfontmetrics.h9
-rw-r--r--src/gui/text/qrawfont_qpa.cpp4
-rw-r--r--src/gui/text/qstatictext.cpp2
-rw-r--r--src/gui/text/qsyntaxhighlighter.cpp21
-rw-r--r--src/gui/text/qsyntaxhighlighter.h2
-rw-r--r--src/gui/text/qtextcontrol.cpp3148
-rw-r--r--src/gui/text/qtextcontrol_p.h312
-rw-r--r--src/gui/text/qtextcontrol_p_p.h238
-rw-r--r--src/gui/text/qtextcursor_p.h2
-rw-r--r--src/gui/text/qtextdocument.cpp9
-rw-r--r--src/gui/text/qtextdocumentlayout.cpp4
-rw-r--r--src/gui/text/qtextengine.cpp4
-rw-r--r--src/gui/text/qtextengine_p.h2
-rw-r--r--src/gui/text/qtexthtmlparser.cpp6
-rw-r--r--src/gui/text/qtextimagehandler.cpp14
-rw-r--r--src/gui/text/qtextlayout.cpp2
-rw-r--r--src/gui/text/qtextoption.cpp4
-rw-r--r--src/gui/text/text.pri27
-rw-r--r--src/gui/util/qcompleter.cpp1833
-rw-r--r--src/gui/util/qcompleter_p.h264
-rw-r--r--src/gui/util/qdesktopservices.cpp2
-rw-r--r--src/gui/util/qdesktopservices_qpa.cpp (renamed from src/gui/util/qdesktopservices_qws.cpp)0
-rw-r--r--src/gui/util/qhexstring_p.h98
-rw-r--r--src/gui/util/qscroller.h155
-rw-r--r--src/gui/util/qsystemtrayicon.h132
-rw-r--r--src/gui/util/qsystemtrayicon_p.h186
-rw-r--r--src/gui/util/qundostack_p.h114
-rw-r--r--src/gui/util/qundoview.cpp476
-rw-r--r--src/gui/util/qundoview.h102
-rw-r--r--src/gui/util/qvalidator.cpp (renamed from src/gui/widgets/qvalidator.cpp)0
-rw-r--r--src/gui/util/qvalidator.h (renamed from src/gui/widgets/qvalidator.h)0
-rw-r--r--src/gui/util/util.pri67
-rw-r--r--src/gui/widgets/qabstractbutton.h180
-rw-r--r--src/gui/widgets/qabstractscrollarea.h144
-rw-r--r--src/gui/widgets/qabstractslider.h184
-rw-r--r--src/gui/widgets/qabstractspinbox.h181
-rw-r--r--src/gui/widgets/qabstractspinbox_p.h170
-rw-r--r--src/gui/widgets/qcalendarwidget.h204
-rw-r--r--src/gui/widgets/qcheckbox.h114
-rw-r--r--src/gui/widgets/qcombobox.h339
-rw-r--r--src/gui/widgets/qcombobox_p.h421
-rw-r--r--src/gui/widgets/qcommandlinkbutton.h85
-rw-r--r--src/gui/widgets/qdatetimeedit.h230
-rw-r--r--src/gui/widgets/qdatetimeedit_p.h185
-rw-r--r--src/gui/widgets/qdial.h122
-rw-r--r--src/gui/widgets/qdialogbuttonbox.cpp1285
-rw-r--r--src/gui/widgets/qdialogbuttonbox.h168
-rw-r--r--src/gui/widgets/qdockarealayout.cpp3329
-rw-r--r--src/gui/widgets/qdockarealayout_p.h308
-rw-r--r--src/gui/widgets/qdockwidget.h146
-rw-r--r--src/gui/widgets/qdockwidget_p.h207
-rw-r--r--src/gui/widgets/qfocusframe.h82
-rw-r--r--src/gui/widgets/qfontcombobox.h112
-rw-r--r--src/gui/widgets/qframe.h148
-rw-r--r--src/gui/widgets/qgroupbox.h122
-rw-r--r--src/gui/widgets/qlabel.h182
-rw-r--r--src/gui/widgets/qlcdnumber.h144
-rw-r--r--src/gui/widgets/qlinecontrol_p.h463
-rw-r--r--src/gui/widgets/qlineedit.h300
-rw-r--r--src/gui/widgets/qlineedit_p.cpp292
-rw-r--r--src/gui/widgets/qlineedit_p.h155
-rw-r--r--src/gui/widgets/qmaccocoaviewcontainer_mac.h73
-rw-r--r--src/gui/widgets/qmacnativewidget_mac.h74
-rw-r--r--src/gui/widgets/qmainwindow.h219
-rw-r--r--src/gui/widgets/qmainwindowlayout_p.h357
-rw-r--r--src/gui/widgets/qmdiarea.h179
-rw-r--r--src/gui/widgets/qmdiarea_p.h285
-rw-r--r--src/gui/widgets/qmdisubwindow.h159
-rw-r--r--src/gui/widgets/qmenu.h434
-rw-r--r--src/gui/widgets/qmenu_p.h395
-rw-r--r--src/gui/widgets/qmenubar.h367
-rw-r--r--src/gui/widgets/qmenubar_p.h283
-rw-r--r--src/gui/widgets/qmenudata.h80
-rw-r--r--src/gui/widgets/qplaintextedit.h329
-rw-r--r--src/gui/widgets/qplaintextedit_p.h187
-rw-r--r--src/gui/widgets/qprintpreviewwidget.cpp844
-rw-r--r--src/gui/widgets/qprintpreviewwidget.h127
-rw-r--r--src/gui/widgets/qprogressbar.h132
-rw-r--r--src/gui/widgets/qpushbutton.h127
-rw-r--r--src/gui/widgets/qradiobutton.h89
-rw-r--r--src/gui/widgets/qrubberband.h104
-rw-r--r--src/gui/widgets/qscrollarea.h101
-rw-r--r--src/gui/widgets/qscrollarea_p.h81
-rw-r--r--src/gui/widgets/qscrollbar.h104
-rw-r--r--src/gui/widgets/qsizegrip.cpp570
-rw-r--r--src/gui/widgets/qsizegrip.h95
-rw-r--r--src/gui/widgets/qslider.h134
-rw-r--r--src/gui/widgets/qspinbox.h188
-rw-r--r--src/gui/widgets/qsplashscreen.h99
-rw-r--r--src/gui/widgets/qsplitter.h192
-rw-r--r--src/gui/widgets/qstackedwidget.h100
-rw-r--r--src/gui/widgets/qstatusbar.h116
-rw-r--r--src/gui/widgets/qtabbar.h226
-rw-r--r--src/gui/widgets/qtabwidget.h253
-rw-r--r--src/gui/widgets/qtextbrowser.h140
-rw-r--r--src/gui/widgets/qtextedit.h430
-rw-r--r--src/gui/widgets/qtextedit_p.h141
-rw-r--r--src/gui/widgets/qtoolbar.h188
-rw-r--r--src/gui/widgets/qtoolbar_p.h135
-rw-r--r--src/gui/widgets/qtoolbarextension_p.h80
-rw-r--r--src/gui/widgets/qtoolbarlayout_p.h134
-rw-r--r--src/gui/widgets/qtoolbarseparator_p.h88
-rw-r--r--src/gui/widgets/qtoolbox.h148
-rw-r--r--src/gui/widgets/qtoolbutton.h199
-rw-r--r--src/gui/widgets/qwidgetanimator.cpp117
-rw-r--r--src/gui/widgets/qworkspace.h137
-rw-r--r--src/gui/widgets/widgets.pri169
-rw-r--r--src/modules/qt_opengl.pri2
-rw-r--r--src/modules/qt_openvg.pri16
-rw-r--r--src/modules/qt_widgets.pri14
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp4
-rw-r--r--src/opengl/gl2paintengineex/qtriangulator.cpp2
-rw-r--r--src/opengl/opengl.pro23
-rw-r--r--src/opengl/qgl.cpp8
-rw-r--r--src/opengl/qgl.h14
-rw-r--r--src/opengl/qgl_p.h6
-rw-r--r--src/opengl/qgl_qpa.cpp157
-rw-r--r--src/opengl/qgl_qws.cpp318
-rw-r--r--src/opengl/qglpaintdevice_p.h2
-rw-r--r--src/opengl/qglpixmapfilter.cpp1
-rw-r--r--src/opengl/qglscreen_qws.cpp242
-rw-r--r--src/opengl/qglscreen_qws.h127
-rw-r--r--src/opengl/qglwindowsurface_qws.cpp133
-rw-r--r--src/opengl/qglwindowsurface_qws_p.h90
-rw-r--r--src/opengl/qgraphicsshadereffect.cpp4
-rw-r--r--src/opengl/qgraphicsshadereffect_p.h2
-rw-r--r--src/opengl/qgraphicssystem_gl.cpp114
-rw-r--r--src/opengl/qgraphicssystem_gl_p.h80
-rw-r--r--src/opengl/qpaintengine_opengl.cpp4
-rw-r--r--src/opengl/qwindowsurface_gl.cpp168
-rw-r--r--src/opengl/qwindowsurface_gl_p.h10
-rw-r--r--src/openvg/openvg.pro76
-rw-r--r--src/openvg/qpaintengine_vg.cpp4269
-rw-r--r--src/openvg/qpaintengine_vg_p.h178
-rw-r--r--src/openvg/qpixmapdata_vg.cpp575
-rw-r--r--src/openvg/qpixmapdata_vg_p.h202
-rw-r--r--src/openvg/qpixmapfilter_vg.cpp356
-rw-r--r--src/openvg/qpixmapfilter_vg_p.h108
-rw-r--r--src/openvg/qvg.h65
-rw-r--r--src/openvg/qvg_p.h112
-rw-r--r--src/openvg/qvg_symbian.cpp366
-rw-r--r--src/openvg/qvgcompositionhelper_p.h90
-rw-r--r--src/openvg/qvgfontglyphcache_p.h101
-rw-r--r--src/openvg/qvgimagepool.cpp233
-rw-r--r--src/openvg/qvgimagepool_p.h157
-rw-r--r--src/openvg/qwindowsurface_vg.cpp148
-rw-r--r--src/openvg/qwindowsurface_vg_p.h94
-rw-r--r--src/openvg/qwindowsurface_vgegl.cpp783
-rw-r--r--src/openvg/qwindowsurface_vgegl_p.h148
-rw-r--r--src/plugins/accessible/widgets/complexwidgets.h6
-rw-r--r--src/plugins/accessible/widgets/qaccessiblemenu.cpp2
-rw-r--r--src/plugins/accessible/widgets/qaccessiblemenu.h2
-rw-r--r--src/plugins/accessible/widgets/qaccessiblewidgets.cpp2
-rw-r--r--src/plugins/accessible/widgets/qaccessiblewidgets.h4
-rw-r--r--src/plugins/accessible/widgets/rangecontrols.h4
-rw-r--r--src/plugins/accessible/widgets/simplewidgets.h4
-rw-r--r--src/plugins/accessible/widgets/widgets.pro2
-rw-r--r--src/plugins/decorations/decorations.pro4
-rw-r--r--src/plugins/decorations/default/default.pro10
-rw-r--r--src/plugins/decorations/default/main.cpp76
-rw-r--r--src/plugins/decorations/styled/main.cpp77
-rw-r--r--src/plugins/decorations/styled/styled.pro13
-rw-r--r--src/plugins/decorations/windows/main.cpp76
-rw-r--r--src/plugins/decorations/windows/windows.pro10
-rw-r--r--src/plugins/gfxdrivers/ahi/ahi.pro14
-rw-r--r--src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp598
-rw-r--r--src/plugins/gfxdrivers/ahi/qscreenahi_qws.h84
-rw-r--r--src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp74
-rw-r--r--src/plugins/gfxdrivers/directfb/directfb.pro15
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp436
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h74
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp294
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbmouse.h75
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp221
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h108
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp1430
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h123
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp588
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h105
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp1819
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbscreen.h303
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp78
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp506
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h129
-rw-r--r--src/plugins/gfxdrivers/eglnullws/README48
-rw-r--r--src/plugins/gfxdrivers/eglnullws/eglnullws.pro18
-rw-r--r--src/plugins/gfxdrivers/eglnullws/eglnullwsscreen.cpp181
-rw-r--r--src/plugins/gfxdrivers/eglnullws/eglnullwsscreen.h69
-rw-r--r--src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.cpp66
-rw-r--r--src/plugins/gfxdrivers/eglnullws/eglnullwsscreenplugin.h47
-rw-r--r--src/plugins/gfxdrivers/eglnullws/eglnullwswindowsurface.cpp84
-rw-r--r--src/plugins/gfxdrivers/eglnullws/eglnullwswindowsurface.h63
-rw-r--r--src/plugins/gfxdrivers/gfxdrivers.pro10
-rw-r--r--src/plugins/gfxdrivers/linuxfb/linuxfb.pro14
-rw-r--r--src/plugins/gfxdrivers/linuxfb/main.cpp79
-rw-r--r--src/plugins/gfxdrivers/powervr/QWSWSEGL/QWSWSEGL.pro26
-rw-r--r--src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c830
-rw-r--r--src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h169
-rw-r--r--src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h132
-rw-r--r--src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c402
-rw-r--r--src/plugins/gfxdrivers/powervr/README66
-rw-r--r--src/plugins/gfxdrivers/powervr/powervr.pri2
-rw-r--r--src/plugins/gfxdrivers/powervr/powervr.pro3
-rw-r--r--src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp351
-rw-r--r--src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h99
-rw-r--r--src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro27
-rw-r--r--src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp74
-rw-r--r--src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp273
-rw-r--r--src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h85
-rw-r--r--src/plugins/gfxdrivers/qvfb/main.cpp82
-rw-r--r--src/plugins/gfxdrivers/qvfb/qvfb.pro19
-rw-r--r--src/plugins/gfxdrivers/transformed/main.cpp84
-rw-r--r--src/plugins/gfxdrivers/transformed/transformed.pro13
-rw-r--r--src/plugins/gfxdrivers/vnc/main.cpp86
-rw-r--r--src/plugins/gfxdrivers/vnc/qscreenvnc_p.h524
-rw-r--r--src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp2338
-rw-r--r--src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h88
-rw-r--r--src/plugins/gfxdrivers/vnc/vnc.pro16
-rw-r--r--src/plugins/graphicssystems/graphicssystems.pro15
-rw-r--r--src/plugins/graphicssystems/meego/dithering.cpp266
-rw-r--r--src/plugins/graphicssystems/meego/meego.pro13
-rw-r--r--src/plugins/graphicssystems/meego/qmeegoextensions.cpp213
-rw-r--r--src/plugins/graphicssystems/meego/qmeegoextensions.h125
-rw-r--r--src/plugins/graphicssystems/meego/qmeegographicssystem.cpp534
-rw-r--r--src/plugins/graphicssystems/meego/qmeegographicssystem.h127
-rw-r--r--src/plugins/graphicssystems/meego/qmeegographicssystemplugin.cpp58
-rw-r--r--src/plugins/graphicssystems/meego/qmeegographicssystemplugin.h54
-rw-r--r--src/plugins/graphicssystems/meego/qmeegolivepixmapdata.cpp323
-rw-r--r--src/plugins/graphicssystems/meego/qmeegolivepixmapdata.h78
-rw-r--r--src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp224
-rw-r--r--src/plugins/graphicssystems/meego/qmeegopixmapdata.h74
-rw-r--r--src/plugins/graphicssystems/meego/qmeegorasterpixmapdata.cpp60
-rw-r--r--src/plugins/graphicssystems/meego/qmeegorasterpixmapdata.h55
-rw-r--r--src/plugins/graphicssystems/opengl/main.cpp95
-rw-r--r--src/plugins/graphicssystems/opengl/opengl.pro13
-rw-r--r--src/plugins/graphicssystems/openvg/main.cpp71
-rw-r--r--src/plugins/graphicssystems/openvg/openvg.pro14
-rw-r--r--src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp88
-rw-r--r--src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h73
-rw-r--r--src/plugins/graphicssystems/shivavg/README8
-rw-r--r--src/plugins/graphicssystems/shivavg/main.cpp71
-rw-r--r--src/plugins/graphicssystems/shivavg/shivavg.pro12
-rw-r--r--src/plugins/graphicssystems/shivavg/shivavggraphicssystem.cpp62
-rw-r--r--src/plugins/graphicssystems/shivavg/shivavggraphicssystem.h60
-rw-r--r--src/plugins/graphicssystems/shivavg/shivavgwindowsurface.cpp358
-rw-r--r--src/plugins/graphicssystems/shivavg/shivavgwindowsurface.h76
-rw-r--r--src/plugins/graphicssystems/trace/main.cpp69
-rw-r--r--src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp153
-rw-r--r--src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h71
-rw-r--r--src/plugins/graphicssystems/trace/trace.pro13
-rw-r--r--src/plugins/inputmethods/imsw-multi/imsw-multi.pro1
-rw-r--r--src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h4
-rw-r--r--src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h2
-rw-r--r--src/plugins/kbddrivers/kbddrivers.pro2
-rw-r--r--src/plugins/kbddrivers/linuxinput/linuxinput.pro14
-rw-r--r--src/plugins/kbddrivers/linuxinput/main.cpp77
-rw-r--r--src/plugins/mousedrivers/linuxtp/linuxtp.pro14
-rw-r--r--src/plugins/mousedrivers/linuxtp/main.cpp76
-rw-r--r--src/plugins/mousedrivers/mousedrivers.pro5
-rw-r--r--src/plugins/mousedrivers/pc/main.cpp81
-rw-r--r--src/plugins/mousedrivers/pc/pc.pro14
-rw-r--r--src/plugins/mousedrivers/tslib/main.cpp77
-rw-r--r--src/plugins/mousedrivers/tslib/tslib.pro16
-rw-r--r--src/plugins/platforms/cocoa/cocoa.pro16
-rw-r--r--src/plugins/platforms/cocoa/qcocoaeventloopintegration.mm3
-rw-r--r--src/plugins/platforms/cocoa/qcocoaglcontext.h28
-rw-r--r--src/plugins/platforms/cocoa/qcocoaglcontext.mm83
-rw-r--r--src/plugins/platforms/cocoa/qcocoaintegration.h6
-rw-r--r--src/plugins/platforms/cocoa/qcocoaintegration.mm23
-rw-r--r--src/plugins/platforms/cocoa/qcocoanativeinterface.h55
-rw-r--r--src/plugins/platforms/cocoa/qcocoanativeinterface.mm59
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.h15
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.mm40
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindowsurface.h6
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindowsurface.mm17
-rw-r--r--src/plugins/platforms/cocoa/qnsview.h11
-rw-r--r--src/plugins/platforms/cocoa/qnsview.mm131
-rw-r--r--src/plugins/platforms/cocoa/qnswindowdelegate.h20
-rw-r--r--src/plugins/platforms/cocoa/qnswindowdelegate.mm2
-rw-r--r--src/plugins/platforms/eglconvenience/qeglconvenience.cpp46
-rw-r--r--src/plugins/platforms/eglconvenience/qeglconvenience.h8
-rw-r--r--src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp6
-rw-r--r--src/plugins/platforms/eglconvenience/qeglplatformcontext.h4
-rw-r--r--src/plugins/platforms/eglfs/qeglfswindow.h2
-rw-r--r--src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp2
-rw-r--r--src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp1
-rw-r--r--src/plugins/platforms/glxconvenience/qglxconvenience.cpp98
-rw-r--r--src/plugins/platforms/glxconvenience/qglxconvenience.h12
-rw-r--r--src/plugins/platforms/minimal/minimal.pro1
-rw-r--r--src/plugins/platforms/minimal/qminimalintegration.cpp10
-rw-r--r--src/plugins/platforms/minimal/qminimalintegration.h4
-rw-r--r--src/plugins/platforms/minimal/qminimalwindowsurface.cpp10
-rw-r--r--src/plugins/platforms/minimal/qminimalwindowsurface.h5
-rw-r--r--src/plugins/platforms/openkode/qopenkodewindow.cpp2
-rw-r--r--src/plugins/platforms/platforms.pro4
-rw-r--r--src/plugins/platforms/vnc/qvncserver.cpp2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/qwaylandglintegration.h4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp18
-rw-r--r--src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.h4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp6
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.h1
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglintegration.cpp2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglintegration.h3
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglwindow.cpp2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglwindow.h2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxintegration.cpp4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxintegration.h4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.cpp2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxwindow.h2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.h4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.cpp2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglwindow.h2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp3
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglintegration.cpp4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglintegration.h4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.h2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp6
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxintegration.cpp4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxintegration.h4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.cpp2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxwindow.h2
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp1
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h4
-rw-r--r--src/plugins/platforms/wayland/qwaylandclipboard.cpp2
-rw-r--r--src/plugins/platforms/wayland/qwaylandcursor.cpp4
-rw-r--r--src/plugins/platforms/wayland/qwaylandcursor.h2
-rw-r--r--src/plugins/platforms/wayland/qwaylanddisplay.cpp5
-rw-r--r--src/plugins/platforms/wayland/qwaylandinputdevice.cpp12
-rw-r--r--src/plugins/platforms/wayland/qwaylandintegration.cpp20
-rw-r--r--src/plugins/platforms/wayland/qwaylandintegration.h4
-rw-r--r--src/plugins/platforms/wayland/qwaylandnativeinterface.cpp16
-rw-r--r--src/plugins/platforms/wayland/qwaylandnativeinterface.h6
-rw-r--r--src/plugins/platforms/wayland/qwaylandscreen.cpp4
-rw-r--r--src/plugins/platforms/wayland/qwaylandscreen.h2
-rw-r--r--src/plugins/platforms/wayland/qwaylandshmsurface.cpp17
-rw-r--r--src/plugins/platforms/wayland/qwaylandshmsurface.h6
-rw-r--r--src/plugins/platforms/wayland/qwaylandshmwindow.cpp4
-rw-r--r--src/plugins/platforms/wayland/qwaylandshmwindow.h2
-rw-r--r--src/plugins/platforms/wayland/qwaylandwindow.cpp9
-rw-r--r--src/plugins/platforms/wayland/qwaylandwindow.h2
-rw-r--r--src/plugins/platforms/wayland/wayland.pro5
-rw-r--r--src/plugins/platforms/xcb/qdri2context.cpp4
-rw-r--r--src/plugins/platforms/xcb/qglxintegration.cpp15
-rw-r--r--src/plugins/platforms/xcb/qglxintegration.h8
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.cpp30
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.h10
-rw-r--r--src/plugins/platforms/xcb/qxcbintegration.cpp9
-rw-r--r--src/plugins/platforms/xcb/qxcbintegration.h4
-rw-r--r--src/plugins/platforms/xcb/qxcbkeyboard.cpp12
-rw-r--r--src/plugins/platforms/xcb/qxcbkeyboard.h8
-rw-r--r--src/plugins/platforms/xcb/qxcbnativeinterface.cpp65
-rw-r--r--src/plugins/platforms/xcb/qxcbnativeinterface.h16
-rw-r--r--src/plugins/platforms/xcb/qxcbscreen.cpp20
-rw-r--r--src/plugins/platforms/xcb/qxcbscreen.h3
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp606
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.h26
-rw-r--r--src/plugins/platforms/xcb/qxcbwindowsurface.cpp21
-rw-r--r--src/plugins/platforms/xcb/qxcbwindowsurface.h4
-rw-r--r--src/plugins/platforms/xcb/xcb.pro2
-rw-r--r--src/plugins/plugins.pro2
-rw-r--r--src/sql/models/qsqlrelationaldelegate.h6
-rw-r--r--src/src.pro24
-rw-r--r--src/testlib/qbenchmark.cpp2
-rw-r--r--src/testlib/qtest_gui.h2
-rw-r--r--src/testlib/qtestaccessible.h4
-rw-r--r--src/testlib/qtestkeyboard.h4
-rw-r--r--src/testlib/qtestmouse.h4
-rw-r--r--src/testlib/qtesttouch.h2
-rw-r--r--src/testlib/testlib.pro2
-rw-r--r--src/tools/bootstrap/bootstrap.pro1
-rw-r--r--src/tools/tools.pro4
-rw-r--r--src/tools/uic/qclass_lib_map.h686
-rw-r--r--src/uitools/quiloader.cpp24
-rw-r--r--src/widgets/QtGui.dynlist (renamed from src/gui/QtGui.dynlist)0
-rw-r--r--src/widgets/accessible/accessible.pri25
-rw-r--r--src/widgets/accessible/qaccessible.cpp (renamed from src/gui/accessible/qaccessible.cpp)0
-rw-r--r--src/widgets/accessible/qaccessible.h461
-rw-r--r--src/widgets/accessible/qaccessible2.cpp (renamed from src/gui/accessible/qaccessible2.cpp)0
-rw-r--r--src/widgets/accessible/qaccessible2.h246
-rw-r--r--src/widgets/accessible/qaccessible_mac.mm (renamed from src/gui/accessible/qaccessible_mac.mm)0
-rw-r--r--src/widgets/accessible/qaccessible_mac_carbon.cpp (renamed from src/gui/accessible/qaccessible_mac_carbon.cpp)0
-rw-r--r--src/widgets/accessible/qaccessible_mac_cocoa.mm (renamed from src/gui/accessible/qaccessible_mac_cocoa.mm)0
-rw-r--r--src/widgets/accessible/qaccessible_mac_p.h (renamed from src/gui/accessible/qaccessible_mac_p.h)0
-rw-r--r--src/widgets/accessible/qaccessible_unix.cpp (renamed from src/gui/accessible/qaccessible_unix.cpp)0
-rw-r--r--src/widgets/accessible/qaccessible_win.cpp (renamed from src/gui/accessible/qaccessible_win.cpp)0
-rw-r--r--src/widgets/accessible/qaccessiblebridge.cpp (renamed from src/gui/accessible/qaccessiblebridge.cpp)0
-rw-r--r--src/widgets/accessible/qaccessiblebridge.h (renamed from src/gui/accessible/qaccessiblebridge.h)0
-rw-r--r--src/widgets/accessible/qaccessibleobject.cpp (renamed from src/gui/accessible/qaccessibleobject.cpp)0
-rw-r--r--src/widgets/accessible/qaccessibleobject.h140
-rw-r--r--src/widgets/accessible/qaccessibleplugin.cpp (renamed from src/gui/accessible/qaccessibleplugin.cpp)0
-rw-r--r--src/widgets/accessible/qaccessibleplugin.h87
-rw-r--r--src/widgets/accessible/qaccessiblewidget.cpp1031
-rw-r--r--src/widgets/accessible/qaccessiblewidget.h141
-rw-r--r--src/widgets/animation/animation.pri (renamed from src/gui/animation/animation.pri)0
-rw-r--r--src/widgets/animation/qguivariantanimation.cpp (renamed from src/gui/animation/qguivariantanimation.cpp)0
-rw-r--r--src/widgets/dialogs/dialogs.pri106
-rw-r--r--src/widgets/dialogs/images/fit-page-24.png (renamed from src/gui/dialogs/images/fit-page-24.png)bin985 -> 985 bytes
-rw-r--r--src/widgets/dialogs/images/fit-page-32.png (renamed from src/gui/dialogs/images/fit-page-32.png)bin1330 -> 1330 bytes
-rw-r--r--src/widgets/dialogs/images/fit-width-24.png (renamed from src/gui/dialogs/images/fit-width-24.png)bin706 -> 706 bytes
-rw-r--r--src/widgets/dialogs/images/fit-width-32.png (renamed from src/gui/dialogs/images/fit-width-32.png)bin1004 -> 1004 bytes
-rw-r--r--src/widgets/dialogs/images/go-first-24.png (renamed from src/gui/dialogs/images/go-first-24.png)bin796 -> 796 bytes
-rw-r--r--src/widgets/dialogs/images/go-first-32.png (renamed from src/gui/dialogs/images/go-first-32.png)bin985 -> 985 bytes
-rw-r--r--src/widgets/dialogs/images/go-last-24.png (renamed from src/gui/dialogs/images/go-last-24.png)bin792 -> 792 bytes
-rw-r--r--src/widgets/dialogs/images/go-last-32.png (renamed from src/gui/dialogs/images/go-last-32.png)bin984 -> 984 bytes
-rw-r--r--src/widgets/dialogs/images/go-next-24.png (renamed from src/gui/dialogs/images/go-next-24.png)bin782 -> 782 bytes
-rw-r--r--src/widgets/dialogs/images/go-next-32.png (renamed from src/gui/dialogs/images/go-next-32.png)bin948 -> 948 bytes
-rw-r--r--src/widgets/dialogs/images/go-previous-24.png (renamed from src/gui/dialogs/images/go-previous-24.png)bin797 -> 797 bytes
-rw-r--r--src/widgets/dialogs/images/go-previous-32.png (renamed from src/gui/dialogs/images/go-previous-32.png)bin945 -> 945 bytes
-rw-r--r--src/widgets/dialogs/images/layout-landscape-24.png (renamed from src/gui/dialogs/images/layout-landscape-24.png)bin820 -> 820 bytes
-rw-r--r--src/widgets/dialogs/images/layout-landscape-32.png (renamed from src/gui/dialogs/images/layout-landscape-32.png)bin1353 -> 1353 bytes
-rw-r--r--src/widgets/dialogs/images/layout-portrait-24.png (renamed from src/gui/dialogs/images/layout-portrait-24.png)bin817 -> 817 bytes
-rw-r--r--src/widgets/dialogs/images/layout-portrait-32.png (renamed from src/gui/dialogs/images/layout-portrait-32.png)bin1330 -> 1330 bytes
-rw-r--r--src/widgets/dialogs/images/page-setup-24.png (renamed from src/gui/dialogs/images/page-setup-24.png)bin620 -> 620 bytes
-rw-r--r--src/widgets/dialogs/images/page-setup-32.png (renamed from src/gui/dialogs/images/page-setup-32.png)bin1154 -> 1154 bytes
-rw-r--r--src/widgets/dialogs/images/print-24.png (renamed from src/gui/dialogs/images/print-24.png)bin914 -> 914 bytes
-rw-r--r--src/widgets/dialogs/images/print-32.png (renamed from src/gui/dialogs/images/print-32.png)bin1202 -> 1202 bytes
-rw-r--r--src/widgets/dialogs/images/qtlogo-64.png (renamed from src/gui/dialogs/images/qtlogo-64.png)bin2991 -> 2991 bytes
-rw-r--r--src/widgets/dialogs/images/status-color.png (renamed from src/gui/dialogs/images/status-color.png)bin1475 -> 1475 bytes
-rw-r--r--src/widgets/dialogs/images/status-gray-scale.png (renamed from src/gui/dialogs/images/status-gray-scale.png)bin1254 -> 1254 bytes
-rw-r--r--src/widgets/dialogs/images/view-page-multi-24.png (renamed from src/gui/dialogs/images/view-page-multi-24.png)bin390 -> 390 bytes
-rw-r--r--src/widgets/dialogs/images/view-page-multi-32.png (renamed from src/gui/dialogs/images/view-page-multi-32.png)bin556 -> 556 bytes
-rw-r--r--src/widgets/dialogs/images/view-page-one-24.png (renamed from src/gui/dialogs/images/view-page-one-24.png)bin662 -> 662 bytes
-rw-r--r--src/widgets/dialogs/images/view-page-one-32.png (renamed from src/gui/dialogs/images/view-page-one-32.png)bin810 -> 810 bytes
-rw-r--r--src/widgets/dialogs/images/view-page-sided-24.png (renamed from src/gui/dialogs/images/view-page-sided-24.png)bin700 -> 700 bytes
-rw-r--r--src/widgets/dialogs/images/view-page-sided-32.png (renamed from src/gui/dialogs/images/view-page-sided-32.png)bin908 -> 908 bytes
-rw-r--r--src/widgets/dialogs/images/zoom-in-24.png (renamed from src/gui/dialogs/images/zoom-in-24.png)bin1302 -> 1302 bytes
-rw-r--r--src/widgets/dialogs/images/zoom-in-32.png (renamed from src/gui/dialogs/images/zoom-in-32.png)bin1873 -> 1873 bytes
-rw-r--r--src/widgets/dialogs/images/zoom-out-24.png (renamed from src/gui/dialogs/images/zoom-out-24.png)bin1247 -> 1247 bytes
-rw-r--r--src/widgets/dialogs/images/zoom-out-32.png (renamed from src/gui/dialogs/images/zoom-out-32.png)bin1749 -> 1749 bytes
-rw-r--r--src/widgets/dialogs/qabstractpagesetupdialog.cpp (renamed from src/gui/dialogs/qabstractpagesetupdialog.cpp)0
-rw-r--r--src/widgets/dialogs/qabstractpagesetupdialog.h82
-rw-r--r--src/widgets/dialogs/qabstractpagesetupdialog_p.h (renamed from src/gui/dialogs/qabstractpagesetupdialog_p.h)0
-rw-r--r--src/widgets/dialogs/qabstractprintdialog.cpp499
-rw-r--r--src/widgets/dialogs/qabstractprintdialog.h130
-rw-r--r--src/widgets/dialogs/qabstractprintdialog_p.h99
-rw-r--r--src/widgets/dialogs/qcolordialog.cpp2115
-rw-r--r--src/widgets/dialogs/qcolordialog.h150
-rw-r--r--src/widgets/dialogs/qcolordialog_mac.mm (renamed from src/gui/dialogs/qcolordialog_mac.mm)0
-rw-r--r--src/widgets/dialogs/qcolordialog_p.h (renamed from src/gui/dialogs/qcolordialog_p.h)0
-rw-r--r--src/widgets/dialogs/qcolordialog_symbian.cpp (renamed from src/gui/dialogs/qcolordialog_symbian.cpp)0
-rw-r--r--src/widgets/dialogs/qdialog.cpp (renamed from src/gui/dialogs/qdialog.cpp)0
-rw-r--r--src/widgets/dialogs/qdialog.h140
-rw-r--r--src/widgets/dialogs/qdialog_p.h113
-rw-r--r--src/widgets/dialogs/qdialogsbinarycompat_win.cpp (renamed from src/gui/dialogs/qdialogsbinarycompat_win.cpp)0
-rw-r--r--src/widgets/dialogs/qerrormessage.cpp (renamed from src/gui/dialogs/qerrormessage.cpp)0
-rw-r--r--src/widgets/dialogs/qerrormessage.h88
-rw-r--r--src/widgets/dialogs/qfiledialog.cpp (renamed from src/gui/dialogs/qfiledialog.cpp)0
-rw-r--r--src/widgets/dialogs/qfiledialog.h331
-rw-r--r--src/widgets/dialogs/qfiledialog.ui (renamed from src/gui/dialogs/qfiledialog.ui)0
-rw-r--r--src/widgets/dialogs/qfiledialog_embedded.ui (renamed from src/gui/dialogs/qfiledialog_embedded.ui)0
-rw-r--r--src/widgets/dialogs/qfiledialog_mac.mm (renamed from src/gui/dialogs/qfiledialog_mac.mm)0
-rw-r--r--src/widgets/dialogs/qfiledialog_p.h (renamed from src/gui/dialogs/qfiledialog_p.h)0
-rw-r--r--src/widgets/dialogs/qfiledialog_symbian.cpp (renamed from src/gui/dialogs/qfiledialog_symbian.cpp)0
-rw-r--r--src/widgets/dialogs/qfiledialog_win.cpp (renamed from src/gui/dialogs/qfiledialog_win.cpp)0
-rw-r--r--src/widgets/dialogs/qfiledialog_win_p.h (renamed from src/gui/dialogs/qfiledialog_win_p.h)0
-rw-r--r--src/widgets/dialogs/qfileinfogatherer.cpp (renamed from src/gui/dialogs/qfileinfogatherer.cpp)0
-rw-r--r--src/widgets/dialogs/qfileinfogatherer_p.h (renamed from src/gui/dialogs/qfileinfogatherer_p.h)0
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.cpp (renamed from src/gui/dialogs/qfilesystemmodel.cpp)0
-rw-r--r--src/widgets/dialogs/qfilesystemmodel.h180
-rw-r--r--src/widgets/dialogs/qfilesystemmodel_p.h (renamed from src/gui/dialogs/qfilesystemmodel_p.h)0
-rw-r--r--src/widgets/dialogs/qfontdialog.cpp1077
-rw-r--r--src/widgets/dialogs/qfontdialog.h147
-rw-r--r--src/widgets/dialogs/qfontdialog_mac.mm (renamed from src/gui/dialogs/qfontdialog_mac.mm)0
-rw-r--r--src/widgets/dialogs/qfontdialog_p.h (renamed from src/gui/dialogs/qfontdialog_p.h)0
-rw-r--r--src/widgets/dialogs/qfscompleter_p.h82
-rw-r--r--src/widgets/dialogs/qinputdialog.cpp (renamed from src/gui/dialogs/qinputdialog.cpp)0
-rw-r--r--src/widgets/dialogs/qinputdialog.h256
-rw-r--r--src/widgets/dialogs/qmessagebox.cpp2751
-rw-r--r--src/widgets/dialogs/qmessagebox.h365
-rw-r--r--src/widgets/dialogs/qmessagebox.qrc (renamed from src/gui/dialogs/qmessagebox.qrc)0
-rw-r--r--src/widgets/dialogs/qnspanelproxy_mac.mm (renamed from src/gui/dialogs/qnspanelproxy_mac.mm)0
-rw-r--r--src/widgets/dialogs/qpagesetupdialog.cpp (renamed from src/gui/dialogs/qpagesetupdialog.cpp)0
-rw-r--r--src/widgets/dialogs/qpagesetupdialog.h112
-rw-r--r--src/widgets/dialogs/qpagesetupdialog_mac.mm (renamed from src/gui/dialogs/qpagesetupdialog_mac.mm)0
-rw-r--r--src/widgets/dialogs/qpagesetupdialog_unix.cpp (renamed from src/gui/dialogs/qpagesetupdialog_unix.cpp)0
-rw-r--r--src/widgets/dialogs/qpagesetupdialog_unix_p.h (renamed from src/gui/dialogs/qpagesetupdialog_unix_p.h)0
-rw-r--r--src/widgets/dialogs/qpagesetupdialog_win.cpp (renamed from src/gui/dialogs/qpagesetupdialog_win.cpp)0
-rw-r--r--src/widgets/dialogs/qpagesetupwidget.ui (renamed from src/gui/dialogs/qpagesetupwidget.ui)0
-rw-r--r--src/widgets/dialogs/qprintdialog.h174
-rw-r--r--src/widgets/dialogs/qprintdialog.qdoc (renamed from src/gui/dialogs/qprintdialog.qdoc)0
-rw-r--r--src/widgets/dialogs/qprintdialog.qrc (renamed from src/gui/dialogs/qprintdialog.qrc)0
-rw-r--r--src/widgets/dialogs/qprintdialog_mac.mm (renamed from src/gui/dialogs/qprintdialog_mac.mm)0
-rw-r--r--src/widgets/dialogs/qprintdialog_unix.cpp1286
-rw-r--r--src/widgets/dialogs/qprintdialog_win.cpp (renamed from src/gui/dialogs/qprintdialog_win.cpp)0
-rw-r--r--src/widgets/dialogs/qprintpreviewdialog.cpp803
-rw-r--r--src/widgets/dialogs/qprintpreviewdialog.h107
-rw-r--r--src/widgets/dialogs/qprintpropertieswidget.ui (renamed from src/gui/dialogs/qprintpropertieswidget.ui)0
-rw-r--r--src/widgets/dialogs/qprintsettingsoutput.ui (renamed from src/gui/dialogs/qprintsettingsoutput.ui)0
-rw-r--r--src/widgets/dialogs/qprintwidget.ui (renamed from src/gui/dialogs/qprintwidget.ui)0
-rw-r--r--src/widgets/dialogs/qprogressdialog.cpp907
-rw-r--r--src/widgets/dialogs/qprogressdialog.h145
-rw-r--r--src/widgets/dialogs/qsidebar.cpp (renamed from src/gui/dialogs/qsidebar.cpp)0
-rw-r--r--src/widgets/dialogs/qsidebar_p.h (renamed from src/gui/dialogs/qsidebar_p.h)0
-rw-r--r--src/widgets/dialogs/qwizard.cpp (renamed from src/gui/dialogs/qwizard.cpp)0
-rw-r--r--src/widgets/dialogs/qwizard.h268
-rw-r--r--src/widgets/dialogs/qwizard_win.cpp759
-rw-r--r--src/widgets/dialogs/qwizard_win_p.h (renamed from src/gui/dialogs/qwizard_win_p.h)0
-rw-r--r--src/widgets/effects/effects.pri6
-rw-r--r--src/widgets/effects/qgraphicseffect.cpp1235
-rw-r--r--src/widgets/effects/qgraphicseffect.h (renamed from src/gui/effects/qgraphicseffect.h)0
-rw-r--r--src/widgets/effects/qgraphicseffect_p.h (renamed from src/gui/effects/qgraphicseffect_p.h)0
-rw-r--r--src/widgets/effects/qpixmapfilter.cpp1381
-rw-r--r--src/widgets/effects/qpixmapfilter_p.h196
-rw-r--r--src/widgets/graphicsview/graphicsview.pri (renamed from src/gui/graphicsview/graphicsview.pri)0
-rw-r--r--src/widgets/graphicsview/qgraph_p.h (renamed from src/gui/graphicsview/qgraph_p.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicsanchorlayout.cpp (renamed from src/gui/graphicsview/qgraphicsanchorlayout.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicsanchorlayout.h128
-rw-r--r--src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp3015
-rw-r--r--src/widgets/graphicsview/qgraphicsanchorlayout_p.h (renamed from src/gui/graphicsview/qgraphicsanchorlayout_p.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicsgridlayout.cpp (renamed from src/gui/graphicsview/qgraphicsgridlayout.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicsgridlayout.h144
-rw-r--r--src/widgets/graphicsview/qgraphicsitem.cpp11601
-rw-r--r--src/widgets/graphicsview/qgraphicsitem.h (renamed from src/gui/graphicsview/qgraphicsitem.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicsitem_p.h (renamed from src/gui/graphicsview/qgraphicsitem_p.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicsitemanimation.cpp (renamed from src/gui/graphicsview/qgraphicsitemanimation.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicsitemanimation.h (renamed from src/gui/graphicsview/qgraphicsitemanimation.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicslayout.cpp (renamed from src/gui/graphicsview/qgraphicslayout.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicslayout.h100
-rw-r--r--src/widgets/graphicsview/qgraphicslayout_p.cpp (renamed from src/gui/graphicsview/qgraphicslayout_p.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicslayout_p.h154
-rw-r--r--src/widgets/graphicsview/qgraphicslayoutitem.cpp (renamed from src/gui/graphicsview/qgraphicslayoutitem.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicslayoutitem.h155
-rw-r--r--src/widgets/graphicsview/qgraphicslayoutitem_p.h103
-rw-r--r--src/widgets/graphicsview/qgraphicslinearlayout.cpp (renamed from src/gui/graphicsview/qgraphicslinearlayout.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicslinearlayout.h119
-rw-r--r--src/widgets/graphicsview/qgraphicsproxywidget.cpp1570
-rw-r--r--src/widgets/graphicsview/qgraphicsproxywidget.h147
-rw-r--r--src/widgets/graphicsview/qgraphicsproxywidget_p.h (renamed from src/gui/graphicsview/qgraphicsproxywidget_p.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicsscene.cpp6502
-rw-r--r--src/widgets/graphicsview/qgraphicsscene.h (renamed from src/gui/graphicsview/qgraphicsscene.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicsscene_bsp.cpp (renamed from src/gui/graphicsview/qgraphicsscene_bsp.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicsscene_bsp_p.h (renamed from src/gui/graphicsview/qgraphicsscene_bsp_p.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicsscene_p.h359
-rw-r--r--src/widgets/graphicsview/qgraphicsscenebsptreeindex.cpp (renamed from src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h (renamed from src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicssceneevent.cpp1674
-rw-r--r--src/widgets/graphicsview/qgraphicssceneevent.h (renamed from src/gui/graphicsview/qgraphicssceneevent.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicssceneindex.cpp (renamed from src/gui/graphicsview/qgraphicssceneindex.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicssceneindex_p.h (renamed from src/gui/graphicsview/qgraphicssceneindex_p.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicsscenelinearindex.cpp (renamed from src/gui/graphicsview/qgraphicsscenelinearindex.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicsscenelinearindex_p.h109
-rw-r--r--src/widgets/graphicsview/qgraphicstransform.cpp (renamed from src/gui/graphicsview/qgraphicstransform.cpp)0
-rw-r--r--src/widgets/graphicsview/qgraphicstransform.h (renamed from src/gui/graphicsview/qgraphicstransform.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicstransform_p.h (renamed from src/gui/graphicsview/qgraphicstransform_p.h)0
-rw-r--r--src/widgets/graphicsview/qgraphicsview.cpp3880
-rw-r--r--src/widgets/graphicsview/qgraphicsview.h316
-rw-r--r--src/widgets/graphicsview/qgraphicsview_p.h233
-rw-r--r--src/widgets/graphicsview/qgraphicswidget.cpp2425
-rw-r--r--src/widgets/graphicsview/qgraphicswidget.h257
-rw-r--r--src/widgets/graphicsview/qgraphicswidget_p.cpp906
-rw-r--r--src/widgets/graphicsview/qgraphicswidget_p.h226
-rw-r--r--src/widgets/graphicsview/qgridlayoutengine.cpp (renamed from src/gui/graphicsview/qgridlayoutengine.cpp)0
-rw-r--r--src/widgets/graphicsview/qgridlayoutengine_p.h (renamed from src/gui/graphicsview/qgridlayoutengine_p.h)0
-rw-r--r--src/widgets/graphicsview/qsimplex_p.cpp (renamed from src/gui/graphicsview/qsimplex_p.cpp)0
-rw-r--r--src/widgets/graphicsview/qsimplex_p.h (renamed from src/gui/graphicsview/qsimplex_p.h)0
-rw-r--r--src/widgets/inputmethod/inputmethod.pri27
-rw-r--r--src/widgets/inputmethod/qcoefepinputcontext_p.h (renamed from src/gui/inputmethod/qcoefepinputcontext_p.h)0
-rw-r--r--src/widgets/inputmethod/qcoefepinputcontext_s60.cpp (renamed from src/gui/inputmethod/qcoefepinputcontext_s60.cpp)0
-rw-r--r--src/widgets/inputmethod/qinputcontext.cpp (renamed from src/gui/inputmethod/qinputcontext.cpp)0
-rw-r--r--src/widgets/inputmethod/qinputcontext.h139
-rw-r--r--src/widgets/inputmethod/qinputcontext_p.h (renamed from src/gui/inputmethod/qinputcontext_p.h)0
-rw-r--r--src/widgets/inputmethod/qinputcontextfactory.cpp (renamed from src/gui/inputmethod/qinputcontextfactory.cpp)0
-rw-r--r--src/widgets/inputmethod/qinputcontextfactory.h (renamed from src/gui/inputmethod/qinputcontextfactory.h)0
-rw-r--r--src/widgets/inputmethod/qinputcontextplugin.cpp (renamed from src/gui/inputmethod/qinputcontextplugin.cpp)0
-rw-r--r--src/widgets/inputmethod/qinputcontextplugin.h (renamed from src/gui/inputmethod/qinputcontextplugin.h)0
-rw-r--r--src/widgets/inputmethod/qmacinputcontext_mac.cpp (renamed from src/gui/inputmethod/qmacinputcontext_mac.cpp)0
-rw-r--r--src/widgets/inputmethod/qmacinputcontext_p.h97
-rw-r--r--src/widgets/inputmethod/qwininputcontext_p.h111
-rw-r--r--src/widgets/inputmethod/qwininputcontext_win.cpp (renamed from src/gui/inputmethod/qwininputcontext_win.cpp)0
-rw-r--r--src/widgets/inputmethod/qximinputcontext_p.h142
-rw-r--r--src/widgets/inputmethod/qximinputcontext_x11.cpp (renamed from src/gui/inputmethod/qximinputcontext_x11.cpp)0
-rw-r--r--src/widgets/itemviews/itemviews.pri72
-rw-r--r--src/widgets/itemviews/qabstractitemdelegate.cpp (renamed from src/gui/itemviews/qabstractitemdelegate.cpp)0
-rw-r--r--src/widgets/itemviews/qabstractitemdelegate.h134
-rw-r--r--src/widgets/itemviews/qabstractitemview.cpp (renamed from src/gui/itemviews/qabstractitemview.cpp)0
-rw-r--r--src/widgets/itemviews/qabstractitemview.h380
-rw-r--r--src/widgets/itemviews/qabstractitemview_p.h457
-rw-r--r--src/widgets/itemviews/qabstractproxymodel.cpp (renamed from src/gui/itemviews/qabstractproxymodel.cpp)0
-rw-r--r--src/widgets/itemviews/qabstractproxymodel.h (renamed from src/gui/itemviews/qabstractproxymodel.h)0
-rw-r--r--src/widgets/itemviews/qabstractproxymodel_p.h (renamed from src/gui/itemviews/qabstractproxymodel_p.h)0
-rw-r--r--src/widgets/itemviews/qbsptree.cpp (renamed from src/gui/itemviews/qbsptree.cpp)0
-rw-r--r--src/widgets/itemviews/qbsptree_p.h (renamed from src/gui/itemviews/qbsptree_p.h)0
-rw-r--r--src/widgets/itemviews/qcolumnview.cpp (renamed from src/gui/itemviews/qcolumnview.cpp)0
-rw-r--r--src/widgets/itemviews/qcolumnview.h123
-rw-r--r--src/widgets/itemviews/qcolumnview_p.h189
-rw-r--r--src/widgets/itemviews/qcolumnviewgrip.cpp (renamed from src/gui/itemviews/qcolumnviewgrip.cpp)0
-rw-r--r--src/widgets/itemviews/qcolumnviewgrip_p.h (renamed from src/gui/itemviews/qcolumnviewgrip_p.h)0
-rw-r--r--src/widgets/itemviews/qdatawidgetmapper.cpp (renamed from src/gui/itemviews/qdatawidgetmapper.cpp)0
-rw-r--r--src/widgets/itemviews/qdatawidgetmapper.h (renamed from src/gui/itemviews/qdatawidgetmapper.h)0
-rw-r--r--src/widgets/itemviews/qdirmodel.cpp (renamed from src/gui/itemviews/qdirmodel.cpp)0
-rw-r--r--src/widgets/itemviews/qdirmodel.h160
-rw-r--r--src/widgets/itemviews/qfileiconprovider.cpp (renamed from src/gui/itemviews/qfileiconprovider.cpp)0
-rw-r--r--src/widgets/itemviews/qfileiconprovider.h82
-rw-r--r--src/widgets/itemviews/qheaderview.cpp (renamed from src/gui/itemviews/qheaderview.cpp)0
-rw-r--r--src/widgets/itemviews/qheaderview.h250
-rw-r--r--src/widgets/itemviews/qheaderview_p.h366
-rw-r--r--src/widgets/itemviews/qidentityproxymodel.cpp (renamed from src/gui/itemviews/qidentityproxymodel.cpp)0
-rw-r--r--src/widgets/itemviews/qidentityproxymodel.h120
-rw-r--r--src/widgets/itemviews/qitemdelegate.cpp (renamed from src/gui/itemviews/qitemdelegate.cpp)0
-rw-r--r--src/widgets/itemviews/qitemdelegate.h141
-rw-r--r--src/widgets/itemviews/qitemeditorfactory.cpp (renamed from src/gui/itemviews/qitemeditorfactory.cpp)0
-rw-r--r--src/widgets/itemviews/qitemeditorfactory.h (renamed from src/gui/itemviews/qitemeditorfactory.h)0
-rw-r--r--src/widgets/itemviews/qitemeditorfactory_p.h (renamed from src/gui/itemviews/qitemeditorfactory_p.h)0
-rw-r--r--src/widgets/itemviews/qitemselectionmodel.cpp (renamed from src/gui/itemviews/qitemselectionmodel.cpp)0
-rw-r--r--src/widgets/itemviews/qitemselectionmodel.h (renamed from src/gui/itemviews/qitemselectionmodel.h)0
-rw-r--r--src/widgets/itemviews/qitemselectionmodel_p.h (renamed from src/gui/itemviews/qitemselectionmodel_p.h)0
-rw-r--r--src/widgets/itemviews/qlistview.cpp3213
-rw-r--r--src/widgets/itemviews/qlistview.h203
-rw-r--r--src/widgets/itemviews/qlistview_p.h (renamed from src/gui/itemviews/qlistview_p.h)0
-rw-r--r--src/widgets/itemviews/qlistwidget.cpp (renamed from src/gui/itemviews/qlistwidget.cpp)0
-rw-r--r--src/widgets/itemviews/qlistwidget.h335
-rw-r--r--src/widgets/itemviews/qlistwidget_p.h175
-rw-r--r--src/widgets/itemviews/qproxymodel.cpp (renamed from src/gui/itemviews/qproxymodel.cpp)0
-rw-r--r--src/widgets/itemviews/qproxymodel.h (renamed from src/gui/itemviews/qproxymodel.h)0
-rw-r--r--src/widgets/itemviews/qproxymodel_p.h (renamed from src/gui/itemviews/qproxymodel_p.h)0
-rw-r--r--src/widgets/itemviews/qsortfilterproxymodel.cpp (renamed from src/gui/itemviews/qsortfilterproxymodel.cpp)0
-rw-r--r--src/widgets/itemviews/qsortfilterproxymodel.h201
-rw-r--r--src/widgets/itemviews/qstandarditemmodel.cpp (renamed from src/gui/itemviews/qstandarditemmodel.cpp)0
-rw-r--r--src/widgets/itemviews/qstandarditemmodel.h456
-rw-r--r--src/widgets/itemviews/qstandarditemmodel_p.h (renamed from src/gui/itemviews/qstandarditemmodel_p.h)0
-rw-r--r--src/widgets/itemviews/qstringlistmodel.cpp (renamed from src/gui/itemviews/qstringlistmodel.cpp)0
-rw-r--r--src/widgets/itemviews/qstringlistmodel.h91
-rw-r--r--src/widgets/itemviews/qstyleditemdelegate.cpp (renamed from src/gui/itemviews/qstyleditemdelegate.cpp)0
-rw-r--r--src/widgets/itemviews/qstyleditemdelegate.h116
-rw-r--r--src/widgets/itemviews/qtableview.cpp (renamed from src/gui/itemviews/qtableview.cpp)0
-rw-r--r--src/widgets/itemviews/qtableview.h198
-rw-r--r--src/widgets/itemviews/qtableview_p.h (renamed from src/gui/itemviews/qtableview_p.h)0
-rw-r--r--src/widgets/itemviews/qtablewidget.cpp (renamed from src/gui/itemviews/qtablewidget.cpp)0
-rw-r--r--src/widgets/itemviews/qtablewidget.h377
-rw-r--r--src/widgets/itemviews/qtablewidget_p.h (renamed from src/gui/itemviews/qtablewidget_p.h)0
-rw-r--r--src/widgets/itemviews/qtreeview.cpp (renamed from src/gui/itemviews/qtreeview.cpp)0
-rw-r--r--src/widgets/itemviews/qtreeview.h239
-rw-r--r--src/widgets/itemviews/qtreeview_p.h (renamed from src/gui/itemviews/qtreeview_p.h)0
-rw-r--r--src/widgets/itemviews/qtreewidget.cpp (renamed from src/gui/itemviews/qtreewidget.cpp)0
-rw-r--r--src/widgets/itemviews/qtreewidget.h432
-rw-r--r--src/widgets/itemviews/qtreewidget_p.h248
-rw-r--r--src/widgets/itemviews/qtreewidgetitemiterator.cpp (renamed from src/gui/itemviews/qtreewidgetitemiterator.cpp)0
-rw-r--r--src/widgets/itemviews/qtreewidgetitemiterator.h (renamed from src/gui/itemviews/qtreewidgetitemiterator.h)0
-rw-r--r--src/widgets/itemviews/qtreewidgetitemiterator_p.h (renamed from src/gui/itemviews/qtreewidgetitemiterator_p.h)0
-rw-r--r--src/widgets/itemviews/qwidgetitemdata_p.h (renamed from src/gui/itemviews/qwidgetitemdata_p.h)0
-rw-r--r--src/widgets/kernel/kernel.pri246
-rw-r--r--src/widgets/kernel/mac.pri4
-rw-r--r--src/widgets/kernel/qaction.cpp (renamed from src/gui/kernel/qaction.cpp)0
-rw-r--r--src/widgets/kernel/qaction.h264
-rw-r--r--src/widgets/kernel/qaction_p.h144
-rw-r--r--src/widgets/kernel/qactiongroup.cpp (renamed from src/gui/kernel/qactiongroup.cpp)0
-rw-r--r--src/widgets/kernel/qactiongroup.h112
-rw-r--r--src/widgets/kernel/qapplication.cpp5674
-rw-r--r--src/widgets/kernel/qapplication.h422
-rw-r--r--src/widgets/kernel/qapplication_p.h626
-rw-r--r--src/widgets/kernel/qapplication_qpa.cpp425
-rw-r--r--src/widgets/kernel/qbackingstore.cpp1665
-rw-r--r--src/widgets/kernel/qbackingstore_p.h278
-rw-r--r--src/widgets/kernel/qboxlayout.cpp (renamed from src/gui/kernel/qboxlayout.cpp)0
-rw-r--r--src/widgets/kernel/qboxlayout.h173
-rw-r--r--src/widgets/kernel/qdesktopwidget.cpp (renamed from src/gui/kernel/qdesktopwidget.cpp)0
-rw-r--r--src/widgets/kernel/qdesktopwidget.h110
-rw-r--r--src/widgets/kernel/qdesktopwidget.qdoc (renamed from src/gui/kernel/qdesktopwidget.qdoc)0
-rw-r--r--src/widgets/kernel/qdesktopwidget_qpa.cpp174
-rw-r--r--src/widgets/kernel/qdesktopwidget_qpa_p.h (renamed from src/gui/kernel/qdesktopwidget_qpa_p.h)0
-rw-r--r--src/widgets/kernel/qformlayout.cpp (renamed from src/gui/kernel/qformlayout.cpp)0
-rw-r--r--src/widgets/kernel/qformlayout.h163
-rw-r--r--src/widgets/kernel/qgesture.cpp1118
-rw-r--r--src/widgets/kernel/qgesture.h328
-rw-r--r--src/widgets/kernel/qgesture_p.h245
-rw-r--r--src/widgets/kernel/qgesturemanager.cpp (renamed from src/gui/kernel/qgesturemanager.cpp)0
-rw-r--r--src/widgets/kernel/qgesturemanager_p.h (renamed from src/gui/kernel/qgesturemanager_p.h)0
-rw-r--r--src/widgets/kernel/qgesturerecognizer.cpp (renamed from src/gui/kernel/qgesturerecognizer.cpp)0
-rw-r--r--src/widgets/kernel/qgesturerecognizer.h (renamed from src/gui/kernel/qgesturerecognizer.h)0
-rw-r--r--src/widgets/kernel/qgridlayout.cpp (renamed from src/gui/kernel/qgridlayout.cpp)0
-rw-r--r--src/widgets/kernel/qgridlayout.h176
-rw-r--r--src/widgets/kernel/qguieventdispatcher_glib.cpp (renamed from src/gui/kernel/qguieventdispatcher_glib.cpp)0
-rw-r--r--src/widgets/kernel/qguieventdispatcher_glib_p.h (renamed from src/gui/kernel/qguieventdispatcher_glib_p.h)0
-rw-r--r--src/widgets/kernel/qguiplatformplugin.cpp (renamed from src/gui/kernel/qguiplatformplugin.cpp)0
-rw-r--r--src/widgets/kernel/qguiplatformplugin_p.h126
-rw-r--r--src/widgets/kernel/qicon.cpp1165
-rw-r--r--src/widgets/kernel/qicon.h143
-rw-r--r--src/widgets/kernel/qicon_p.h139
-rw-r--r--src/widgets/kernel/qiconengine.cpp (renamed from src/gui/image/qiconengine.cpp)0
-rw-r--r--src/widgets/kernel/qiconengine.h104
-rw-r--r--src/widgets/kernel/qiconengineplugin.cpp (renamed from src/gui/image/qiconengineplugin.cpp)0
-rw-r--r--src/widgets/kernel/qiconengineplugin.h (renamed from src/gui/image/qiconengineplugin.h)0
-rw-r--r--src/widgets/kernel/qiconloader.cpp573
-rw-r--r--src/widgets/kernel/qiconloader_p.h192
-rw-r--r--src/widgets/kernel/qlayout.cpp (renamed from src/gui/kernel/qlayout.cpp)0
-rw-r--r--src/widgets/kernel/qlayout.h245
-rw-r--r--src/widgets/kernel/qlayout_p.h (renamed from src/gui/kernel/qlayout_p.h)0
-rw-r--r--src/widgets/kernel/qlayoutengine.cpp (renamed from src/gui/kernel/qlayoutengine.cpp)0
-rw-r--r--src/widgets/kernel/qlayoutengine_p.h140
-rw-r--r--src/widgets/kernel/qlayoutitem.cpp (renamed from src/gui/kernel/qlayoutitem.cpp)0
-rw-r--r--src/widgets/kernel/qlayoutitem.h182
-rw-r--r--src/widgets/kernel/qsizepolicy.h (renamed from src/gui/kernel/qsizepolicy.h)0
-rw-r--r--src/widgets/kernel/qsizepolicy.qdoc (renamed from src/gui/kernel/qsizepolicy.qdoc)0
-rw-r--r--src/widgets/kernel/qsoftkeymanager.cpp (renamed from src/gui/kernel/qsoftkeymanager.cpp)0
-rw-r--r--src/widgets/kernel/qsoftkeymanager_common_p.h (renamed from src/gui/kernel/qsoftkeymanager_common_p.h)0
-rw-r--r--src/widgets/kernel/qsoftkeymanager_p.h115
-rw-r--r--src/widgets/kernel/qsound.cpp367
-rw-r--r--src/widgets/kernel/qsound.h90
-rw-r--r--src/widgets/kernel/qsound_p.h (renamed from src/gui/kernel/qsound_p.h)0
-rw-r--r--src/widgets/kernel/qstackedlayout.cpp (renamed from src/gui/kernel/qstackedlayout.cpp)0
-rw-r--r--src/widgets/kernel/qstackedlayout.h115
-rw-r--r--src/widgets/kernel/qstandardgestures.cpp (renamed from src/gui/kernel/qstandardgestures.cpp)0
-rw-r--r--src/widgets/kernel/qstandardgestures_p.h (renamed from src/gui/kernel/qstandardgestures_p.h)0
-rw-r--r--src/widgets/kernel/qt_gui_pch.h85
-rw-r--r--src/widgets/kernel/qtooltip.cpp (renamed from src/gui/kernel/qtooltip.cpp)0
-rw-r--r--src/widgets/kernel/qtooltip.h84
-rw-r--r--src/widgets/kernel/qwhatsthis.cpp777
-rw-r--r--src/widgets/kernel/qwhatsthis.h (renamed from src/gui/kernel/qwhatsthis.h)0
-rw-r--r--src/widgets/kernel/qwidget.cpp12702
-rw-r--r--src/widgets/kernel/qwidget.h1091
-rw-r--r--src/widgets/kernel/qwidget_p.h1035
-rw-r--r--src/widgets/kernel/qwidget_qpa.cpp880
-rw-r--r--src/widgets/kernel/qwidgetaction.cpp (renamed from src/gui/kernel/qwidgetaction.cpp)0
-rw-r--r--src/widgets/kernel/qwidgetaction.h91
-rw-r--r--src/widgets/kernel/qwidgetaction_p.h (renamed from src/gui/kernel/qwidgetaction_p.h)0
-rw-r--r--src/widgets/kernel/qwidgetsvariant.cpp213
-rw-r--r--src/widgets/kernel/qwidgetwindow_qpa.cpp338
-rw-r--r--src/widgets/kernel/qwidgetwindow_qpa_p.h88
-rw-r--r--src/widgets/kernel/symbian.pri (renamed from src/gui/kernel/symbian.pri)0
-rw-r--r--src/widgets/kernel/win.pri (renamed from src/gui/kernel/win.pri)0
-rw-r--r--src/widgets/kernel/x11.pri (renamed from src/gui/kernel/x11.pri)0
-rw-r--r--src/widgets/mac/images/copyarrowcursor.png (renamed from src/gui/mac/images/copyarrowcursor.png)bin1976 -> 1976 bytes
-rw-r--r--src/widgets/mac/images/forbiddencursor.png (renamed from src/gui/mac/images/forbiddencursor.png)bin1745 -> 1745 bytes
-rw-r--r--src/widgets/mac/images/leopard-unified-toolbar-on.png (renamed from src/gui/mac/images/leopard-unified-toolbar-on.png)bin356 -> 356 bytes
-rw-r--r--src/widgets/mac/images/pluscursor.png (renamed from src/gui/mac/images/pluscursor.png)bin688 -> 688 bytes
-rw-r--r--src/widgets/mac/images/spincursor.png (renamed from src/gui/mac/images/spincursor.png)bin748 -> 748 bytes
-rw-r--r--src/widgets/mac/images/waitcursor.png (renamed from src/gui/mac/images/waitcursor.png)bin724 -> 724 bytes
-rw-r--r--src/widgets/mac/macresources.qrc (renamed from src/gui/mac/macresources.qrc)0
-rw-r--r--src/widgets/mac/qt_menu.nib/classes.nib (renamed from src/gui/mac/qt_menu.nib/classes.nib)0
-rw-r--r--src/widgets/mac/qt_menu.nib/info.nib (renamed from src/gui/mac/qt_menu.nib/info.nib)0
-rw-r--r--src/widgets/mac/qt_menu.nib/keyedobjects.nib (renamed from src/gui/mac/qt_menu.nib/keyedobjects.nib)bin5560 -> 5560 bytes
-rw-r--r--src/widgets/platforms/mac/qapplication_mac.mm (renamed from src/gui/kernel/qapplication_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qclipboard_mac.cpp (renamed from src/gui/kernel/qclipboard_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qcocoaapplication_mac.mm (renamed from src/gui/kernel/qcocoaapplication_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qcocoaapplication_mac_p.h (renamed from src/gui/kernel/qcocoaapplication_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qcocoaapplicationdelegate_mac.mm (renamed from src/gui/kernel/qcocoaapplicationdelegate_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qcocoaapplicationdelegate_mac_p.h (renamed from src/gui/kernel/qcocoaapplicationdelegate_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qcocoaintrospection_mac.mm (renamed from src/gui/kernel/qcocoaintrospection_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qcocoaintrospection_p.h (renamed from src/gui/kernel/qcocoaintrospection_p.h)0
-rw-r--r--src/widgets/platforms/mac/qcocoamenuloader_mac.mm (renamed from src/gui/kernel/qcocoamenuloader_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qcocoamenuloader_mac_p.h (renamed from src/gui/kernel/qcocoamenuloader_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qcocoapanel_mac.mm (renamed from src/gui/kernel/qcocoapanel_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qcocoapanel_mac_p.h (renamed from src/gui/kernel/qcocoapanel_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qcocoasharedwindowmethods_mac_p.h (renamed from src/gui/kernel/qcocoasharedwindowmethods_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qcocoaview_mac.mm (renamed from src/gui/kernel/qcocoaview_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qcocoaview_mac_p.h (renamed from src/gui/kernel/qcocoaview_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qcocoawindow_mac.mm (renamed from src/gui/kernel/qcocoawindow_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qcocoawindow_mac_p.h (renamed from src/gui/kernel/qcocoawindow_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qcocoawindowcustomthemeframe_mac.mm (renamed from src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qcocoawindowcustomthemeframe_mac_p.h (renamed from src/gui/kernel/qcocoawindowcustomthemeframe_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qcocoawindowdelegate_mac.mm (renamed from src/gui/kernel/qcocoawindowdelegate_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qcocoawindowdelegate_mac_p.h (renamed from src/gui/kernel/qcocoawindowdelegate_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qcolormap_mac.cpp (renamed from src/gui/painting/qcolormap_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qcursor_mac.mm (renamed from src/gui/kernel/qcursor_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qdesktopwidget_mac.mm (renamed from src/gui/kernel/qdesktopwidget_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qdesktopwidget_mac_p.h (renamed from src/gui/kernel/qdesktopwidget_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qdnd_mac.mm (renamed from src/gui/kernel/qdnd_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qeventdispatcher_mac.mm (renamed from src/gui/kernel/qeventdispatcher_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qeventdispatcher_mac_p.h (renamed from src/gui/kernel/qeventdispatcher_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qfont_mac.cpp (renamed from src/gui/text/qfont_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qfontdatabase_mac.cpp (renamed from src/gui/text/qfontdatabase_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qfontengine_coretext.mm (renamed from src/gui/text/qfontengine_coretext.mm)0
-rw-r--r--src/widgets/platforms/mac/qfontengine_coretext_p.h (renamed from src/gui/text/qfontengine_coretext_p.h)0
-rw-r--r--src/widgets/platforms/mac/qfontengine_mac.mm (renamed from src/gui/text/qfontengine_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qfontengine_mac_p.h (renamed from src/gui/text/qfontengine_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qkeymapper_mac.cpp (renamed from src/gui/kernel/qkeymapper_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qmacdefines_mac.h (renamed from src/gui/kernel/qmacdefines_mac.h)0
-rw-r--r--src/widgets/platforms/mac/qmacgesturerecognizer_mac.mm (renamed from src/gui/kernel/qmacgesturerecognizer_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qmacgesturerecognizer_mac_p.h (renamed from src/gui/kernel/qmacgesturerecognizer_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qmime_mac.cpp (renamed from src/gui/kernel/qmime_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qmultitouch_mac.mm (renamed from src/gui/kernel/qmultitouch_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qmultitouch_mac_p.h (renamed from src/gui/kernel/qmultitouch_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qnsframeview_mac_p.h (renamed from src/gui/kernel/qnsframeview_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qnsthemeframe_mac_p.h (renamed from src/gui/kernel/qnsthemeframe_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qnstitledframe_mac_p.h (renamed from src/gui/kernel/qnstitledframe_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qpaintdevice_mac.cpp (renamed from src/gui/painting/qpaintdevice_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qpaintengine_mac.cpp (renamed from src/gui/painting/qpaintengine_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qpaintengine_mac_p.h (renamed from src/gui/painting/qpaintengine_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qpixmap_mac.cpp (renamed from src/gui/image/qpixmap_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qpixmap_mac_p.h (renamed from src/gui/image/qpixmap_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qprintengine_mac.mm (renamed from src/gui/painting/qprintengine_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qprintengine_mac_p.h (renamed from src/gui/painting/qprintengine_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qprinterinfo_mac.cpp (renamed from src/gui/painting/qprinterinfo_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qrawfont_mac.cpp (renamed from src/gui/text/qrawfont_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qregion_mac.cpp (renamed from src/gui/painting/qregion_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qsound_mac.mm (renamed from src/gui/kernel/qsound_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qt_cocoa_helpers_mac.mm (renamed from src/gui/kernel/qt_cocoa_helpers_mac.mm)0
-rw-r--r--src/widgets/platforms/mac/qt_cocoa_helpers_mac_p.h (renamed from src/gui/kernel/qt_cocoa_helpers_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qt_mac.cpp (renamed from src/gui/kernel/qt_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qt_mac_p.h (renamed from src/gui/kernel/qt_mac_p.h)0
-rw-r--r--src/widgets/platforms/mac/qtextengine_mac.cpp (renamed from src/gui/text/qtextengine_mac.cpp)0
-rw-r--r--src/widgets/platforms/mac/qwidget_mac.mm (renamed from src/gui/kernel/qwidget_mac.mm)0
-rw-r--r--src/widgets/platforms/s60/qapplication_s60.cpp (renamed from src/gui/kernel/qapplication_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qclipboard_s60.cpp (renamed from src/gui/kernel/qclipboard_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qcolormap_s60.cpp (renamed from src/gui/painting/qcolormap_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qcursor_s60.cpp (renamed from src/gui/kernel/qcursor_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qdesktopwidget_s60.cpp (renamed from src/gui/kernel/qdesktopwidget_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qdnd_s60.cpp (renamed from src/gui/kernel/qdnd_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qeventdispatcher_s60.cpp (renamed from src/gui/kernel/qeventdispatcher_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qeventdispatcher_s60_p.h (renamed from src/gui/kernel/qeventdispatcher_s60_p.h)0
-rw-r--r--src/widgets/platforms/s60/qfont_s60.cpp (renamed from src/gui/text/qfont_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qfontdatabase_s60.cpp (renamed from src/gui/text/qfontdatabase_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qfontengine_s60.cpp (renamed from src/gui/text/qfontengine_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qfontengine_s60_p.h (renamed from src/gui/text/qfontengine_s60_p.h)0
-rw-r--r--src/widgets/platforms/s60/qkeymapper_s60.cpp (renamed from src/gui/kernel/qkeymapper_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qpaintengine_s60.cpp (renamed from src/gui/painting/qpaintengine_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qpaintengine_s60_p.h (renamed from src/gui/painting/qpaintengine_s60_p.h)0
-rw-r--r--src/widgets/platforms/s60/qpixmap_s60.cpp (renamed from src/gui/image/qpixmap_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qpixmap_s60_p.h (renamed from src/gui/image/qpixmap_s60_p.h)0
-rw-r--r--src/widgets/platforms/s60/qregion_s60.cpp (renamed from src/gui/painting/qregion_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qsoftkeymanager_s60.cpp (renamed from src/gui/kernel/qsoftkeymanager_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qsoftkeymanager_s60_p.h (renamed from src/gui/kernel/qsoftkeymanager_s60_p.h)0
-rw-r--r--src/widgets/platforms/s60/qsound_s60.cpp (renamed from src/gui/kernel/qsound_s60.cpp)0
-rw-r--r--src/widgets/platforms/s60/qt_s60_p.h (renamed from src/gui/kernel/qt_s60_p.h)0
-rw-r--r--src/widgets/platforms/s60/qwidget_s60.cpp (renamed from src/gui/kernel/qwidget_s60.cpp)0
-rw-r--r--src/widgets/platforms/win/qapplication_win.cpp (renamed from src/gui/kernel/qapplication_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qclipboard_win.cpp (renamed from src/gui/kernel/qclipboard_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qcolormap_win.cpp (renamed from src/gui/painting/qcolormap_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qcursor_win.cpp (renamed from src/gui/kernel/qcursor_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qdesktopwidget_win.cpp (renamed from src/gui/kernel/qdesktopwidget_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qdnd_win.cpp (renamed from src/gui/kernel/qdnd_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qfont_win.cpp (renamed from src/gui/text/qfont_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qfontdatabase_win.cpp (renamed from src/gui/text/qfontdatabase_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qfontengine_win.cpp (renamed from src/gui/text/qfontengine_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qfontengine_win_p.h (renamed from src/gui/text/qfontengine_win_p.h)0
-rw-r--r--src/widgets/platforms/win/qguifunctions_wince.cpp (renamed from src/gui/kernel/qguifunctions_wince.cpp)0
-rw-r--r--src/widgets/platforms/win/qguifunctions_wince.h (renamed from src/gui/kernel/qguifunctions_wince.h)0
-rw-r--r--src/widgets/platforms/win/qkeymapper_win.cpp (renamed from src/gui/kernel/qkeymapper_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qmime_win.cpp (renamed from src/gui/kernel/qmime_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qole_win.cpp (renamed from src/gui/kernel/qole_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qpaintdevice_win.cpp (renamed from src/gui/painting/qpaintdevice_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qpixmap_win.cpp (renamed from src/gui/image/qpixmap_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qprintengine_win.cpp (renamed from src/gui/painting/qprintengine_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qprintengine_win_p.h (renamed from src/gui/painting/qprintengine_win_p.h)0
-rw-r--r--src/widgets/platforms/win/qprinterinfo_win.cpp (renamed from src/gui/painting/qprinterinfo_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qrawfont_win.cpp (renamed from src/gui/text/qrawfont_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qregion_win.cpp (renamed from src/gui/painting/qregion_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qsound_win.cpp (renamed from src/gui/kernel/qsound_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qwidget_win.cpp (renamed from src/gui/kernel/qwidget_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qwidget_wince.cpp (renamed from src/gui/kernel/qwidget_wince.cpp)0
-rw-r--r--src/widgets/platforms/win/qwindowdefs_win.h (renamed from src/gui/kernel/qwindowdefs_win.h)0
-rw-r--r--src/widgets/platforms/win/qwinnativepangesturerecognizer_win.cpp (renamed from src/gui/kernel/qwinnativepangesturerecognizer_win.cpp)0
-rw-r--r--src/widgets/platforms/win/qwinnativepangesturerecognizer_win_p.h (renamed from src/gui/kernel/qwinnativepangesturerecognizer_win_p.h)0
-rw-r--r--src/widgets/platforms/x11/qapplication_x11.cpp (renamed from src/gui/kernel/qapplication_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qclipboard_x11.cpp (renamed from src/gui/kernel/qclipboard_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qcolormap_x11.cpp (renamed from src/gui/painting/qcolormap_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qcursor_x11.cpp (renamed from src/gui/kernel/qcursor_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qdesktopwidget_x11.cpp (renamed from src/gui/kernel/qdesktopwidget_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qdnd_x11.cpp2072
-rw-r--r--src/widgets/platforms/x11/qeventdispatcher_x11.cpp (renamed from src/gui/kernel/qeventdispatcher_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qeventdispatcher_x11_p.h (renamed from src/gui/kernel/qeventdispatcher_x11_p.h)0
-rw-r--r--src/widgets/platforms/x11/qfont_x11.cpp (renamed from src/gui/text/qfont_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qfontdatabase_x11.cpp (renamed from src/gui/text/qfontdatabase_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qfontengine_x11.cpp (renamed from src/gui/text/qfontengine_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qfontengine_x11_p.h (renamed from src/gui/text/qfontengine_x11_p.h)0
-rw-r--r--src/widgets/platforms/x11/qkde.cpp (renamed from src/gui/kernel/qkde.cpp)0
-rw-r--r--src/widgets/platforms/x11/qkde_p.h81
-rw-r--r--src/widgets/platforms/x11/qkeymapper_x11.cpp (renamed from src/gui/kernel/qkeymapper_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qkeymapper_x11_p.cpp (renamed from src/gui/kernel/qkeymapper_x11_p.cpp)0
-rw-r--r--src/widgets/platforms/x11/qmotifdnd_x11.cpp (renamed from src/gui/kernel/qmotifdnd_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qpaintdevice_x11.cpp84
-rw-r--r--src/widgets/platforms/x11/qpaintengine_x11.cpp2504
-rw-r--r--src/widgets/platforms/x11/qpaintengine_x11_p.h (renamed from src/gui/painting/qpaintengine_x11_p.h)0
-rw-r--r--src/widgets/platforms/x11/qpixmap_x11.cpp (renamed from src/gui/image/qpixmap_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qpixmap_x11_p.h (renamed from src/gui/image/qpixmap_x11_p.h)0
-rw-r--r--src/widgets/platforms/x11/qregion_x11.cpp (renamed from src/gui/painting/qregion_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qsound_x11.cpp (renamed from src/gui/kernel/qsound_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qt_x11_p.h (renamed from src/gui/kernel/qt_x11_p.h)0
-rw-r--r--src/widgets/platforms/x11/qwidget_x11.cpp3149
-rw-r--r--src/widgets/platforms/x11/qwidgetcreate_x11.cpp (renamed from src/gui/kernel/qwidgetcreate_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qx11embed_x11.cpp (renamed from src/gui/kernel/qx11embed_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qx11embed_x11.h132
-rw-r--r--src/widgets/platforms/x11/qx11info_x11.cpp (renamed from src/gui/kernel/qx11info_x11.cpp)0
-rw-r--r--src/widgets/platforms/x11/qx11info_x11.h (renamed from src/gui/kernel/qx11info_x11.h)0
-rw-r--r--src/widgets/s60framework/qs60mainapplication.cpp (renamed from src/gui/s60framework/qs60mainapplication.cpp)0
-rw-r--r--src/widgets/s60framework/qs60mainapplication.h (renamed from src/gui/s60framework/qs60mainapplication.h)0
-rw-r--r--src/widgets/s60framework/qs60mainapplication_p.h (renamed from src/gui/s60framework/qs60mainapplication_p.h)0
-rw-r--r--src/widgets/s60framework/qs60mainappui.cpp430
-rw-r--r--src/widgets/s60framework/qs60mainappui.h (renamed from src/gui/s60framework/qs60mainappui.h)0
-rw-r--r--src/widgets/s60framework/qs60maindocument.cpp (renamed from src/gui/s60framework/qs60maindocument.cpp)0
-rw-r--r--src/widgets/s60framework/qs60maindocument.h (renamed from src/gui/s60framework/qs60maindocument.h)0
-rw-r--r--src/widgets/s60framework/s60framework.pri (renamed from src/gui/s60framework/s60framework.pri)0
-rw-r--r--src/widgets/s60framework/s60main.rss (renamed from src/gui/s60framework/s60main.rss)0
-rw-r--r--src/widgets/statemachine/qbasickeyeventtransition.cpp (renamed from src/gui/statemachine/qbasickeyeventtransition.cpp)0
-rw-r--r--src/widgets/statemachine/qbasickeyeventtransition_p.h (renamed from src/gui/statemachine/qbasickeyeventtransition_p.h)0
-rw-r--r--src/widgets/statemachine/qbasicmouseeventtransition.cpp (renamed from src/gui/statemachine/qbasicmouseeventtransition.cpp)0
-rw-r--r--src/widgets/statemachine/qbasicmouseeventtransition_p.h (renamed from src/gui/statemachine/qbasicmouseeventtransition_p.h)0
-rw-r--r--src/widgets/statemachine/qguistatemachine.cpp498
-rw-r--r--src/widgets/statemachine/qkeyeventtransition.cpp (renamed from src/gui/statemachine/qkeyeventtransition.cpp)0
-rw-r--r--src/widgets/statemachine/qkeyeventtransition.h (renamed from src/gui/statemachine/qkeyeventtransition.h)0
-rw-r--r--src/widgets/statemachine/qmouseeventtransition.cpp (renamed from src/gui/statemachine/qmouseeventtransition.cpp)0
-rw-r--r--src/widgets/statemachine/qmouseeventtransition.h (renamed from src/gui/statemachine/qmouseeventtransition.h)0
-rw-r--r--src/widgets/statemachine/statemachine.pri (renamed from src/gui/statemachine/statemachine.pri)0
-rw-r--r--src/widgets/styles/images/cdr-128.png (renamed from src/gui/styles/images/cdr-128.png)bin16418 -> 16418 bytes
-rw-r--r--src/widgets/styles/images/cdr-16.png (renamed from src/gui/styles/images/cdr-16.png)bin845 -> 845 bytes
-rw-r--r--src/widgets/styles/images/cdr-32.png (renamed from src/gui/styles/images/cdr-32.png)bin2016 -> 2016 bytes
-rw-r--r--src/widgets/styles/images/closedock-16.png (renamed from src/gui/styles/images/closedock-16.png)bin516 -> 516 bytes
-rw-r--r--src/widgets/styles/images/closedock-down-16.png (renamed from src/gui/styles/images/closedock-down-16.png)bin578 -> 578 bytes
-rw-r--r--src/widgets/styles/images/computer-16.png (renamed from src/gui/styles/images/computer-16.png)bin782 -> 782 bytes
-rw-r--r--src/widgets/styles/images/computer-32.png (renamed from src/gui/styles/images/computer-32.png)bin1807 -> 1807 bytes
-rw-r--r--src/widgets/styles/images/defaults60theme.blob (renamed from src/gui/styles/images/defaults60theme.blob)bin74127 -> 74127 bytes
-rw-r--r--src/widgets/styles/images/desktop-16.png (renamed from src/gui/styles/images/desktop-16.png)bin773 -> 773 bytes
-rw-r--r--src/widgets/styles/images/desktop-32.png (renamed from src/gui/styles/images/desktop-32.png)bin1103 -> 1103 bytes
-rw-r--r--src/widgets/styles/images/dirclosed-128.png (renamed from src/gui/styles/images/dirclosed-128.png)bin1386 -> 1386 bytes
-rw-r--r--src/widgets/styles/images/dirclosed-16.png (renamed from src/gui/styles/images/dirclosed-16.png)bin231 -> 231 bytes
-rw-r--r--src/widgets/styles/images/dirclosed-32.png (renamed from src/gui/styles/images/dirclosed-32.png)bin474 -> 474 bytes
-rw-r--r--src/widgets/styles/images/dirlink-128.png (renamed from src/gui/styles/images/dirlink-128.png)bin5155 -> 5155 bytes
-rw-r--r--src/widgets/styles/images/dirlink-16.png (renamed from src/gui/styles/images/dirlink-16.png)bin416 -> 416 bytes
-rw-r--r--src/widgets/styles/images/dirlink-32.png (renamed from src/gui/styles/images/dirlink-32.png)bin1046 -> 1046 bytes
-rw-r--r--src/widgets/styles/images/diropen-128.png (renamed from src/gui/styles/images/diropen-128.png)bin2075 -> 2075 bytes
-rw-r--r--src/widgets/styles/images/diropen-16.png (renamed from src/gui/styles/images/diropen-16.png)bin248 -> 248 bytes
-rw-r--r--src/widgets/styles/images/diropen-32.png (renamed from src/gui/styles/images/diropen-32.png)bin633 -> 633 bytes
-rw-r--r--src/widgets/styles/images/dockdock-16.png (renamed from src/gui/styles/images/dockdock-16.png)bin438 -> 438 bytes
-rw-r--r--src/widgets/styles/images/dockdock-down-16.png (renamed from src/gui/styles/images/dockdock-down-16.png)bin406 -> 406 bytes
-rw-r--r--src/widgets/styles/images/down-128.png (renamed from src/gui/styles/images/down-128.png)bin9550 -> 9550 bytes
-rw-r--r--src/widgets/styles/images/down-16.png (renamed from src/gui/styles/images/down-16.png)bin817 -> 817 bytes
-rw-r--r--src/widgets/styles/images/down-32.png (renamed from src/gui/styles/images/down-32.png)bin1820 -> 1820 bytes
-rw-r--r--src/widgets/styles/images/dvd-128.png (renamed from src/gui/styles/images/dvd-128.png)bin14941 -> 14941 bytes
-rw-r--r--src/widgets/styles/images/dvd-16.png (renamed from src/gui/styles/images/dvd-16.png)bin892 -> 892 bytes
-rw-r--r--src/widgets/styles/images/dvd-32.png (renamed from src/gui/styles/images/dvd-32.png)bin2205 -> 2205 bytes
-rw-r--r--src/widgets/styles/images/file-128.png (renamed from src/gui/styles/images/file-128.png)bin3997 -> 3997 bytes
-rw-r--r--src/widgets/styles/images/file-16.png (renamed from src/gui/styles/images/file-16.png)bin423 -> 423 bytes
-rw-r--r--src/widgets/styles/images/file-32.png (renamed from src/gui/styles/images/file-32.png)bin713 -> 713 bytes
-rw-r--r--src/widgets/styles/images/filecontents-128.png (renamed from src/gui/styles/images/filecontents-128.png)bin8109 -> 8109 bytes
-rw-r--r--src/widgets/styles/images/filecontents-16.png (renamed from src/gui/styles/images/filecontents-16.png)bin766 -> 766 bytes
-rw-r--r--src/widgets/styles/images/filecontents-32.png (renamed from src/gui/styles/images/filecontents-32.png)bin1712 -> 1712 bytes
-rw-r--r--src/widgets/styles/images/fileinfo-128.png (renamed from src/gui/styles/images/fileinfo-128.png)bin12002 -> 12002 bytes
-rw-r--r--src/widgets/styles/images/fileinfo-16.png (renamed from src/gui/styles/images/fileinfo-16.png)bin849 -> 849 bytes
-rw-r--r--src/widgets/styles/images/fileinfo-32.png (renamed from src/gui/styles/images/fileinfo-32.png)bin2010 -> 2010 bytes
-rw-r--r--src/widgets/styles/images/filelink-128.png (renamed from src/gui/styles/images/filelink-128.png)bin5601 -> 5601 bytes
-rw-r--r--src/widgets/styles/images/filelink-16.png (renamed from src/gui/styles/images/filelink-16.png)bin566 -> 566 bytes
-rw-r--r--src/widgets/styles/images/filelink-32.png (renamed from src/gui/styles/images/filelink-32.png)bin1192 -> 1192 bytes
-rw-r--r--src/widgets/styles/images/floppy-128.png (renamed from src/gui/styles/images/floppy-128.png)bin5074 -> 5074 bytes
-rw-r--r--src/widgets/styles/images/floppy-16.png (renamed from src/gui/styles/images/floppy-16.png)bin602 -> 602 bytes
-rw-r--r--src/widgets/styles/images/floppy-32.png (renamed from src/gui/styles/images/floppy-32.png)bin1019 -> 1019 bytes
-rw-r--r--src/widgets/styles/images/fontbitmap-16.png (renamed from src/gui/styles/images/fontbitmap-16.png)bin537 -> 537 bytes
-rw-r--r--src/widgets/styles/images/fonttruetype-16.png (renamed from src/gui/styles/images/fonttruetype-16.png)bin442 -> 442 bytes
-rw-r--r--src/widgets/styles/images/harddrive-128.png (renamed from src/gui/styles/images/harddrive-128.png)bin11250 -> 11250 bytes
-rw-r--r--src/widgets/styles/images/harddrive-16.png (renamed from src/gui/styles/images/harddrive-16.png)bin802 -> 802 bytes
-rw-r--r--src/widgets/styles/images/harddrive-32.png (renamed from src/gui/styles/images/harddrive-32.png)bin1751 -> 1751 bytes
-rw-r--r--src/widgets/styles/images/left-128.png (renamed from src/gui/styles/images/left-128.png)bin9432 -> 9432 bytes
-rw-r--r--src/widgets/styles/images/left-16.png (renamed from src/gui/styles/images/left-16.png)bin826 -> 826 bytes
-rw-r--r--src/widgets/styles/images/left-32.png (renamed from src/gui/styles/images/left-32.png)bin1799 -> 1799 bytes
-rw-r--r--src/widgets/styles/images/media-pause-16.png (renamed from src/gui/styles/images/media-pause-16.png)bin229 -> 229 bytes
-rw-r--r--src/widgets/styles/images/media-pause-32.png (renamed from src/gui/styles/images/media-pause-32.png)bin185 -> 185 bytes
-rw-r--r--src/widgets/styles/images/media-play-16.png (renamed from src/gui/styles/images/media-play-16.png)bin262 -> 262 bytes
-rw-r--r--src/widgets/styles/images/media-play-32.png (renamed from src/gui/styles/images/media-play-32.png)bin413 -> 413 bytes
-rw-r--r--src/widgets/styles/images/media-seek-backward-16.png (renamed from src/gui/styles/images/media-seek-backward-16.png)bin384 -> 384 bytes
-rw-r--r--src/widgets/styles/images/media-seek-backward-32.png (renamed from src/gui/styles/images/media-seek-backward-32.png)bin548 -> 548 bytes
-rw-r--r--src/widgets/styles/images/media-seek-forward-16.png (renamed from src/gui/styles/images/media-seek-forward-16.png)bin370 -> 370 bytes
-rw-r--r--src/widgets/styles/images/media-seek-forward-32.png (renamed from src/gui/styles/images/media-seek-forward-32.png)bin524 -> 524 bytes
-rw-r--r--src/widgets/styles/images/media-skip-backward-16.png (renamed from src/gui/styles/images/media-skip-backward-16.png)bin396 -> 396 bytes
-rw-r--r--src/widgets/styles/images/media-skip-backward-32.png (renamed from src/gui/styles/images/media-skip-backward-32.png)bin570 -> 570 bytes
-rw-r--r--src/widgets/styles/images/media-skip-forward-16.png (renamed from src/gui/styles/images/media-skip-forward-16.png)bin384 -> 384 bytes
-rw-r--r--src/widgets/styles/images/media-skip-forward-32.png (renamed from src/gui/styles/images/media-skip-forward-32.png)bin549 -> 549 bytes
-rw-r--r--src/widgets/styles/images/media-stop-16.png (renamed from src/gui/styles/images/media-stop-16.png)bin166 -> 166 bytes
-rw-r--r--src/widgets/styles/images/media-stop-32.png (renamed from src/gui/styles/images/media-stop-32.png)bin176 -> 176 bytes
-rw-r--r--src/widgets/styles/images/media-volume-16.png (renamed from src/gui/styles/images/media-volume-16.png)bin799 -> 799 bytes
-rw-r--r--src/widgets/styles/images/media-volume-muted-16.png (renamed from src/gui/styles/images/media-volume-muted-16.png)bin668 -> 668 bytes
-rw-r--r--src/widgets/styles/images/networkdrive-128.png (renamed from src/gui/styles/images/networkdrive-128.png)bin18075 -> 18075 bytes
-rw-r--r--src/widgets/styles/images/networkdrive-16.png (renamed from src/gui/styles/images/networkdrive-16.png)bin885 -> 885 bytes
-rw-r--r--src/widgets/styles/images/networkdrive-32.png (renamed from src/gui/styles/images/networkdrive-32.png)bin2245 -> 2245 bytes
-rw-r--r--src/widgets/styles/images/newdirectory-128.png (renamed from src/gui/styles/images/newdirectory-128.png)bin7503 -> 7503 bytes
-rw-r--r--src/widgets/styles/images/newdirectory-16.png (renamed from src/gui/styles/images/newdirectory-16.png)bin870 -> 870 bytes
-rw-r--r--src/widgets/styles/images/newdirectory-32.png (renamed from src/gui/styles/images/newdirectory-32.png)bin1590 -> 1590 bytes
-rw-r--r--src/widgets/styles/images/parentdir-128.png (renamed from src/gui/styles/images/parentdir-128.png)bin8093 -> 8093 bytes
-rw-r--r--src/widgets/styles/images/parentdir-16.png (renamed from src/gui/styles/images/parentdir-16.png)bin938 -> 938 bytes
-rw-r--r--src/widgets/styles/images/parentdir-32.png (renamed from src/gui/styles/images/parentdir-32.png)bin1603 -> 1603 bytes
-rw-r--r--src/widgets/styles/images/refresh-24.png (renamed from src/gui/styles/images/refresh-24.png)bin1654 -> 1654 bytes
-rw-r--r--src/widgets/styles/images/refresh-32.png (renamed from src/gui/styles/images/refresh-32.png)bin2431 -> 2431 bytes
-rw-r--r--src/widgets/styles/images/right-128.png (renamed from src/gui/styles/images/right-128.png)bin9367 -> 9367 bytes
-rw-r--r--src/widgets/styles/images/right-16.png (renamed from src/gui/styles/images/right-16.png)bin811 -> 811 bytes
-rw-r--r--src/widgets/styles/images/right-32.png (renamed from src/gui/styles/images/right-32.png)bin1804 -> 1804 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-apply-128.png (renamed from src/gui/styles/images/standardbutton-apply-128.png)bin5395 -> 5395 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-apply-16.png (renamed from src/gui/styles/images/standardbutton-apply-16.png)bin611 -> 611 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-apply-32.png (renamed from src/gui/styles/images/standardbutton-apply-32.png)bin1279 -> 1279 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-cancel-128.png (renamed from src/gui/styles/images/standardbutton-cancel-128.png)bin7039 -> 7039 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-cancel-16.png (renamed from src/gui/styles/images/standardbutton-cancel-16.png)bin689 -> 689 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-cancel-32.png (renamed from src/gui/styles/images/standardbutton-cancel-32.png)bin1573 -> 1573 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-clear-128.png (renamed from src/gui/styles/images/standardbutton-clear-128.png)bin3094 -> 3094 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-clear-16.png (renamed from src/gui/styles/images/standardbutton-clear-16.png)bin456 -> 456 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-clear-32.png (renamed from src/gui/styles/images/standardbutton-clear-32.png)bin866 -> 866 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-close-128.png (renamed from src/gui/styles/images/standardbutton-close-128.png)bin4512 -> 4512 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-close-16.png (renamed from src/gui/styles/images/standardbutton-close-16.png)bin366 -> 366 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-close-32.png (renamed from src/gui/styles/images/standardbutton-close-32.png)bin780 -> 780 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-closetab-16.png (renamed from src/gui/styles/images/standardbutton-closetab-16.png)bin406 -> 406 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-closetab-down-16.png (renamed from src/gui/styles/images/standardbutton-closetab-down-16.png)bin481 -> 481 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-closetab-hover-16.png (renamed from src/gui/styles/images/standardbutton-closetab-hover-16.png)bin570 -> 570 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-delete-128.png (renamed from src/gui/styles/images/standardbutton-delete-128.png)bin5414 -> 5414 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-delete-16.png (renamed from src/gui/styles/images/standardbutton-delete-16.png)bin722 -> 722 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-delete-32.png (renamed from src/gui/styles/images/standardbutton-delete-32.png)bin1541 -> 1541 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-help-128.png (renamed from src/gui/styles/images/standardbutton-help-128.png)bin10765 -> 10765 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-help-16.png (renamed from src/gui/styles/images/standardbutton-help-16.png)bin840 -> 840 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-help-32.png (renamed from src/gui/styles/images/standardbutton-help-32.png)bin2066 -> 2066 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-no-128.png (renamed from src/gui/styles/images/standardbutton-no-128.png)bin6520 -> 6520 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-no-16.png (renamed from src/gui/styles/images/standardbutton-no-16.png)bin701 -> 701 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-no-32.png (renamed from src/gui/styles/images/standardbutton-no-32.png)bin1445 -> 1445 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-ok-128.png (renamed from src/gui/styles/images/standardbutton-ok-128.png)bin4232 -> 4232 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-ok-16.png (renamed from src/gui/styles/images/standardbutton-ok-16.png)bin584 -> 584 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-ok-32.png (renamed from src/gui/styles/images/standardbutton-ok-32.png)bin1246 -> 1246 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-open-128.png (renamed from src/gui/styles/images/standardbutton-open-128.png)bin5415 -> 5415 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-open-16.png (renamed from src/gui/styles/images/standardbutton-open-16.png)bin629 -> 629 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-open-32.png (renamed from src/gui/styles/images/standardbutton-open-32.png)bin1154 -> 1154 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-save-128.png (renamed from src/gui/styles/images/standardbutton-save-128.png)bin4398 -> 4398 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-save-16.png (renamed from src/gui/styles/images/standardbutton-save-16.png)bin583 -> 583 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-save-32.png (renamed from src/gui/styles/images/standardbutton-save-32.png)bin1092 -> 1092 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-yes-128.png (renamed from src/gui/styles/images/standardbutton-yes-128.png)bin6554 -> 6554 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-yes-16.png (renamed from src/gui/styles/images/standardbutton-yes-16.png)bin687 -> 687 bytes
-rw-r--r--src/widgets/styles/images/standardbutton-yes-32.png (renamed from src/gui/styles/images/standardbutton-yes-32.png)bin1504 -> 1504 bytes
-rw-r--r--src/widgets/styles/images/stop-24.png (renamed from src/gui/styles/images/stop-24.png)bin1267 -> 1267 bytes
-rw-r--r--src/widgets/styles/images/stop-32.png (renamed from src/gui/styles/images/stop-32.png)bin1878 -> 1878 bytes
-rw-r--r--src/widgets/styles/images/trash-128.png (renamed from src/gui/styles/images/trash-128.png)bin3296 -> 3296 bytes
-rw-r--r--src/widgets/styles/images/trash-16.png (renamed from src/gui/styles/images/trash-16.png)bin419 -> 419 bytes
-rw-r--r--src/widgets/styles/images/trash-32.png (renamed from src/gui/styles/images/trash-32.png)bin883 -> 883 bytes
-rw-r--r--src/widgets/styles/images/up-128.png (renamed from src/gui/styles/images/up-128.png)bin9363 -> 9363 bytes
-rw-r--r--src/widgets/styles/images/up-16.png (renamed from src/gui/styles/images/up-16.png)bin814 -> 814 bytes
-rw-r--r--src/widgets/styles/images/up-32.png (renamed from src/gui/styles/images/up-32.png)bin1798 -> 1798 bytes
-rw-r--r--src/widgets/styles/images/viewdetailed-128.png (renamed from src/gui/styles/images/viewdetailed-128.png)bin4743 -> 4743 bytes
-rw-r--r--src/widgets/styles/images/viewdetailed-16.png (renamed from src/gui/styles/images/viewdetailed-16.png)bin499 -> 499 bytes
-rw-r--r--src/widgets/styles/images/viewdetailed-32.png (renamed from src/gui/styles/images/viewdetailed-32.png)bin1092 -> 1092 bytes
-rw-r--r--src/widgets/styles/images/viewlist-128.png (renamed from src/gui/styles/images/viewlist-128.png)bin4069 -> 4069 bytes
-rw-r--r--src/widgets/styles/images/viewlist-16.png (renamed from src/gui/styles/images/viewlist-16.png)bin490 -> 490 bytes
-rw-r--r--src/widgets/styles/images/viewlist-32.png (renamed from src/gui/styles/images/viewlist-32.png)bin1006 -> 1006 bytes
-rw-r--r--src/widgets/styles/qcdestyle.cpp (renamed from src/gui/styles/qcdestyle.cpp)0
-rw-r--r--src/widgets/styles/qcdestyle.h82
-rw-r--r--src/widgets/styles/qcleanlooksstyle.cpp (renamed from src/gui/styles/qcleanlooksstyle.cpp)0
-rw-r--r--src/widgets/styles/qcleanlooksstyle.h114
-rw-r--r--src/widgets/styles/qcleanlooksstyle_p.h (renamed from src/gui/styles/qcleanlooksstyle_p.h)0
-rw-r--r--src/widgets/styles/qcommonstyle.cpp (renamed from src/gui/styles/qcommonstyle.cpp)0
-rw-r--r--src/widgets/styles/qcommonstyle.h109
-rw-r--r--src/widgets/styles/qcommonstyle_p.h (renamed from src/gui/styles/qcommonstyle_p.h)0
-rw-r--r--src/widgets/styles/qcommonstylepixmaps_p.h (renamed from src/gui/styles/qcommonstylepixmaps_p.h)0
-rw-r--r--src/widgets/styles/qdrawutil.cpp1053
-rw-r--r--src/widgets/styles/qdrawutil.h175
-rw-r--r--src/widgets/styles/qgtkpainter.cpp716
-rw-r--r--src/widgets/styles/qgtkpainter_p.h129
-rw-r--r--src/widgets/styles/qgtkstyle.cpp3560
-rw-r--r--src/widgets/styles/qgtkstyle.h128
-rw-r--r--src/widgets/styles/qgtkstyle_p.cpp1146
-rw-r--r--src/widgets/styles/qgtkstyle_p.h531
-rw-r--r--src/widgets/styles/qmacstyle.qdoc (renamed from src/gui/styles/qmacstyle.qdoc)0
-rw-r--r--src/widgets/styles/qmacstyle_mac.h148
-rw-r--r--src/widgets/styles/qmacstyle_mac.mm (renamed from src/gui/styles/qmacstyle_mac.mm)0
-rw-r--r--src/widgets/styles/qmacstyle_mac_p.h241
-rw-r--r--src/widgets/styles/qmacstylepixmaps_mac_p.h (renamed from src/gui/styles/qmacstylepixmaps_mac_p.h)0
-rw-r--r--src/widgets/styles/qmotifstyle.cpp2721
-rw-r--r--src/widgets/styles/qmotifstyle.h128
-rw-r--r--src/widgets/styles/qmotifstyle_p.h (renamed from src/gui/styles/qmotifstyle_p.h)0
-rw-r--r--src/widgets/styles/qplastiquestyle.cpp (renamed from src/gui/styles/qplastiquestyle.cpp)0
-rw-r--r--src/widgets/styles/qplastiquestyle.h119
-rw-r--r--src/widgets/styles/qproxystyle.cpp (renamed from src/gui/styles/qproxystyle.cpp)0
-rw-r--r--src/widgets/styles/qproxystyle.h114
-rw-r--r--src/widgets/styles/qproxystyle_p.h (renamed from src/gui/styles/qproxystyle_p.h)0
-rw-r--r--src/widgets/styles/qs60style.cpp (renamed from src/gui/styles/qs60style.cpp)0
-rw-r--r--src/widgets/styles/qs60style.h118
-rw-r--r--src/widgets/styles/qs60style_p.h (renamed from src/gui/styles/qs60style_p.h)0
-rw-r--r--src/widgets/styles/qs60style_s60.cpp (renamed from src/gui/styles/qs60style_s60.cpp)0
-rw-r--r--src/widgets/styles/qs60style_simulated.cpp (renamed from src/gui/styles/qs60style_simulated.cpp)0
-rw-r--r--src/widgets/styles/qs60style_stub.cpp (renamed from src/gui/styles/qs60style_stub.cpp)0
-rw-r--r--src/widgets/styles/qstyle.cpp2459
-rw-r--r--src/widgets/styles/qstyle.h889
-rw-r--r--src/widgets/styles/qstyle.qrc (renamed from src/gui/styles/qstyle.qrc)0
-rw-r--r--src/widgets/styles/qstyle_p.h108
-rw-r--r--src/widgets/styles/qstyle_s60.qrc (renamed from src/gui/styles/qstyle_s60.qrc)0
-rw-r--r--src/widgets/styles/qstyle_s60_simulated.qrc (renamed from src/gui/styles/qstyle_s60_simulated.qrc)0
-rw-r--r--src/widgets/styles/qstyle_wince.qrc (renamed from src/gui/styles/qstyle_wince.qrc)0
-rw-r--r--src/widgets/styles/qstylefactory.cpp (renamed from src/gui/styles/qstylefactory.cpp)0
-rw-r--r--src/widgets/styles/qstylefactory.h (renamed from src/gui/styles/qstylefactory.h)0
-rw-r--r--src/widgets/styles/qstylehelper.cpp (renamed from src/gui/styles/qstylehelper.cpp)0
-rw-r--r--src/widgets/styles/qstylehelper_p.h89
-rw-r--r--src/widgets/styles/qstyleoption.cpp (renamed from src/gui/styles/qstyleoption.cpp)0
-rw-r--r--src/widgets/styles/qstyleoption.h970
-rw-r--r--src/widgets/styles/qstylepainter.cpp (renamed from src/gui/painting/qstylepainter.cpp)0
-rw-r--r--src/widgets/styles/qstylepainter.h112
-rw-r--r--src/widgets/styles/qstyleplugin.cpp (renamed from src/gui/styles/qstyleplugin.cpp)0
-rw-r--r--src/widgets/styles/qstyleplugin.h (renamed from src/gui/styles/qstyleplugin.h)0
-rw-r--r--src/widgets/styles/qstylesheetstyle.cpp5900
-rw-r--r--src/widgets/styles/qstylesheetstyle_default.cpp (renamed from src/gui/styles/qstylesheetstyle_default.cpp)0
-rw-r--r--src/widgets/styles/qstylesheetstyle_p.h204
-rw-r--r--src/widgets/styles/qwindowscestyle.cpp (renamed from src/gui/styles/qwindowscestyle.cpp)0
-rw-r--r--src/widgets/styles/qwindowscestyle.h103
-rw-r--r--src/widgets/styles/qwindowscestyle_p.h (renamed from src/gui/styles/qwindowscestyle_p.h)0
-rw-r--r--src/widgets/styles/qwindowsmobilestyle.cpp (renamed from src/gui/styles/qwindowsmobilestyle.cpp)0
-rw-r--r--src/widgets/styles/qwindowsmobilestyle.h116
-rw-r--r--src/widgets/styles/qwindowsmobilestyle_p.h (renamed from src/gui/styles/qwindowsmobilestyle_p.h)0
-rw-r--r--src/widgets/styles/qwindowsstyle.cpp (renamed from src/gui/styles/qwindowsstyle.cpp)0
-rw-r--r--src/widgets/styles/qwindowsstyle.h111
-rw-r--r--src/widgets/styles/qwindowsstyle_p.h (renamed from src/gui/styles/qwindowsstyle_p.h)0
-rw-r--r--src/widgets/styles/qwindowsvistastyle.cpp (renamed from src/gui/styles/qwindowsvistastyle.cpp)0
-rw-r--r--src/widgets/styles/qwindowsvistastyle.h108
-rw-r--r--src/widgets/styles/qwindowsvistastyle_p.h (renamed from src/gui/styles/qwindowsvistastyle_p.h)0
-rw-r--r--src/widgets/styles/qwindowsxpstyle.cpp (renamed from src/gui/styles/qwindowsxpstyle.cpp)0
-rw-r--r--src/widgets/styles/qwindowsxpstyle.h107
-rw-r--r--src/widgets/styles/qwindowsxpstyle_p.h (renamed from src/gui/styles/qwindowsxpstyle_p.h)0
-rw-r--r--src/widgets/styles/styles.pri194
-rw-r--r--src/widgets/symbian/images/blank.png (renamed from src/gui/symbian/images/blank.png)bin91 -> 91 bytes
-rw-r--r--src/widgets/symbian/images/busy12.png (renamed from src/gui/symbian/images/busy12.png)bin253 -> 253 bytes
-rw-r--r--src/widgets/symbian/images/busy3.png (renamed from src/gui/symbian/images/busy3.png)bin251 -> 251 bytes
-rw-r--r--src/widgets/symbian/images/busy6.png (renamed from src/gui/symbian/images/busy6.png)bin253 -> 253 bytes
-rw-r--r--src/widgets/symbian/images/busy9.png (renamed from src/gui/symbian/images/busy9.png)bin255 -> 255 bytes
-rw-r--r--src/widgets/symbian/images/closehand.png (renamed from src/gui/symbian/images/closehand.png)bin190 -> 190 bytes
-rw-r--r--src/widgets/symbian/images/cross.png (renamed from src/gui/symbian/images/cross.png)bin145 -> 145 bytes
-rw-r--r--src/widgets/symbian/images/forbidden.png (renamed from src/gui/symbian/images/forbidden.png)bin256 -> 256 bytes
-rw-r--r--src/widgets/symbian/images/handpoint.png (renamed from src/gui/symbian/images/handpoint.png)bin230 -> 230 bytes
-rw-r--r--src/widgets/symbian/images/ibeam.png (renamed from src/gui/symbian/images/ibeam.png)bin176 -> 176 bytes
-rw-r--r--src/widgets/symbian/images/openhand.png (renamed from src/gui/symbian/images/openhand.png)bin201 -> 201 bytes
-rw-r--r--src/widgets/symbian/images/pointer.png (renamed from src/gui/symbian/images/pointer.png)bin222 -> 222 bytes
-rw-r--r--src/widgets/symbian/images/sizeall.png (renamed from src/gui/symbian/images/sizeall.png)bin188 -> 188 bytes
-rw-r--r--src/widgets/symbian/images/sizebdiag.png (renamed from src/gui/symbian/images/sizebdiag.png)bin192 -> 192 bytes
-rw-r--r--src/widgets/symbian/images/sizefdiag.png (renamed from src/gui/symbian/images/sizefdiag.png)bin197 -> 197 bytes
-rw-r--r--src/widgets/symbian/images/sizehor.png (renamed from src/gui/symbian/images/sizehor.png)bin175 -> 175 bytes
-rw-r--r--src/widgets/symbian/images/sizever.png (renamed from src/gui/symbian/images/sizever.png)bin171 -> 171 bytes
-rw-r--r--src/widgets/symbian/images/splith.png (renamed from src/gui/symbian/images/splith.png)bin206 -> 206 bytes
-rw-r--r--src/widgets/symbian/images/splitv.png (renamed from src/gui/symbian/images/splitv.png)bin205 -> 205 bytes
-rw-r--r--src/widgets/symbian/images/uparrow.png (renamed from src/gui/symbian/images/uparrow.png)bin157 -> 157 bytes
-rw-r--r--src/widgets/symbian/images/wait1.png (renamed from src/gui/symbian/images/wait1.png)bin219 -> 219 bytes
-rw-r--r--src/widgets/symbian/images/wait10.png (renamed from src/gui/symbian/images/wait10.png)bin220 -> 220 bytes
-rw-r--r--src/widgets/symbian/images/wait11.png (renamed from src/gui/symbian/images/wait11.png)bin220 -> 220 bytes
-rw-r--r--src/widgets/symbian/images/wait12.png (renamed from src/gui/symbian/images/wait12.png)bin213 -> 213 bytes
-rw-r--r--src/widgets/symbian/images/wait2.png (renamed from src/gui/symbian/images/wait2.png)bin219 -> 219 bytes
-rw-r--r--src/widgets/symbian/images/wait3.png (renamed from src/gui/symbian/images/wait3.png)bin210 -> 210 bytes
-rw-r--r--src/widgets/symbian/images/wait4.png (renamed from src/gui/symbian/images/wait4.png)bin215 -> 215 bytes
-rw-r--r--src/widgets/symbian/images/wait5.png (renamed from src/gui/symbian/images/wait5.png)bin217 -> 217 bytes
-rw-r--r--src/widgets/symbian/images/wait6.png (renamed from src/gui/symbian/images/wait6.png)bin213 -> 213 bytes
-rw-r--r--src/widgets/symbian/images/wait7.png (renamed from src/gui/symbian/images/wait7.png)bin215 -> 215 bytes
-rw-r--r--src/widgets/symbian/images/wait8.png (renamed from src/gui/symbian/images/wait8.png)bin217 -> 217 bytes
-rw-r--r--src/widgets/symbian/images/wait9.png (renamed from src/gui/symbian/images/wait9.png)bin209 -> 209 bytes
-rw-r--r--src/widgets/symbian/images/whatsthis.png (renamed from src/gui/symbian/images/whatsthis.png)bin254 -> 254 bytes
-rw-r--r--src/widgets/symbian/qsymbianevent.cpp (renamed from src/gui/symbian/qsymbianevent.cpp)0
-rw-r--r--src/widgets/symbian/qsymbianevent.h (renamed from src/gui/symbian/qsymbianevent.h)0
-rw-r--r--src/widgets/symbian/symbianresources.qrc (renamed from src/gui/symbian/symbianresources.qrc)0
-rw-r--r--src/widgets/to_be_moved/qlinecontrol.cpp (renamed from src/gui/widgets/qlinecontrol.cpp)0
-rw-r--r--src/widgets/to_be_moved/qlinecontrol_p.h462
-rw-r--r--src/widgets/to_be_moved/qshortcut.cpp (renamed from src/gui/kernel/qshortcut.cpp)0
-rw-r--r--src/widgets/to_be_moved/qshortcut.h107
-rw-r--r--src/widgets/to_be_moved/qshortcutmap.cpp897
-rw-r--r--src/widgets/to_be_moved/qshortcutmap_p.h (renamed from src/gui/kernel/qshortcutmap_p.h)0
-rw-r--r--src/widgets/to_be_moved/qtextcontrol.cpp3148
-rw-r--r--src/widgets/to_be_moved/qtextcontrol_p.h307
-rw-r--r--src/widgets/to_be_moved/qtextcontrol_p_p.h238
-rw-r--r--src/widgets/to_be_moved/to_be_moved.pri12
-rw-r--r--src/widgets/util/qcompleter.cpp1833
-rw-r--r--src/widgets/util/qcompleter.h (renamed from src/gui/util/qcompleter.h)0
-rw-r--r--src/widgets/util/qcompleter_p.h264
-rw-r--r--src/widgets/util/qflickgesture.cpp (renamed from src/gui/util/qflickgesture.cpp)0
-rw-r--r--src/widgets/util/qflickgesture_p.h (renamed from src/gui/util/qflickgesture_p.h)0
-rw-r--r--src/widgets/util/qscroller.cpp (renamed from src/gui/util/qscroller.cpp)0
-rw-r--r--src/widgets/util/qscroller.h155
-rw-r--r--src/widgets/util/qscroller_mac.mm (renamed from src/gui/util/qscroller_mac.mm)0
-rw-r--r--src/widgets/util/qscroller_p.h (renamed from src/gui/util/qscroller_p.h)0
-rw-r--r--src/widgets/util/qscrollerproperties.cpp (renamed from src/gui/util/qscrollerproperties.cpp)0
-rw-r--r--src/widgets/util/qscrollerproperties.h (renamed from src/gui/util/qscrollerproperties.h)0
-rw-r--r--src/widgets/util/qscrollerproperties_p.h (renamed from src/gui/util/qscrollerproperties_p.h)0
-rw-r--r--src/widgets/util/qsystemtrayicon.cpp (renamed from src/gui/util/qsystemtrayicon.cpp)0
-rw-r--r--src/widgets/util/qsystemtrayicon.h132
-rw-r--r--src/widgets/util/qsystemtrayicon_mac.mm (renamed from src/gui/util/qsystemtrayicon_mac.mm)0
-rw-r--r--src/widgets/util/qsystemtrayicon_p.h186
-rw-r--r--src/widgets/util/qsystemtrayicon_qpa.cpp (renamed from src/gui/util/qsystemtrayicon_qws.cpp)0
-rw-r--r--src/widgets/util/qsystemtrayicon_win.cpp (renamed from src/gui/util/qsystemtrayicon_win.cpp)0
-rw-r--r--src/widgets/util/qsystemtrayicon_wince.cpp (renamed from src/gui/util/qsystemtrayicon_wince.cpp)0
-rw-r--r--src/widgets/util/qsystemtrayicon_x11.cpp (renamed from src/gui/util/qsystemtrayicon_x11.cpp)0
-rw-r--r--src/widgets/util/qundogroup.cpp (renamed from src/gui/util/qundogroup.cpp)0
-rw-r--r--src/widgets/util/qundogroup.h (renamed from src/gui/util/qundogroup.h)0
-rw-r--r--src/widgets/util/qundostack.cpp (renamed from src/gui/util/qundostack.cpp)0
-rw-r--r--src/widgets/util/qundostack.h (renamed from src/gui/util/qundostack.h)0
-rw-r--r--src/widgets/util/qundostack_p.h114
-rw-r--r--src/widgets/util/qundoview.cpp476
-rw-r--r--src/widgets/util/qundoview.h102
-rw-r--r--src/widgets/util/util.pri69
-rw-r--r--src/widgets/widgets.pro226
-rw-r--r--src/widgets/widgets/qabstractbutton.cpp (renamed from src/gui/widgets/qabstractbutton.cpp)0
-rw-r--r--src/widgets/widgets/qabstractbutton.h180
-rw-r--r--src/widgets/widgets/qabstractbutton_p.h (renamed from src/gui/widgets/qabstractbutton_p.h)0
-rw-r--r--src/widgets/widgets/qabstractscrollarea.cpp (renamed from src/gui/widgets/qabstractscrollarea.cpp)0
-rw-r--r--src/widgets/widgets/qabstractscrollarea.h144
-rw-r--r--src/widgets/widgets/qabstractscrollarea_p.h (renamed from src/gui/widgets/qabstractscrollarea_p.h)0
-rw-r--r--src/widgets/widgets/qabstractslider.cpp (renamed from src/gui/widgets/qabstractslider.cpp)0
-rw-r--r--src/widgets/widgets/qabstractslider.h184
-rw-r--r--src/widgets/widgets/qabstractslider_p.h (renamed from src/gui/widgets/qabstractslider_p.h)0
-rw-r--r--src/widgets/widgets/qabstractspinbox.cpp (renamed from src/gui/widgets/qabstractspinbox.cpp)0
-rw-r--r--src/widgets/widgets/qabstractspinbox.h181
-rw-r--r--src/widgets/widgets/qabstractspinbox_p.h170
-rw-r--r--src/widgets/widgets/qbuttongroup.cpp (renamed from src/gui/widgets/qbuttongroup.cpp)0
-rw-r--r--src/widgets/widgets/qbuttongroup.h (renamed from src/gui/widgets/qbuttongroup.h)0
-rw-r--r--src/widgets/widgets/qcalendartextnavigator_p.h (renamed from src/gui/widgets/qcalendartextnavigator_p.h)0
-rw-r--r--src/widgets/widgets/qcalendarwidget.cpp (renamed from src/gui/widgets/qcalendarwidget.cpp)0
-rw-r--r--src/widgets/widgets/qcalendarwidget.h204
-rw-r--r--src/widgets/widgets/qcheckbox.cpp (renamed from src/gui/widgets/qcheckbox.cpp)0
-rw-r--r--src/widgets/widgets/qcheckbox.h114
-rw-r--r--src/widgets/widgets/qcocoamenu_mac.mm (renamed from src/gui/widgets/qcocoamenu_mac.mm)0
-rw-r--r--src/widgets/widgets/qcocoamenu_mac_p.h (renamed from src/gui/widgets/qcocoamenu_mac_p.h)0
-rw-r--r--src/widgets/widgets/qcocoatoolbardelegate_mac.mm (renamed from src/gui/widgets/qcocoatoolbardelegate_mac.mm)0
-rw-r--r--src/widgets/widgets/qcocoatoolbardelegate_mac_p.h (renamed from src/gui/widgets/qcocoatoolbardelegate_mac_p.h)0
-rw-r--r--src/widgets/widgets/qcombobox.cpp (renamed from src/gui/widgets/qcombobox.cpp)0
-rw-r--r--src/widgets/widgets/qcombobox.h339
-rw-r--r--src/widgets/widgets/qcombobox_p.h421
-rw-r--r--src/widgets/widgets/qcommandlinkbutton.cpp (renamed from src/gui/widgets/qcommandlinkbutton.cpp)0
-rw-r--r--src/widgets/widgets/qcommandlinkbutton.h85
-rw-r--r--src/widgets/widgets/qdatetimeedit.cpp (renamed from src/gui/widgets/qdatetimeedit.cpp)0
-rw-r--r--src/widgets/widgets/qdatetimeedit.h230
-rw-r--r--src/widgets/widgets/qdatetimeedit_p.h185
-rw-r--r--src/widgets/widgets/qdial.cpp (renamed from src/gui/widgets/qdial.cpp)0
-rw-r--r--src/widgets/widgets/qdial.h122
-rw-r--r--src/widgets/widgets/qdialogbuttonbox.cpp1285
-rw-r--r--src/widgets/widgets/qdialogbuttonbox.h168
-rw-r--r--src/widgets/widgets/qdockarealayout.cpp3329
-rw-r--r--src/widgets/widgets/qdockarealayout_p.h308
-rw-r--r--src/widgets/widgets/qdockwidget.cpp (renamed from src/gui/widgets/qdockwidget.cpp)0
-rw-r--r--src/widgets/widgets/qdockwidget.h146
-rw-r--r--src/widgets/widgets/qdockwidget_p.h207
-rw-r--r--src/widgets/widgets/qeffects.cpp (renamed from src/gui/widgets/qeffects.cpp)0
-rw-r--r--src/widgets/widgets/qeffects_p.h (renamed from src/gui/widgets/qeffects_p.h)0
-rw-r--r--src/widgets/widgets/qfocusframe.cpp (renamed from src/gui/widgets/qfocusframe.cpp)0
-rw-r--r--src/widgets/widgets/qfocusframe.h82
-rw-r--r--src/widgets/widgets/qfontcombobox.cpp (renamed from src/gui/widgets/qfontcombobox.cpp)0
-rw-r--r--src/widgets/widgets/qfontcombobox.h112
-rw-r--r--src/widgets/widgets/qframe.cpp (renamed from src/gui/widgets/qframe.cpp)0
-rw-r--r--src/widgets/widgets/qframe.h148
-rw-r--r--src/widgets/widgets/qframe_p.h (renamed from src/gui/widgets/qframe_p.h)0
-rw-r--r--src/widgets/widgets/qgroupbox.cpp (renamed from src/gui/widgets/qgroupbox.cpp)0
-rw-r--r--src/widgets/widgets/qgroupbox.h122
-rw-r--r--src/widgets/widgets/qlabel.cpp (renamed from src/gui/widgets/qlabel.cpp)0
-rw-r--r--src/widgets/widgets/qlabel.h182
-rw-r--r--src/widgets/widgets/qlabel_p.h (renamed from src/gui/widgets/qlabel_p.h)0
-rw-r--r--src/widgets/widgets/qlcdnumber.cpp (renamed from src/gui/widgets/qlcdnumber.cpp)0
-rw-r--r--src/widgets/widgets/qlcdnumber.h144
-rw-r--r--src/widgets/widgets/qlineedit.cpp (renamed from src/gui/widgets/qlineedit.cpp)0
-rw-r--r--src/widgets/widgets/qlineedit.h300
-rw-r--r--src/widgets/widgets/qlineedit_p.cpp293
-rw-r--r--src/widgets/widgets/qlineedit_p.h155
-rw-r--r--src/widgets/widgets/qmaccocoaviewcontainer_mac.h73
-rw-r--r--src/widgets/widgets/qmaccocoaviewcontainer_mac.mm (renamed from src/gui/widgets/qmaccocoaviewcontainer_mac.mm)0
-rw-r--r--src/widgets/widgets/qmacnativewidget_mac.h74
-rw-r--r--src/widgets/widgets/qmacnativewidget_mac.mm (renamed from src/gui/widgets/qmacnativewidget_mac.mm)0
-rw-r--r--src/widgets/widgets/qmainwindow.cpp (renamed from src/gui/widgets/qmainwindow.cpp)0
-rw-r--r--src/widgets/widgets/qmainwindow.h219
-rw-r--r--src/widgets/widgets/qmainwindowlayout.cpp (renamed from src/gui/widgets/qmainwindowlayout.cpp)0
-rw-r--r--src/widgets/widgets/qmainwindowlayout_mac.mm (renamed from src/gui/widgets/qmainwindowlayout_mac.mm)0
-rw-r--r--src/widgets/widgets/qmainwindowlayout_p.h357
-rw-r--r--src/widgets/widgets/qmdiarea.cpp (renamed from src/gui/widgets/qmdiarea.cpp)0
-rw-r--r--src/widgets/widgets/qmdiarea.h179
-rw-r--r--src/widgets/widgets/qmdiarea_p.h285
-rw-r--r--src/widgets/widgets/qmdisubwindow.cpp (renamed from src/gui/widgets/qmdisubwindow.cpp)0
-rw-r--r--src/widgets/widgets/qmdisubwindow.h159
-rw-r--r--src/widgets/widgets/qmdisubwindow_p.h (renamed from src/gui/widgets/qmdisubwindow_p.h)0
-rw-r--r--src/widgets/widgets/qmenu.cpp (renamed from src/gui/widgets/qmenu.cpp)0
-rw-r--r--src/widgets/widgets/qmenu.h434
-rw-r--r--src/widgets/widgets/qmenu_mac.mm (renamed from src/gui/widgets/qmenu_mac.mm)0
-rw-r--r--src/widgets/widgets/qmenu_p.h395
-rw-r--r--src/widgets/widgets/qmenu_symbian.cpp (renamed from src/gui/widgets/qmenu_symbian.cpp)0
-rw-r--r--src/widgets/widgets/qmenu_wince.cpp (renamed from src/gui/widgets/qmenu_wince.cpp)0
-rw-r--r--src/widgets/widgets/qmenu_wince.rc (renamed from src/gui/widgets/qmenu_wince.rc)0
-rw-r--r--src/widgets/widgets/qmenu_wince_resource_p.h (renamed from src/gui/widgets/qmenu_wince_resource_p.h)0
-rw-r--r--src/widgets/widgets/qmenubar.cpp (renamed from src/gui/widgets/qmenubar.cpp)0
-rw-r--r--src/widgets/widgets/qmenubar.h367
-rw-r--r--src/widgets/widgets/qmenubar_p.h283
-rw-r--r--src/widgets/widgets/qmenudata.cpp (renamed from src/gui/widgets/qmenudata.cpp)0
-rw-r--r--src/widgets/widgets/qmenudata.h80
-rw-r--r--src/widgets/widgets/qplaintextedit.cpp (renamed from src/gui/widgets/qplaintextedit.cpp)0
-rw-r--r--src/widgets/widgets/qplaintextedit.h329
-rw-r--r--src/widgets/widgets/qplaintextedit_p.h187
-rw-r--r--src/widgets/widgets/qprintpreviewwidget.cpp844
-rw-r--r--src/widgets/widgets/qprintpreviewwidget.h127
-rw-r--r--src/widgets/widgets/qprogressbar.cpp (renamed from src/gui/widgets/qprogressbar.cpp)0
-rw-r--r--src/widgets/widgets/qprogressbar.h132
-rw-r--r--src/widgets/widgets/qpushbutton.cpp (renamed from src/gui/widgets/qpushbutton.cpp)0
-rw-r--r--src/widgets/widgets/qpushbutton.h127
-rw-r--r--src/widgets/widgets/qpushbutton_p.h (renamed from src/gui/widgets/qpushbutton_p.h)0
-rw-r--r--src/widgets/widgets/qradiobutton.cpp (renamed from src/gui/widgets/qradiobutton.cpp)0
-rw-r--r--src/widgets/widgets/qradiobutton.h89
-rw-r--r--src/widgets/widgets/qrubberband.cpp (renamed from src/gui/widgets/qrubberband.cpp)0
-rw-r--r--src/widgets/widgets/qrubberband.h104
-rw-r--r--src/widgets/widgets/qscrollarea.cpp (renamed from src/gui/widgets/qscrollarea.cpp)0
-rw-r--r--src/widgets/widgets/qscrollarea.h101
-rw-r--r--src/widgets/widgets/qscrollarea_p.h81
-rw-r--r--src/widgets/widgets/qscrollbar.cpp (renamed from src/gui/widgets/qscrollbar.cpp)0
-rw-r--r--src/widgets/widgets/qscrollbar.h104
-rw-r--r--src/widgets/widgets/qsizegrip.cpp570
-rw-r--r--src/widgets/widgets/qsizegrip.h95
-rw-r--r--src/widgets/widgets/qslider.cpp (renamed from src/gui/widgets/qslider.cpp)0
-rw-r--r--src/widgets/widgets/qslider.h134
-rw-r--r--src/widgets/widgets/qspinbox.cpp (renamed from src/gui/widgets/qspinbox.cpp)0
-rw-r--r--src/widgets/widgets/qspinbox.h188
-rw-r--r--src/widgets/widgets/qsplashscreen.cpp (renamed from src/gui/widgets/qsplashscreen.cpp)0
-rw-r--r--src/widgets/widgets/qsplashscreen.h99
-rw-r--r--src/widgets/widgets/qsplitter.cpp (renamed from src/gui/widgets/qsplitter.cpp)0
-rw-r--r--src/widgets/widgets/qsplitter.h192
-rw-r--r--src/widgets/widgets/qsplitter_p.h (renamed from src/gui/widgets/qsplitter_p.h)0
-rw-r--r--src/widgets/widgets/qstackedwidget.cpp (renamed from src/gui/widgets/qstackedwidget.cpp)0
-rw-r--r--src/widgets/widgets/qstackedwidget.h100
-rw-r--r--src/widgets/widgets/qstatusbar.cpp (renamed from src/gui/widgets/qstatusbar.cpp)0
-rw-r--r--src/widgets/widgets/qstatusbar.h116
-rw-r--r--src/widgets/widgets/qtabbar.cpp (renamed from src/gui/widgets/qtabbar.cpp)0
-rw-r--r--src/widgets/widgets/qtabbar.h226
-rw-r--r--src/widgets/widgets/qtabbar_p.h (renamed from src/gui/widgets/qtabbar_p.h)0
-rw-r--r--src/widgets/widgets/qtabwidget.cpp (renamed from src/gui/widgets/qtabwidget.cpp)0
-rw-r--r--src/widgets/widgets/qtabwidget.h253
-rw-r--r--src/widgets/widgets/qtextbrowser.cpp (renamed from src/gui/widgets/qtextbrowser.cpp)0
-rw-r--r--src/widgets/widgets/qtextbrowser.h140
-rw-r--r--src/widgets/widgets/qtextedit.cpp (renamed from src/gui/widgets/qtextedit.cpp)0
-rw-r--r--src/widgets/widgets/qtextedit.h431
-rw-r--r--src/widgets/widgets/qtextedit_p.h141
-rw-r--r--src/widgets/widgets/qtoolbar.cpp (renamed from src/gui/widgets/qtoolbar.cpp)0
-rw-r--r--src/widgets/widgets/qtoolbar.h188
-rw-r--r--src/widgets/widgets/qtoolbar_p.h135
-rw-r--r--src/widgets/widgets/qtoolbararealayout.cpp (renamed from src/gui/widgets/qtoolbararealayout.cpp)0
-rw-r--r--src/widgets/widgets/qtoolbararealayout_p.h (renamed from src/gui/widgets/qtoolbararealayout_p.h)0
-rw-r--r--src/widgets/widgets/qtoolbarextension.cpp (renamed from src/gui/widgets/qtoolbarextension.cpp)0
-rw-r--r--src/widgets/widgets/qtoolbarextension_p.h80
-rw-r--r--src/widgets/widgets/qtoolbarlayout.cpp (renamed from src/gui/widgets/qtoolbarlayout.cpp)0
-rw-r--r--src/widgets/widgets/qtoolbarlayout_p.h134
-rw-r--r--src/widgets/widgets/qtoolbarseparator.cpp (renamed from src/gui/widgets/qtoolbarseparator.cpp)0
-rw-r--r--src/widgets/widgets/qtoolbarseparator_p.h88
-rw-r--r--src/widgets/widgets/qtoolbox.cpp (renamed from src/gui/widgets/qtoolbox.cpp)0
-rw-r--r--src/widgets/widgets/qtoolbox.h148
-rw-r--r--src/widgets/widgets/qtoolbutton.cpp (renamed from src/gui/widgets/qtoolbutton.cpp)0
-rw-r--r--src/widgets/widgets/qtoolbutton.h199
-rw-r--r--src/widgets/widgets/qwidgetanimator.cpp117
-rw-r--r--src/widgets/widgets/qwidgetanimator_p.h (renamed from src/gui/widgets/qwidgetanimator_p.h)0
-rw-r--r--src/widgets/widgets/qwidgetresizehandler.cpp (renamed from src/gui/widgets/qwidgetresizehandler.cpp)0
-rw-r--r--src/widgets/widgets/qwidgetresizehandler_p.h (renamed from src/gui/widgets/qwidgetresizehandler_p.h)0
-rw-r--r--src/widgets/widgets/qworkspace.cpp (renamed from src/gui/widgets/qworkspace.cpp)0
-rw-r--r--src/widgets/widgets/qworkspace.h137
-rw-r--r--src/widgets/widgets/widgets.pri165
1815 files changed, 160653 insertions, 252966 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 3cc12aaf82..fda58336eb 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -856,7 +856,9 @@ namespace QT_NAMESPACE {}
WIN16 - unsupported
*/
-#if defined(Q_OS_MSDOS)
+#if defined (Q_WS_QPA)
+
+#elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
# error "Qt requires Win32 and does not work with Windows 3.x"
#elif defined(_WIN32_X11_)
@@ -1139,7 +1141,7 @@ redefine to built-in booleans to make autotests work properly */
//defines the type for the WNDPROC on windows
//the alignment needs to be forced for sse2 to not crash with mingw
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
# if defined(Q_CC_MINGW)
# define QT_ENSURE_STACK_ALIGNED_FOR_SSE __attribute__ ((force_align_arg_pointer))
# else
@@ -1560,7 +1562,7 @@ public:
#else
# error "Qt not configured correctly, please run configure"
#endif
-#if defined(Q_WS_WIN) || defined(Q_OS_CYGWIN)
+#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
enum WinVersion {
WV_32s = 0x0001,
WV_95 = 0x0002,
@@ -1669,7 +1671,7 @@ inline QT3_SUPPORT bool qSysInfo(int *wordSize, bool *bigEndian)
}
#endif
-#if defined(Q_WS_WIN) || defined(Q_OS_CYGWIN)
+#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
#if defined(QT3_SUPPORT)
inline QT3_SUPPORT bool qt_winUnicode() { return true; }
inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; }
@@ -1679,7 +1681,7 @@ inline QT3_SUPPORT int qWinVersion() { return QSysInfo::WindowsVersion; }
#define QT_WA(unicode, ansi) unicode
#define QT_WA_INLINE(unicode, ansi) (unicode)
-#endif /* Q_WS_WIN */
+#endif /* Q_OS_WIN */
#ifndef Q_OUTOFLINE_TEMPLATE
# define Q_OUTOFLINE_TEMPLATE
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 99479d0b63..70f13cf79f 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -272,13 +272,13 @@ public:
Window = 0x00000001,
Dialog = 0x00000002 | Window,
Sheet = 0x00000004 | Window,
- Drawer = 0x00000006 | Window,
+ Drawer = Sheet | Dialog,
Popup = 0x00000008 | Window,
- Tool = 0x0000000a | Window,
- ToolTip = 0x0000000c | Window,
- SplashScreen = 0x0000000e | Window,
+ Tool = Popup | Dialog,
+ ToolTip = Popup | Sheet,
+ SplashScreen = ToolTip | Dialog,
Desktop = 0x00000010 | Window,
- SubWindow = 0x00000012,
+ SubWindow = Desktop | Dialog,
WindowType_Mask = 0x000000ff,
MSWindowsFixedSizeDialogHint = 0x00000100,
@@ -293,13 +293,7 @@ public:
WindowContextHelpButtonHint = 0x00010000,
WindowShadeButtonHint = 0x00020000,
WindowStaysOnTopHint = 0x00040000,
- // reserved for Qt3Support:
- // WMouseNoMask = 0x00080000,
- // WDestructiveClose = 0x00100000,
- // WStaticContents = 0x00200000,
- // WGroupLeader = 0x00400000,
- // WShowModal = 0x00800000,
- // WNoMousePropagation = 0x01000000,
+
CustomizeWindowHint = 0x02000000,
WindowStaysOnBottomHint = 0x04000000,
WindowCloseButtonHint = 0x08000000,
@@ -309,56 +303,6 @@ public:
WindowCancelButtonHint = 0x00100000,
WindowSoftkeysVisibleHint = 0x40000000,
WindowSoftkeysRespondHint = 0x80000000
-
-#ifdef QT3_SUPPORT
- ,
- WMouseNoMask = 0x00080000,
- WDestructiveClose = 0x00100000,
- WStaticContents = 0x00200000,
- WGroupLeader = 0x00400000,
- WShowModal = 0x00800000,
- WNoMousePropagation = 0x01000000,
-
- WType_TopLevel = Window,
- WType_Dialog = Dialog,
- WType_Popup = Popup,
- WType_Desktop = Desktop,
- WType_Mask = WindowType_Mask,
-
- WStyle_Customize = 0,
- WStyle_NormalBorder = 0,
- WStyle_DialogBorder = MSWindowsFixedSizeDialogHint,
- WStyle_NoBorder = FramelessWindowHint,
- WStyle_Title = WindowTitleHint,
- WStyle_SysMenu = WindowSystemMenuHint,
- WStyle_Minimize = WindowMinimizeButtonHint,
- WStyle_Maximize = WindowMaximizeButtonHint,
- WStyle_MinMax = WStyle_Minimize | WStyle_Maximize,
- WStyle_Tool = Tool,
- WStyle_StaysOnTop = WindowStaysOnTopHint,
- WStyle_ContextHelp = WindowContextHelpButtonHint,
-
- // misc flags
- WPaintDesktop = 0,
- WPaintClever = 0,
-
- WX11BypassWM = X11BypassWindowManagerHint,
- WWinOwnDC = MSWindowsOwnDC,
- WMacSheet = Sheet,
- WMacDrawer = Drawer,
-
- WStyle_Splash = SplashScreen,
-
- WNoAutoErase = 0,
- WRepaintNoErase = 0,
- WNorthWestGravity = WStaticContents,
- WType_Modal = Dialog | WShowModal,
- WStyle_Dialog = Dialog,
- WStyle_NoBorderEx = FramelessWindowHint,
- WResizeNoErase = 0,
- WMacNoSheet = 0
-#endif
-
};
Q_DECLARE_FLAGS(WindowFlags, WindowType)
diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h
index 738026a9ed..0926e02af1 100644
--- a/src/corelib/global/qt_pch.h
+++ b/src/corelib/global/qt_pch.h
@@ -50,7 +50,7 @@
#if defined __cplusplus
#include <qglobal.h>
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
# define _POSIX_
# include <limits.h>
# undef _POSIX_
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index b31cf69e26..9426618875 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -1746,7 +1746,7 @@ QFileInfoList QDir::drives()
*/
QChar QDir::separator()
{
-#if defined (Q_FS_FAT) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
+#if defined (Q_FS_FAT) || defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
return QLatin1Char('\\');
#elif defined(Q_OS_UNIX)
return QLatin1Char('/');
diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h
index 79dda1b70a..89c08aeca7 100644
--- a/src/corelib/io/qfsfileengine_p.h
+++ b/src/corelib/io/qfsfileengine_p.h
@@ -77,7 +77,7 @@ class Q_AUTOTEST_EXPORT QFSFileEnginePrivate : public QAbstractFileEnginePrivate
Q_DECLARE_PUBLIC(QFSFileEngine)
public:
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
static QString longFileName(const QString &path);
#endif
@@ -143,7 +143,7 @@ public:
int getMapHandle();
#endif
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
HANDLE fileHandle;
HANDLE mapHandle;
QHash<uchar *, DWORD /* offset % AllocationGranularity */> maps;
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 70a70c27d8..a14c4fdc7d 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -93,7 +93,7 @@ QT_END_NAMESPACE
#include <qsocketnotifier.h>
#include <qtimer.h>
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
#include <private/qwineventnotifier_p.h>
#endif
@@ -764,10 +764,10 @@ QProcessPrivate::QProcessPrivate()
dying = false;
emittedReadyRead = false;
emittedBytesWritten = false;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
pipeWriter = 0;
processFinishedNotifier = 0;
-#endif // Q_WS_WIN
+#endif // Q_OS_WIN
#ifdef Q_OS_UNIX
serial = 0;
#endif
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index a8c40c5180..19a33d9637 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -171,7 +171,7 @@ CApaCommandLine* QCoreApplicationPrivate::symbianCommandLine()
#endif
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined(Q_OS_WIN) || defined(Q_WS_MAC)
extern QString qAppFileName();
#endif
@@ -596,23 +596,6 @@ void QCoreApplication::flush()
\a argc must be greater than zero and \a argv must contain at least
one valid character string.
*/
-QCoreApplication::QCoreApplication(int &argc, char **argv)
- : QObject(*new QCoreApplicationPrivate(argc, argv, 0x040000))
-{
- init();
- QCoreApplicationPrivate::eventDispatcher->startingUp();
-#if defined(Q_OS_SYMBIAN) && !defined(QT_NO_LIBRARY)
- // Refresh factoryloader, as text codecs are requested during lib path
- // resolving process and won't be therefore properly loaded.
- // Unknown if this is symbian specific issue.
- QFactoryLoader::refreshAll();
-#endif
-
-#if defined(Q_OS_SYMBIAN) && !defined(QT_NO_SYSTEMLOCALE)
- d_func()->symbianInit();
-#endif
-}
-
QCoreApplication::QCoreApplication(int &argc, char **argv, int _internal)
: QObject(*new QCoreApplicationPrivate(argc, argv, _internal))
{
@@ -1302,7 +1285,7 @@ void QCoreApplication::postEvent(QObject *receiver, QEvent *event, int priority)
*/
bool QCoreApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventList *postedEvents)
{
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
Q_ASSERT(event);
Q_ASSERT(receiver);
Q_ASSERT(postedEvents);
@@ -2008,7 +1991,7 @@ QString QCoreApplication::applicationFilePath()
if (!d->cachedApplicationFilePath.isNull())
return d->cachedApplicationFilePath;
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
d->cachedApplicationFilePath = QFileInfo(qAppFileName()).filePath();
return d->cachedApplicationFilePath;
#elif defined(Q_WS_MAC)
@@ -2203,7 +2186,6 @@ QStringList QCoreApplication::arguments()
;
else if (l1arg == "-style" ||
l1arg == "-session" ||
- l1arg == "-graphicssystem" ||
l1arg == "-testability")
++a;
else
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index d4356e3e36..1ccc84b658 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -50,7 +50,7 @@
#include <QtCore/qstringlist.h>
#endif
-#if defined(Q_WS_WIN) && !defined(tagMSG)
+#if defined(Q_OS_WIN) && !defined(tagMSG)
typedef struct tagMSG MSG;
#endif
@@ -84,16 +84,7 @@ public:
#endif
};
-#if defined(QT_BUILD_CORE_LIB) || defined(qdoc)
- QCoreApplication(int &argc, char **argv); // ### Qt5 remove
-#endif
-#if !defined(qdoc)
- QCoreApplication(int &argc, char **argv, int
-#if !defined(QT_BUILD_CORE_LIB)
- = ApplicationFlags
-#endif
- );
-#endif
+ QCoreApplication(int &argc, char **argv, int = ApplicationFlags);
~QCoreApplication();
@@ -177,7 +168,7 @@ public:
static QT3_SUPPORT int loopLevel();
#endif
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
virtual bool winEventFilter(MSG *message, long *result);
#endif
@@ -218,10 +209,13 @@ private:
friend class QEventDispatcherUNIXPrivate;
friend class QApplication;
friend class QApplicationPrivate;
+ friend class QGuiApplication;
+ friend class QGuiApplicationPrivate;
friend class QETWidget;
friend class Q3AccelManager;
friend class QShortcutMap;
friend class QWidget;
+ friend class QWidgetWindow;
friend class QWidgetPrivate;
friend bool qt_sendSpontaneousEvent(QObject*, QEvent*);
friend Q_CORE_EXPORT QString qAppName();
@@ -286,7 +280,7 @@ Q_CORE_EXPORT void qAddPostRoutine(QtCleanUpFunction);
Q_CORE_EXPORT void qRemovePostRoutine(QtCleanUpFunction);
Q_CORE_EXPORT QString qAppName(); // get application name
-#if defined(Q_WS_WIN) && !defined(QT_NO_DEBUG_STREAM)
+#if defined(Q_OS_WIN) && !defined(QT_NO_DEBUG_STREAM)
Q_CORE_EXPORT QString decodeMSG(const MSG &);
Q_CORE_EXPORT QDebug operator<<(QDebug, const MSG &);
#endif
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp
index 6a77a74861..cb6d39a481 100644
--- a/src/corelib/kernel/qcoreapplication_win.cpp
+++ b/src/corelib/kernel/qcoreapplication_win.cpp
@@ -240,7 +240,7 @@ void QCoreApplicationPrivate::removePostedTimerEvent(QObject *object, int timerI
}
}
-#if defined(Q_WS_WIN) && !defined(QT_NO_DEBUG_STREAM)
+#if defined(Q_OS_WIN) && !defined(QT_NO_DEBUG_STREAM)
/*****************************************************************************
Convenience functions for convert WM_* messages into human readable strings,
including a nifty QDebug operator<< for simpel QDebug() << msg output.
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 84663fa5ea..d80b0ef560 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -306,7 +306,7 @@ public:
typedef QList<WinTimerInfo*> WinTimerVec; // vector of TimerInfo structs
typedef QHash<int, WinTimerInfo*> WinTimerDict; // fast dict of timers
-#if !defined(DWORD_PTR) && !defined(Q_WS_WIN64)
+#if !defined(DWORD_PTR) && !defined(Q_OS_WIN64)
#define DWORD_PTR DWORD
#endif
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index fcc8a65a11..e5ef021ed1 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -265,19 +265,16 @@ static const struct { const char * typeName; int typeNameLength; int type; } typ
QT_ADD_STATIC_METATYPE("QEasingCurve", QMetaType::QEasingCurve),
/* All GUI types */
- QT_ADD_STATIC_METATYPE("QColorGroup", 63),
QT_ADD_STATIC_METATYPE("QFont", QMetaType::QFont),
QT_ADD_STATIC_METATYPE("QPixmap", QMetaType::QPixmap),
QT_ADD_STATIC_METATYPE("QBrush", QMetaType::QBrush),
QT_ADD_STATIC_METATYPE("QColor", QMetaType::QColor),
QT_ADD_STATIC_METATYPE("QPalette", QMetaType::QPalette),
- QT_ADD_STATIC_METATYPE("QIcon", QMetaType::QIcon),
QT_ADD_STATIC_METATYPE("QImage", QMetaType::QImage),
QT_ADD_STATIC_METATYPE("QPolygon", QMetaType::QPolygon),
QT_ADD_STATIC_METATYPE("QRegion", QMetaType::QRegion),
QT_ADD_STATIC_METATYPE("QBitmap", QMetaType::QBitmap),
QT_ADD_STATIC_METATYPE("QCursor", QMetaType::QCursor),
- QT_ADD_STATIC_METATYPE("QSizePolicy", QMetaType::QSizePolicy),
QT_ADD_STATIC_METATYPE("QKeySequence", QMetaType::QKeySequence),
QT_ADD_STATIC_METATYPE("QPen", QMetaType::QPen),
QT_ADD_STATIC_METATYPE("QTextLength", QMetaType::QTextLength),
@@ -290,6 +287,10 @@ static const struct { const char * typeName; int typeNameLength; int type; } typ
QT_ADD_STATIC_METATYPE("QVector4D", QMetaType::QVector4D),
QT_ADD_STATIC_METATYPE("QQuaternion", QMetaType::QQuaternion),
+ /* All Widgets types */
+ QT_ADD_STATIC_METATYPE("QIcon", QMetaType::QIcon),
+ QT_ADD_STATIC_METATYPE("QSizePolicy", QMetaType::QSizePolicy),
+
/* All Metatype builtins */
QT_ADD_STATIC_METATYPE("void*", QMetaType::VoidStar),
QT_ADD_STATIC_METATYPE("long", QMetaType::Long),
@@ -338,6 +339,7 @@ struct QMetaTypeGuiHelper
#endif
};
Q_CORE_EXPORT const QMetaTypeGuiHelper *qMetaTypeGuiHelper = 0;
+Q_CORE_EXPORT const QMetaTypeGuiHelper *qMetaTypeWidgetsHelper = 0;
class QCustomTypeInfo
{
@@ -399,14 +401,17 @@ void QMetaType::registerStreamOperators(int idx, SaveOperator saveOp,
*/
const char *QMetaType::typeName(int type)
{
- enum { GuiTypeCount = LastGuiType - FirstGuiType };
+ enum { GuiTypeCount = LastGuiType - FirstGuiType,
+ WidgetsTypeCount = LastWidgetsType - FirstWidgetsType };
if (type >= 0 && type <= LastCoreType) {
return types[type].typeName;
} else if (type >= FirstGuiType && type <= LastGuiType) {
return types[type - FirstGuiType + LastCoreType + 1].typeName;
+ } else if (type >= FirstWidgetsType && type <= LastWidgetsType) {
+ return types[type - FirstWidgetsType + GuiTypeCount + LastCoreType + 2].typeName;
} else if (type >= FirstCoreExtType && type <= LastCoreExtType) {
- return types[type - FirstCoreExtType + GuiTypeCount + LastCoreType + 2].typeName;
+ return types[type - FirstCoreExtType + GuiTypeCount + WidgetsTypeCount + LastCoreType + 3].typeName;
} else if (type >= User) {
const QVector<QCustomTypeInfo> * const ct = customTypes();
QReadLocker locker(customTypesLock());
@@ -768,13 +773,11 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data)
case QMetaType::QBrush:
case QMetaType::QColor:
case QMetaType::QPalette:
- case QMetaType::QIcon:
case QMetaType::QImage:
case QMetaType::QPolygon:
case QMetaType::QRegion:
case QMetaType::QBitmap:
case QMetaType::QCursor:
- case QMetaType::QSizePolicy:
case QMetaType::QKeySequence:
case QMetaType::QPen:
case QMetaType::QTextLength:
@@ -790,6 +793,12 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data)
return false;
qMetaTypeGuiHelper[type - FirstGuiType].saveOp(stream, data);
break;
+ case QMetaType::QIcon:
+ case QMetaType::QSizePolicy:
+ if (!qMetaTypeWidgetsHelper)
+ return false;
+ qMetaTypeWidgetsHelper[type - FirstWidgetsType].saveOp(stream, data);
+ break;
default: {
const QVector<QCustomTypeInfo> * const ct = customTypes();
if (!ct)
@@ -973,13 +982,11 @@ bool QMetaType::load(QDataStream &stream, int type, void *data)
case QMetaType::QBrush:
case QMetaType::QColor:
case QMetaType::QPalette:
- case QMetaType::QIcon:
case QMetaType::QImage:
case QMetaType::QPolygon:
case QMetaType::QRegion:
case QMetaType::QBitmap:
case QMetaType::QCursor:
- case QMetaType::QSizePolicy:
case QMetaType::QKeySequence:
case QMetaType::QPen:
case QMetaType::QTextLength:
@@ -995,6 +1002,12 @@ bool QMetaType::load(QDataStream &stream, int type, void *data)
return false;
qMetaTypeGuiHelper[type - FirstGuiType].loadOp(stream, data);
break;
+ case QMetaType::QIcon:
+ case QMetaType::QSizePolicy:
+ if (!qMetaTypeWidgetsHelper)
+ return false;
+ qMetaTypeWidgetsHelper[type - FirstWidgetsType].loadOp(stream, data);
+ break;
default: {
const QVector<QCustomTypeInfo> * const ct = customTypes();
if (!ct)
@@ -1224,6 +1237,10 @@ void *QMetaType::construct(int type, const void *copy)
if (!qMetaTypeGuiHelper)
return 0;
constr = qMetaTypeGuiHelper[type - FirstGuiType].constr;
+ } else if (type >= FirstWidgetsType && type <= LastWidgetsType) {
+ if (!qMetaTypeWidgetsHelper)
+ return 0;
+ constr = qMetaTypeWidgetsHelper[type - FirstWidgetsType].constr;
} else {
const QVector<QCustomTypeInfo> * const ct = customTypes();
QReadLocker locker(customTypesLock());
@@ -1386,6 +1403,12 @@ void QMetaType::destroy(int type, void *data)
if (!qMetaTypeGuiHelper)
return;
destr = qMetaTypeGuiHelper[type - FirstGuiType].destr;
+ } else if (type >= FirstWidgetsType && type <= LastWidgetsType) {
+ Q_ASSERT(qMetaTypeWidgetsHelper);
+
+ if (!qMetaTypeWidgetsHelper)
+ return;
+ destr = qMetaTypeWidgetsHelper[type - FirstWidgetsType].destr;
} else {
QReadLocker locker(customTypesLock());
if (type < User || !ct || ct->count() <= type - User)
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 36131d1815..da59a8fa2b 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -71,18 +71,19 @@ public:
QLine = 23, QLineF = 24, QPoint = 25, QPointF = 26, QRegExp = 27,
QVariantHash = 28, QEasingCurve = 29, LastCoreType = QEasingCurve,
- FirstGuiType = 63 /* QColorGroup */,
-#ifdef QT3_SUPPORT
- QColorGroup = 63,
-#endif
+ FirstGuiType = 64 /* QFont */,
QFont = 64, QPixmap = 65, QBrush = 66, QColor = 67, QPalette = 68,
- QIcon = 69, QImage = 70, QPolygon = 71, QRegion = 72, QBitmap = 73,
- QCursor = 74, QSizePolicy = 75, QKeySequence = 76, QPen = 77,
- QTextLength = 78, QTextFormat = 79, QMatrix = 80, QTransform = 81,
- QMatrix4x4 = 82, QVector2D = 83, QVector3D = 84, QVector4D = 85,
- QQuaternion = 86,
+ QImage = 69, QPolygon = 70, QRegion = 71, QBitmap = 72,
+ QCursor = 73, QKeySequence = 74, QPen = 75,
+ QTextLength = 76, QTextFormat = 77, QMatrix = 78, QTransform = 79,
+ QMatrix4x4 = 80, QVector2D = 81, QVector3D = 82, QVector4D = 83,
+ QQuaternion = 84,
LastGuiType = QQuaternion,
+ FirstWidgetsType = 120, /* QIcon */
+ QIcon = 120, QSizePolicy = 121,
+ LastWidgetsType = QSizePolicy,
+
FirstCoreExtType = 128 /* VoidStar */,
VoidStar = 128, Long = 129, Short = 130, Char = 131, ULong = 132,
UShort = 133, UChar = 134, Float = 135, QObjectStar = 136, QWidgetStar = 137,
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index b88643df5c..a958efd64f 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -157,6 +157,7 @@ QObjectPrivate::QObjectPrivate(int version)
#endif
metaObject = 0;
hasGuards = false;
+ isWindow = false;
}
QObjectPrivate::~QObjectPrivate()
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index 15d81b949a..0fa28c0e63 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -102,7 +102,8 @@ public:
uint inEventHandler : 1; //only used if QT_JAMBI_BUILD
uint inThreadChangeEvent : 1;
uint hasGuards : 1; //true iff there is one or more QPointer attached to this object
- uint unused : 22;
+ uint isWindow : 1; //for QWindow
+ uint unused : 21;
int postedEvents;
QMetaObject *metaObject; // assert dynamic
};
@@ -144,6 +145,7 @@ public:
void setObjectName(const QString &name);
inline bool isWidgetType() const { return d_ptr->isWidget; }
+ inline bool isWindowType() const { return d_ptr->isWindow; }
inline bool signalsBlocked() const { return d_ptr->blockSig; }
bool blockSignals(bool b);
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 268d381848..6aa0fabc2c 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -127,40 +127,33 @@ class Q_CORE_EXPORT QVariant
LastCoreType = EasingCurve,
// value 62 is internally reserved
-#ifdef QT3_SUPPORT
- ColorGroup = 63,
-#endif
Font = 64,
Pixmap = 65,
Brush = 66,
Color = 67,
Palette = 68,
- Icon = 69,
- Image = 70,
- Polygon = 71,
- Region = 72,
- Bitmap = 73,
- Cursor = 74,
- SizePolicy = 75,
- KeySequence = 76,
- Pen = 77,
- TextLength = 78,
- TextFormat = 79,
- Matrix = 80,
- Transform = 81,
- Matrix4x4 = 82,
- Vector2D = 83,
- Vector3D = 84,
- Vector4D = 85,
- Quaternion = 86,
+ Image = 69,
+ Polygon = 70,
+ Region = 71,
+ Bitmap = 72,
+ Cursor = 73,
+ KeySequence = 74,
+ Pen = 75,
+ TextLength = 76,
+ TextFormat = 77,
+ Matrix = 78,
+ Transform = 79,
+ Matrix4x4 = 80,
+ Vector2D = 81,
+ Vector3D = 82,
+ Vector4D = 83,
+ Quaternion = 84,
LastGuiType = Quaternion,
+ Icon = 120,
+ SizePolicy = 121,
+
UserType = 127,
-#ifdef QT3_SUPPORT
- IconSet = Icon,
- CString = ByteArray,
- PointArray = Polygon,
-#endif
LastType = 0xffffffff // need this so that gcc >= 3.4 allocates 32 bits for Type
};
diff --git a/src/corelib/plugin/qlibrary_p.h b/src/corelib/plugin/qlibrary_p.h
index 44860f4b23..4f66bc26a0 100644
--- a/src/corelib/plugin/qlibrary_p.h
+++ b/src/corelib/plugin/qlibrary_p.h
@@ -53,7 +53,7 @@
// We mean it.
//
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
# include "QtCore/qt_windows.h"
#endif
#include "QtCore/qlibrary.h"
@@ -73,7 +73,7 @@ class QLibraryPrivate
{
public:
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
HINSTANCE
#else
void *
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 02a63bb92d..aeb118ffe5 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -176,12 +176,12 @@ QThreadPrivate::QThreadPrivate(QThreadData *d)
{
#if defined (Q_OS_UNIX)
thread_id = 0;
-#elif defined (Q_WS_WIN)
+#elif defined (Q_OS_WIN)
handle = 0;
id = 0;
waiters = 0;
#endif
-#if defined (Q_WS_WIN) || defined (Q_OS_SYMBIAN)
+#if defined (Q_OS_WIN) || defined (Q_OS_SYMBIAN)
terminationEnabled = true;
terminatePending = false;
#endif
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 4303731e40..39141b7c00 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -51,7 +51,7 @@
#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
#include <qt_windows.h>
#endif
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
#include <locale.h>
#endif
@@ -2519,7 +2519,7 @@ QString QDateTime::toString(Qt::DateFormat f) const
}
#ifndef QT_NO_TEXTDATE
else if (f == Qt::TextDate) {
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
buf = d->date.shortDayName(d->date.dayOfWeek());
buf += QLatin1Char(' ');
buf += d->date.shortMonthName(d->date.month());
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 4648ca155d..63ffae4e2b 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -39,6 +39,11 @@
**
****************************************************************************/
+#if !defined(QWS) && defined(Q_OS_MAC)
+# include "private/qcore_mac_p.h"
+# include <CoreFoundation/CoreFoundation.h>
+#endif
+
#include "qglobal.h"
#ifndef QT_NO_SYSTEMLOCALE
@@ -61,14 +66,10 @@ QT_END_NAMESPACE
#include "qstringlist.h"
#include "qvariant.h"
#include "qstringbuilder.h"
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_WIN)
# include "qt_windows.h"
# include <time.h>
#endif
-#if !defined(QWS) && defined(Q_OS_MAC)
-# include "private/qcore_mac_p.h"
-# include <CoreFoundation/CoreFoundation.h>
-#endif
#include "private/qnumeric_p.h"
#include "private/qsystemlibrary_p.h"
diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri
deleted file mode 100644
index 31362ffded..0000000000
--- a/src/gui/accessible/accessible.pri
+++ /dev/null
@@ -1,25 +0,0 @@
-# Qt accessibility module
-
-contains(QT_CONFIG, accessibility) {
- HEADERS += accessible/qaccessible.h \
- accessible/qaccessible2.h \
- accessible/qaccessibleobject.h \
- accessible/qaccessiblewidget.h \
- accessible/qaccessibleplugin.h
- SOURCES += accessible/qaccessible.cpp \
- accessible/qaccessible2.cpp \
- accessible/qaccessibleobject.cpp \
- accessible/qaccessiblewidget.cpp \
- accessible/qaccessibleplugin.cpp
-
- mac:!embedded:!qpa {
- HEADERS += accessible/qaccessible_mac_p.h
- OBJECTIVE_SOURCES += accessible/qaccessible_mac.mm \
- accessible/qaccessible_mac_cocoa.mm
- } else:win32 {
- SOURCES += accessible/qaccessible_win.cpp
- } else {
- HEADERS += accessible/qaccessiblebridge.h
- SOURCES += accessible/qaccessible_unix.cpp accessible/qaccessiblebridge.cpp
- }
-}
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
deleted file mode 100644
index fc03e1cec7..0000000000
--- a/src/gui/accessible/qaccessible.h
+++ /dev/null
@@ -1,464 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QACCESSIBLE_H
-#define QACCESSIBLE_H
-
-#include <QtCore/qglobal.h>
-#include <QtCore/qobject.h>
-#include <QtCore/qrect.h>
-#include <QtCore/qset.h>
-#include <QtCore/qvector.h>
-#include <QtCore/qvariant.h>
-#include <QtGui/qcolor.h>
-#include <QtGui/qevent.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_ACCESSIBILITY
-
-class QAccessibleInterface;
-
-class Q_GUI_EXPORT QAccessible
-{
-public:
- enum Event {
- SoundPlayed = 0x0001,
- Alert = 0x0002,
- ForegroundChanged = 0x0003,
- MenuStart = 0x0004,
- MenuEnd = 0x0005,
- PopupMenuStart = 0x0006,
- PopupMenuEnd = 0x0007,
- ContextHelpStart = 0x000C,
- ContextHelpEnd = 0x000D,
- DragDropStart = 0x000E,
- DragDropEnd = 0x000F,
- DialogStart = 0x0010,
- DialogEnd = 0x0011,
- ScrollingStart = 0x0012,
- ScrollingEnd = 0x0013,
-
- MenuCommand = 0x0018,
-
- // Values from IAccessible2
- ActionChanged = 0x0101,
- ActiveDescendantChanged,
- AttributeChanged,
- DocumentContentChanged,
- DocumentLoadComplete,
- DocumentLoadStopped,
- DocumentReload,
- HyperlinkEndIndexChanged,
- HyperlinkNumberOfAnchorsChanged,
- HyperlinkSelectedLinkChanged,
- HypertextLinkActivated,
- HypertextLinkSelected,
- HyperlinkStartIndexChanged,
- HypertextChanged,
- HypertextNLinksChanged,
- ObjectAttributeChanged,
- PageChanged,
- SectionChanged,
- TableCaptionChanged,
- TableColumnDescriptionChanged,
- TableColumnHeaderChanged,
- TableModelChanged,
- TableRowDescriptionChanged,
- TableRowHeaderChanged,
- TableSummaryChanged,
- TextAttributeChanged,
- TextCaretMoved,
- // TextChanged, deprecated, use TextUpdated
- TextColumnChanged = TextCaretMoved + 2,
- TextInserted,
- TextRemoved,
- TextUpdated,
- TextSelectionChanged,
- VisibleDataChanged,
-
- ObjectCreated = 0x8000,
- ObjectDestroyed = 0x8001,
- ObjectShow = 0x8002,
- ObjectHide = 0x8003,
- ObjectReorder = 0x8004,
- Focus = 0x8005,
- Selection = 0x8006,
- SelectionAdd = 0x8007,
- SelectionRemove = 0x8008,
- SelectionWithin = 0x8009,
- StateChanged = 0x800A,
- LocationChanged = 0x800B,
- NameChanged = 0x800C,
- DescriptionChanged = 0x800D,
- ValueChanged = 0x800E,
- ParentChanged = 0x800F,
- HelpChanged = 0x80A0,
- DefaultActionChanged = 0x80B0,
- AcceleratorChanged = 0x80C0
- };
-
- enum StateFlag {
- Normal = 0x00000000,
- Unavailable = 0x00000001,
- Selected = 0x00000002,
- Focused = 0x00000004,
- Pressed = 0x00000008,
- Checked = 0x00000010,
- Mixed = 0x00000020,
- ReadOnly = 0x00000040,
- HotTracked = 0x00000080,
- DefaultButton = 0x00000100,
- Expanded = 0x00000200,
- Collapsed = 0x00000400,
- Busy = 0x00000800,
- // Floating = 0x00001000,
- Marqueed = 0x00002000,
- Animated = 0x00004000,
- Invisible = 0x00008000,
- Offscreen = 0x00010000,
- Sizeable = 0x00020000,
- Movable = 0x00040000,
-#ifdef QT3_SUPPORT
- Moveable = Movable,
-#endif
- SelfVoicing = 0x00080000,
- Focusable = 0x00100000,
- Selectable = 0x00200000,
- Linked = 0x00400000,
- Traversed = 0x00800000,
- MultiSelectable = 0x01000000,
- ExtSelectable = 0x02000000,
- //AlertLow = 0x04000000,
- //AlertMedium = 0x08000000,
- //AlertHigh = 0x10000000, /* reused for HasInvokeExtension */
- Protected = 0x20000000,
- HasPopup = 0x40000000,
- Modal = 0x80000000,
-
- HasInvokeExtension = 0x10000000 // internal
- };
- Q_DECLARE_FLAGS(State, StateFlag)
-
- enum Role {
- NoRole = 0x00000000,
- TitleBar = 0x00000001,
- MenuBar = 0x00000002,
- ScrollBar = 0x00000003,
- Grip = 0x00000004,
- Sound = 0x00000005,
- Cursor = 0x00000006,
- Caret = 0x00000007,
- AlertMessage = 0x00000008,
- Window = 0x00000009,
- Client = 0x0000000A,
- PopupMenu = 0x0000000B,
- MenuItem = 0x0000000C,
- ToolTip = 0x0000000D,
- Application = 0x0000000E,
- Document = 0x0000000F,
- Pane = 0x00000010,
- Chart = 0x00000011,
- Dialog = 0x00000012,
- Border = 0x00000013,
- Grouping = 0x00000014,
- Separator = 0x00000015,
- ToolBar = 0x00000016,
- StatusBar = 0x00000017,
- Table = 0x00000018,
- ColumnHeader = 0x00000019,
- RowHeader = 0x0000001A,
- Column = 0x0000001B,
- Row = 0x0000001C,
- Cell = 0x0000001D,
- Link = 0x0000001E,
- HelpBalloon = 0x0000001F,
- Assistant = 0x00000020,
- List = 0x00000021,
- ListItem = 0x00000022,
- Tree = 0x00000023,
- TreeItem = 0x00000024,
- PageTab = 0x00000025,
- PropertyPage = 0x00000026,
- Indicator = 0x00000027,
- Graphic = 0x00000028,
- StaticText = 0x00000029,
- EditableText = 0x0000002A, // Editable, selectable, etc.
- PushButton = 0x0000002B,
- CheckBox = 0x0000002C,
- RadioButton = 0x0000002D,
- ComboBox = 0x0000002E,
- // DropList = 0x0000002F,
- ProgressBar = 0x00000030,
- Dial = 0x00000031,
- HotkeyField = 0x00000032,
- Slider = 0x00000033,
- SpinBox = 0x00000034,
- Canvas = 0x00000035,
- Animation = 0x00000036,
- Equation = 0x00000037,
- ButtonDropDown = 0x00000038,
- ButtonMenu = 0x00000039,
- ButtonDropGrid = 0x0000003A,
- Whitespace = 0x0000003B,
- PageTabList = 0x0000003C,
- Clock = 0x0000003D,
- Splitter = 0x0000003E,
- // Additional Qt roles where enum value does not map directly to MSAA:
- LayeredPane = 0x0000003F,
- UserRole = 0x0000ffff
- };
-
- enum Text {
- Name = 0,
- Description,
- Value,
- Help,
- Accelerator,
- UserText = 0x0000ffff
- };
-
- enum RelationFlag {
- Unrelated = 0x00000000,
- Self = 0x00000001,
- Ancestor = 0x00000002,
- Child = 0x00000004,
- Descendent = 0x00000008,
- Sibling = 0x00000010,
- HierarchyMask = 0x000000ff,
-
- Up = 0x00000100,
- Down = 0x00000200,
- Left = 0x00000400,
- Right = 0x00000800,
- Covers = 0x00001000,
- Covered = 0x00002000,
- GeometryMask = 0x0000ff00,
-
- FocusChild = 0x00010000,
- Label = 0x00020000,
- Labelled = 0x00040000,
- Controller = 0x00080000,
- Controlled = 0x00100000,
- LogicalMask = 0x00ff0000
- };
- Q_DECLARE_FLAGS(Relation, RelationFlag)
-
- enum Action {
- DefaultAction = 0,
- Press = -1,
- FirstStandardAction = Press,
- SetFocus = -2,
- Increase = -3,
- Decrease = -4,
- Accept = -5,
- Cancel = -6,
- Select = -7,
- ClearSelection = -8,
- RemoveSelection = -9,
- ExtendSelection = -10,
- AddToSelection = -11,
- LastStandardAction = AddToSelection
- };
-
- enum Method {
- ListSupportedMethods = 0,
- SetCursorPosition = 1,
- GetCursorPosition = 2,
- ForegroundColor = 3,
- BackgroundColor = 4
- };
-
- typedef QAccessibleInterface*(*InterfaceFactory)(const QString &key, QObject*);
- typedef void(*UpdateHandler)(QObject*, int who, Event reason);
- typedef void(*RootObjectHandler)(QObject*);
-
- static void installFactory(InterfaceFactory);
- static void removeFactory(InterfaceFactory);
- static UpdateHandler installUpdateHandler(UpdateHandler);
- static RootObjectHandler installRootObjectHandler(RootObjectHandler);
-
- static QAccessibleInterface *queryAccessibleInterface(QObject *);
- static void updateAccessibility(QObject *, int who, Event reason);
- static bool isActive();
- static void setRootObject(QObject*);
-
- static void initialize();
- static void cleanup();
-
-private:
- static UpdateHandler updateHandler;
- static RootObjectHandler rootObjectHandler;
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(QAccessible::State)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QAccessible::Relation)
-QT_END_NAMESPACE
-Q_DECLARE_METATYPE(QSet<QAccessible::Method>)
-QT_BEGIN_NAMESPACE
-
-namespace QAccessible2
-{
- enum InterfaceType
- {
- TextInterface,
- EditableTextInterface,
- ValueInterface,
- TableInterface,
- ActionInterface,
- ImageInterface
- };
-}
-
-class QAccessible2Interface;
-class QAccessibleTextInterface;
-class QAccessibleEditableTextInterface;
-class QAccessibleValueInterface;
-class QAccessibleTableInterface;
-class QAccessibleActionInterface;
-class QAccessibleImageInterface;
-
-class Q_GUI_EXPORT QAccessibleInterface : public QAccessible
-{
-public:
- virtual ~QAccessibleInterface() {}
- // check for valid pointers
- virtual bool isValid() const = 0;
- virtual QObject *object() const = 0;
-
- // hierarchy
- virtual int childCount() const = 0;
- virtual int indexOfChild(const QAccessibleInterface *) const = 0;
-
- // relations
- virtual Relation relationTo(int child, const QAccessibleInterface *other,
- int otherChild) const = 0;
- virtual int childAt(int x, int y) const = 0;
-
- // navigation
- virtual int navigate(RelationFlag relation, int index, QAccessibleInterface **iface) const = 0;
-
- // properties and state
- virtual QString text(Text t, int child) const = 0;
- virtual void setText(Text t, int child, const QString &text) = 0;
- virtual QRect rect(int child) const = 0;
- virtual Role role(int child) const = 0;
- virtual State state(int child) const = 0;
-
- // action
- virtual int userActionCount(int child) const = 0;
- virtual QString actionText(int action, Text t, int child) const = 0;
- virtual bool doAction(int action, int child, const QVariantList &params = QVariantList()) = 0;
-
- QVariant invokeMethod(Method method, int child = 0,
- const QVariantList &params = QVariantList());
-
- inline QSet<Method> supportedMethods()
- { return qvariant_cast<QSet<Method> >(invokeMethod(ListSupportedMethods)); }
-
- inline QColor foregroundColor()
- { return qvariant_cast<QColor>(invokeMethod(ForegroundColor)); }
-
- inline QColor backgroundColor()
- { return qvariant_cast<QColor>(invokeMethod(BackgroundColor)); }
-
- inline QAccessibleTextInterface *textInterface()
- { return reinterpret_cast<QAccessibleTextInterface *>(cast_helper(QAccessible2::TextInterface)); }
-
- inline QAccessibleEditableTextInterface *editableTextInterface()
- { return reinterpret_cast<QAccessibleEditableTextInterface *>(cast_helper(QAccessible2::EditableTextInterface)); }
-
- inline QAccessibleValueInterface *valueInterface()
- { return reinterpret_cast<QAccessibleValueInterface *>(cast_helper(QAccessible2::ValueInterface)); }
-
- inline QAccessibleTableInterface *tableInterface()
- { return reinterpret_cast<QAccessibleTableInterface *>(cast_helper(QAccessible2::TableInterface)); }
-
- inline QAccessibleActionInterface *actionInterface()
- { return reinterpret_cast<QAccessibleActionInterface *>(cast_helper(QAccessible2::ActionInterface)); }
-
- inline QAccessibleImageInterface *imageInterface()
- { return reinterpret_cast<QAccessibleImageInterface *>(cast_helper(QAccessible2::ImageInterface)); }
-
-private:
- QAccessible2Interface *cast_helper(QAccessible2::InterfaceType);
-};
-
-class Q_GUI_EXPORT QAccessibleInterfaceEx: public QAccessibleInterface
-{
-public:
- virtual QVariant invokeMethodEx(Method method, int child, const QVariantList &params) = 0;
- virtual QVariant virtual_hook(const QVariant &data);
- virtual QAccessible2Interface *interface_cast(QAccessible2::InterfaceType)
- { return 0; }
-};
-
-
-class Q_GUI_EXPORT QAccessibleEvent : public QEvent
-{
-public:
- inline QAccessibleEvent(Type type, int child);
- inline int child() const { return c; }
- inline QString value() const { return val; }
- inline void setValue(const QString &aText) { val = aText; }
-
-private:
- int c;
- QString val;
-};
-
-inline QAccessibleEvent::QAccessibleEvent(Type atype, int achild)
- : QEvent(atype), c(achild) {}
-
-#define QAccessibleInterface_iid "com.trolltech.Qt.QAccessibleInterface"
-Q_DECLARE_INTERFACE(QAccessibleInterface, QAccessibleInterface_iid)
-
-#endif // QT_NO_ACCESSIBILITY
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QACCESSIBLE_H
diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h
deleted file mode 100644
index 5cb03239ef..0000000000
--- a/src/gui/accessible/qaccessible2.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QACCESSIBLE2_H
-#define QACCESSIBLE2_H
-
-#include <QtGui/qaccessible.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_ACCESSIBILITY
-
-namespace QAccessible2
-{
- enum CoordinateType
- {
- RelativeToScreen = 0,
- RelativeToParent = 1
- };
-
- enum BoundaryType {
- CharBoundary,
- WordBoundary,
- SentenceBoundary,
- ParagraphBoundary,
- LineBoundary,
- NoBoundary
- };
-}
-
-class Q_GUI_EXPORT QAccessible2Interface
-{
-public:
- virtual ~QAccessible2Interface() {}
-};
-
-// catch-all functions. If an accessible class doesn't implement interface T, return 0
-inline QAccessible2Interface *qAccessibleValueCastHelper() { return 0; }
-inline QAccessible2Interface *qAccessibleTextCastHelper() { return 0; }
-inline QAccessible2Interface *qAccessibleEditableTextCastHelper() { return 0; }
-inline QAccessible2Interface *qAccessibleTableCastHelper() { return 0; }
-inline QAccessible2Interface *qAccessibleActionCastHelper() { return 0; }
-inline QAccessible2Interface *qAccessibleImageCastHelper() { return 0; }
-
-#define Q_ACCESSIBLE_OBJECT \
- public: \
- QAccessible2Interface *interface_cast(QAccessible2::InterfaceType t) \
- { \
- switch (t) { \
- case QAccessible2::TextInterface: \
- return qAccessibleTextCastHelper(); \
- case QAccessible2::EditableTextInterface: \
- return qAccessibleEditableTextCastHelper(); \
- case QAccessible2::ValueInterface: \
- return qAccessibleValueCastHelper(); \
- case QAccessible2::TableInterface: \
- return qAccessibleTableCastHelper(); \
- case QAccessible2::ActionInterface: \
- return qAccessibleActionCastHelper(); \
- case QAccessible2::ImageInterface: \
- return qAccessibleImageCastHelper(); \
- } \
- return 0; \
- } \
- private:
-
-class Q_GUI_EXPORT QAccessibleTextInterface: public QAccessible2Interface
-{
-public:
- inline QAccessible2Interface *qAccessibleTextCastHelper() { return this; }
-
- virtual ~QAccessibleTextInterface() {}
-
- virtual void addSelection(int startOffset, int endOffset) = 0;
- virtual QString attributes(int offset, int *startOffset, int *endOffset) = 0;
- virtual int cursorPosition() = 0;
- virtual QRect characterRect(int offset, QAccessible2::CoordinateType coordType) = 0;
- virtual int selectionCount() = 0;
- virtual int offsetAtPoint(const QPoint &point, QAccessible2::CoordinateType coordType) = 0;
- virtual void selection(int selectionIndex, int *startOffset, int *endOffset) = 0;
- virtual QString text(int startOffset, int endOffset) = 0;
- virtual QString textBeforeOffset (int offset, QAccessible2::BoundaryType boundaryType,
- int *startOffset, int *endOffset) = 0;
- virtual QString textAfterOffset(int offset, QAccessible2::BoundaryType boundaryType,
- int *startOffset, int *endOffset) = 0;
- virtual QString textAtOffset(int offset, QAccessible2::BoundaryType boundaryType,
- int *startOffset, int *endOffset) = 0;
- virtual void removeSelection(int selectionIndex) = 0;
- virtual void setCursorPosition(int position) = 0;
- virtual void setSelection(int selectionIndex, int startOffset, int endOffset) = 0;
- virtual int characterCount() = 0;
- virtual void scrollToSubstring(int startIndex, int endIndex) = 0;
-};
-
-class Q_GUI_EXPORT QAccessibleEditableTextInterface: public QAccessible2Interface
-{
-public:
- inline QAccessible2Interface *qAccessibleEditableTextCastHelper() { return this; }
-
- virtual ~QAccessibleEditableTextInterface() {}
-
- virtual void copyText(int startOffset, int endOffset) = 0;
- virtual void deleteText(int startOffset, int endOffset) = 0;
- virtual void insertText(int offset, const QString &text) = 0;
- virtual void cutText(int startOffset, int endOffset) = 0;
- virtual void pasteText(int offset) = 0;
- virtual void replaceText(int startOffset, int endOffset, const QString &text) = 0;
- virtual void setAttributes(int startOffset, int endOffset, const QString &attributes) = 0;
-};
-
-class Q_GUI_EXPORT QAccessibleSimpleEditableTextInterface: public QAccessibleEditableTextInterface
-{
-public:
- QAccessibleSimpleEditableTextInterface(QAccessibleInterface *accessibleInterface);
-
- void copyText(int startOffset, int endOffset);
- void deleteText(int startOffset, int endOffset);
- void insertText(int offset, const QString &text);
- void cutText(int startOffset, int endOffset);
- void pasteText(int offset);
- void replaceText(int startOffset, int endOffset, const QString &text);
- inline void setAttributes(int, int, const QString &) {}
-
-private:
- QAccessibleInterface *iface;
-};
-
-class Q_GUI_EXPORT QAccessibleValueInterface: public QAccessible2Interface
-{
-public:
- inline QAccessible2Interface *qAccessibleValueCastHelper() { return this; }
-
- virtual ~QAccessibleValueInterface() {}
-
- virtual QVariant currentValue() = 0;
- virtual void setCurrentValue(const QVariant &value) = 0;
- virtual QVariant maximumValue() = 0;
- virtual QVariant minimumValue() = 0;
-};
-
-class Q_GUI_EXPORT QAccessibleTableInterface: public QAccessible2Interface
-{
-public:
- inline QAccessible2Interface *qAccessibleTableCastHelper() { return this; }
-
- virtual QAccessibleInterface *accessibleAt(int row, int column) = 0;
- virtual QAccessibleInterface *caption() = 0;
- virtual int childIndex(int rowIndex, int columnIndex) = 0;
- virtual QString columnDescription(int column) = 0;
- virtual int columnSpan(int row, int column) = 0;
- virtual QAccessibleInterface *columnHeader() = 0;
- virtual int columnIndex(int childIndex) = 0;
- virtual int columnCount() = 0;
- virtual int rowCount() = 0;
- virtual int selectedColumnCount() = 0;
- virtual int selectedRowCount() = 0;
- virtual QString rowDescription(int row) = 0;
- virtual int rowSpan(int row, int column) = 0;
- virtual QAccessibleInterface *rowHeader() = 0;
- virtual int rowIndex(int childIndex) = 0;
- virtual int selectedRows(int maxRows, QList<int> *rows) = 0;
- virtual int selectedColumns(int maxColumns, QList<int> *columns) = 0;
- virtual QAccessibleInterface *summary() = 0;
- virtual bool isColumnSelected(int column) = 0;
- virtual bool isRowSelected(int row) = 0;
- virtual bool isSelected(int row, int column) = 0;
- virtual void selectRow(int row) = 0;
- virtual void selectColumn(int column) = 0;
- virtual void unselectRow(int row) = 0;
- virtual void unselectColumn(int column) = 0;
- virtual void cellAtIndex(int index, int *row, int *column, int *rowSpan,
- int *columnSpan, bool *isSelected) = 0;
-};
-
-class Q_GUI_EXPORT QAccessibleActionInterface : public QAccessible2Interface
-{
-public:
- inline QAccessible2Interface *qAccessibleActionCastHelper() { return this; }
-
- virtual int actionCount() = 0;
- virtual void doAction(int actionIndex) = 0;
- virtual QString description(int actionIndex) = 0;
- virtual QString name(int actionIndex) = 0;
- virtual QString localizedName(int actionIndex) = 0;
- virtual QStringList keyBindings(int actionIndex) = 0;
-};
-
-class Q_GUI_EXPORT QAccessibleImageInterface : public QAccessible2Interface
-{
-public:
- inline QAccessible2Interface *qAccessibleImageCastHelper() { return this; }
-
- virtual QString imageDescription() = 0;
- virtual QSize imageSize() = 0;
- virtual QRect imagePosition(QAccessible2::CoordinateType coordType) = 0;
-};
-
-#endif // QT_NO_ACCESSIBILITY
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/gui/accessible/qaccessibleobject.h b/src/gui/accessible/qaccessibleobject.h
deleted file mode 100644
index 8ebd285a6f..0000000000
--- a/src/gui/accessible/qaccessibleobject.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QACCESSIBLEOBJECT_H
-#define QACCESSIBLEOBJECT_H
-
-#include <QtGui/qaccessible.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_ACCESSIBILITY
-
-class QAccessibleObjectPrivate;
-class QObject;
-
-class Q_GUI_EXPORT QAccessibleObject : public QAccessibleInterface
-{
-public:
- explicit QAccessibleObject(QObject *object);
-
- bool isValid() const;
- QObject *object() const;
-
- // properties
- QRect rect(int child) const;
- void setText(Text t, int child, const QString &text);
-
- // actions
- int userActionCount(int child) const;
- bool doAction(int action, int child, const QVariantList &params);
- QString actionText(int action, Text t, int child) const;
-
-protected:
- virtual ~QAccessibleObject();
-
-private:
- friend class QAccessibleObjectEx;
- QAccessibleObjectPrivate *d;
- Q_DISABLE_COPY(QAccessibleObject)
-};
-
-class Q_GUI_EXPORT QAccessibleObjectEx : public QAccessibleInterfaceEx
-{
-public:
- explicit QAccessibleObjectEx(QObject *object);
-
- bool isValid() const;
- QObject *object() const;
-
- // properties
- QRect rect(int child) const;
- void setText(Text t, int child, const QString &text);
-
- // actions
- int userActionCount(int child) const;
- bool doAction(int action, int child, const QVariantList &params);
- QString actionText(int action, Text t, int child) const;
-
-protected:
- virtual ~QAccessibleObjectEx();
-
-private:
- QAccessibleObjectPrivate *d;
- Q_DISABLE_COPY(QAccessibleObjectEx)
-};
-
-class Q_GUI_EXPORT QAccessibleApplication : public QAccessibleObject
-{
-public:
- QAccessibleApplication();
-
- // relations
- int childCount() const;
- int indexOfChild(const QAccessibleInterface*) const;
- Relation relationTo(int, const QAccessibleInterface *, int) const;
-
- // navigation
- int childAt(int x, int y) const;
- int navigate(RelationFlag, int, QAccessibleInterface **) const;
-
- // properties and state
- QString text(Text t, int child) const;
- Role role(int child) const;
- State state(int child) const;
-
- // actions
- int userActionCount(int child) const;
- bool doAction(int action, int child, const QVariantList &params);
- QString actionText(int action, Text t, int child) const;
-};
-
-#endif // QT_NO_ACCESSIBILITY
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QACCESSIBLEOBJECT_H
diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/gui/accessible/qaccessibleplugin.h
deleted file mode 100644
index 3db84469ca..0000000000
--- a/src/gui/accessible/qaccessibleplugin.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QACCESSIBLEPLUGIN_H
-#define QACCESSIBLEPLUGIN_H
-
-#include <QtGui/qaccessible.h>
-#include <QtCore/qfactoryinterface.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
-#ifndef QT_NO_ACCESSIBILITY
-
-class QStringList;
-class QAccessibleInterface;
-
-struct Q_GUI_EXPORT QAccessibleFactoryInterface : public QAccessible, public QFactoryInterface
-{
- virtual QAccessibleInterface* create(const QString &key, QObject *object) = 0;
-};
-
-#define QAccessibleFactoryInterface_iid "com.trolltech.Qt.QAccessibleFactoryInterface"
-Q_DECLARE_INTERFACE(QAccessibleFactoryInterface, QAccessibleFactoryInterface_iid)
-
-class QAccessiblePluginPrivate;
-
-class Q_GUI_EXPORT QAccessiblePlugin : public QObject, public QAccessibleFactoryInterface
-{
- Q_OBJECT
- Q_INTERFACES(QAccessibleFactoryInterface:QFactoryInterface)
-public:
- explicit QAccessiblePlugin(QObject *parent = 0);
- ~QAccessiblePlugin();
-
- virtual QStringList keys() const = 0;
- virtual QAccessibleInterface *create(const QString &key, QObject *object) = 0;
-};
-
-#endif // QT_NO_ACCESSIBILITY
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QACCESSIBLEPLUGIN_H
diff --git a/src/gui/accessible/qaccessiblewidget.cpp b/src/gui/accessible/qaccessiblewidget.cpp
deleted file mode 100644
index 60ed48f76b..0000000000
--- a/src/gui/accessible/qaccessiblewidget.cpp
+++ /dev/null
@@ -1,1031 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** GNU Lesser General Public License Usage
-** 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.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qaccessiblewidget.h"
-
-#ifndef QT_NO_ACCESSIBILITY
-
-#include "qaction.h"
-#include "qapplication.h"
-#include "qgroupbox.h"
-#include "qlabel.h"
-#include "qtooltip.h"
-#include "qwhatsthis.h"
-#include "qwidget.h"
-#include "qdebug.h"
-#include <qmath.h>
-#include <QRubberBand>
-#include <QtGui/QFocusFrame>
-#include <QtGui/QMenu>
-
-QT_BEGIN_NAMESPACE
-
-static QList<QWidget*> childWidgets(const QWidget *widget)
-{
- QList<QObject*> list = widget->children();
- QList<QWidget*> widgets;
- for (int i = 0; i < list.size(); ++i) {
- QWidget *w = qobject_cast<QWidget *>(list.at(i));
- if (w && !w->isWindow()
- && !qobject_cast<QFocusFrame*>(w)
-#if !defined(QT_NO_MENU)
- && !qobject_cast<QMenu*>(w)
-#endif
- && w->objectName() != QLatin1String("qt_rubberband"))
- widgets.append(w);
- }
- return widgets;
-}
-
-static QString buddyString(const QWidget *widget)
-{
- if (!widget)
- return QString();
- QWidget *parent = widget->parentWidget();
- if (!parent)
- return QString();
-#ifndef QT_NO_SHORTCUT
- QObjectList ol = parent->children();
- for (int i = 0; i < ol.size(); ++i) {
- QLabel *label = qobject_cast<QLabel*>(ol.at(i));
- if (label && label->buddy() == widget)
- return label->text();
- }
-#endif
-
-#ifndef QT_NO_GROUPBOX
- QGroupBox *groupbox = qobject_cast<QGroupBox*>(parent);
- if (groupbox)
- return groupbox->title();
-#endif
-
- return QString();
-}
-
-QString Q_GUI_EXPORT qt_accStripAmp(const QString &text)
-{
- return QString(text).remove(QLatin1Char('&'));
-}
-
-QString Q_GUI_EXPORT qt_accHotKey(const QString &text)
-{
-#ifndef QT_NO_SHORTCUT
- if (text.isEmpty())
- return text;
-
- int fa = 0;
- QChar ac;
- while ((fa = text.indexOf(QLatin1Char('&'), fa)) != -1) {
- ++fa;
- if (fa < text.length()) {
- // ignore "&&"
- if (text.at(fa) == QLatin1Char('&')) {
- ++fa;
- continue;
- } else {
- ac = text.at(fa);
- break;
- }
- }
- }
- if (ac.isNull())
- return QString();
- return (QString)QKeySequence(Qt::ALT) + ac.toUpper();
-#else
- Q_UNUSED(text);
- return QString();
-#endif
-}
-
-class QAccessibleWidgetPrivate : public QAccessible
-{
-public:
- QAccessibleWidgetPrivate()
- :role(Client)
- {}
-
- Role role;
- QString name;
- QString description;
- QString value;
- QString help;
- QString accelerator;
- QStringList primarySignals;
- const QAccessibleInterface *asking;
-};
-
-/*!
- \class QAccessibleWidget
- \brief The QAccessibleWidget class implements the QAccessibleInterface for QWidgets.
-
- \ingroup accessibility
-
- This class is convenient to use as a base class for custom
- implementations of QAccessibleInterfaces that provide information
- about widget objects.
-
- The class provides functions to retrieve the parentObject() (the
- widget's parent widget), and the associated widget(). Controlling
- signals can be added with addControllingSignal(), and setters are
- provided for various aspects of the interface implementation, for
- example setValue(), setDescription(), setAccelerator(), and
- setHelp().
-
- \sa QAccessible, QAccessibleObject
-*/
-
-/*!
- Creates a QAccessibleWidget object for widget \a w.
- \a role and \a name are optional parameters that set the object's
- role and name properties.
-*/
-QAccessibleWidget::QAccessibleWidget(QWidget *w, Role role, const QString &name)
-: QAccessibleObject(w)
-{
- Q_ASSERT(widget());
- d = new QAccessibleWidgetPrivate();
- d->role = role;
- d->name = name;
- d->asking = 0;
-}
-
-/*!
- Destroys this object.
-*/
-QAccessibleWidget::~QAccessibleWidget()
-{
- delete d;
-}
-
-/*!
- Returns the associated widget.
-*/
-QWidget *QAccessibleWidget::widget() const
-{
- return qobject_cast<QWidget*>(object());
-}
-
-/*!
- Returns the associated widget's parent object, which is either the
- parent widget, or qApp for top-level widgets.
-*/
-QObject *QAccessibleWidget::parentObject() const
-{
- QObject *parent = object()->parent();
- if (!parent)
- parent = qApp;
- return parent;
-}
-
-/*! \reimp */
-int QAccessibleWidget::childAt(int x, int y) const
-{
- QWidget *w = widget();
- if (!w->isVisible())
- return -1;
- QPoint gp = w->mapToGlobal(QPoint(0, 0));
- if (!QRect(gp.x(), gp.y(), w->width(), w->height()).contains(x, y))
- return -1;
-
- QWidgetList list = childWidgets(w);
- int ccount = childCount();
-
- // a complex child
- if (list.size() < ccount) {
- for (int i = 1; i <= ccount; ++i) {
- if (rect(i).contains(x, y))
- return i;
- }
- return 0;
- }
-
- QPoint rp = w->mapFromGlobal(QPoint(x, y));
- for (int i = 0; i<list.size(); ++i) {
- QWidget *child = list.at(i);
- if (!child->isWindow() && !child->isHidden() && child->geometry().contains(rp)) {
- return i + 1;
- }
- }
- return 0;
-}
-
-/*! \reimp */
-QRect QAccessibleWidget::rect(int child) const
-{
- if (child) {
- qWarning("QAccessibleWidget::rect: This implementation does not support subelements! "
- "(ID %d unknown for %s)", child, widget()->metaObject()->className());
- }
-
- QWidget *w = widget();
- if (!w->isVisible())
- return QRect();
- QPoint wpos = w->mapToGlobal(QPoint(0, 0));
-
- return QRect(wpos.x(), wpos.y(), w->width(), w->height());
-}
-
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <private/qobject_p.h>
-QT_END_INCLUDE_NAMESPACE
-
-class QACConnectionObject : public QObject
-{
- Q_DECLARE_PRIVATE(QObject)
-public:
- inline bool isSender(const QObject *receiver, const char *signal) const
- { return d_func()->isSender(receiver, signal); }
- inline QObjectList receiverList(const char *signal) const
- { return d_func()->receiverList(signal); }
- inline QObjectList senderList() const
- { return d_func()->senderList(); }
-};
-
-/*!
- Registers \a signal as a controlling signal.
-
- An object is a Controller to any other object connected to a
- controlling signal.
-*/
-void QAccessibleWidget::addControllingSignal(const QString &signal)
-{
- QByteArray s = QMetaObject::normalizedSignature(signal.toAscii());
- if (object()->metaObject()->indexOfSignal(s) < 0)
- qWarning("Signal %s unknown in %s", s.constData(), object()->metaObject()->className());
- d->primarySignals << QLatin1String(s);
-}
-
-/*!
- Sets the value of this interface implementation to \a value.
-
- The default implementation of text() returns the set value for
- the Value text.
-
- Note that the object wrapped by this interface is not modified.
-*/
-void QAccessibleWidget::setValue(const QString &value)
-{
- d->value = value;
-}
-
-/*!
- Sets the description of this interface implementation to \a desc.
-
- The default implementation of text() returns the set value for
- the Description text.
-
- Note that the object wrapped by this interface is not modified.
-*/
-void QAccessibleWidget::setDescription(const QString &desc)
-{
- d->description = desc;
-}
-
-/*!
- Sets the help of this interface implementation to \a help.
-
- The default implementation of text() returns the set value for
- the Help text.
-
- Note that the object wrapped by this interface is not modified.
-*/
-void QAccessibleWidget::setHelp(const QString &help)
-{
- d->help = help;
-}
-
-/*!
- Sets the accelerator of this interface implementation to \a accel.
-
- The default implementation of text() returns the set value for
- the Accelerator text.
-
- Note that the object wrapped by this interface is not modified.
-*/
-void QAccessibleWidget::setAccelerator(const QString &accel)
-{
- d->accelerator = accel;
-}
-
-static inline bool isAncestor(const QObject *obj, const QObject *child)
-{
- while (child) {
- if (child == obj)
- return true;
- child = child->parent();
- }
- return false;
-}
-
-
-/*! \reimp */
-QAccessible::Relation QAccessibleWidget::relationTo(int child,
- const QAccessibleInterface *other, int otherChild) const
-{
- Relation relation = Unrelated;
- if (d->asking == this) // recursive call
- return relation;
-
- QObject *o = other ? other->object() : 0;
- if (!o)
- return relation;
-
- QWidget *focus = widget()->focusWidget();
- if (object() == focus && isAncestor(o, focus))
- relation |= FocusChild;
-
- QACConnectionObject *connectionObject = (QACConnectionObject*)object();
- for (int sig = 0; sig < d->primarySignals.count(); ++sig) {
- if (connectionObject->isSender(o, d->primarySignals.at(sig).toAscii())) {
- relation |= Controller;
- break;
- }
- }
- // test for passive relationships.
- // d->asking protects from endless recursion.
- d->asking = this;
- int inverse = other->relationTo(otherChild, this, child);
- d->asking = 0;
-
- if (inverse & Controller)
- relation |= Controlled;
- if (inverse & Label)
- relation |= Labelled;
-
- if(o == object()) {
- if (child && !otherChild)
- return relation | Child;
- if (!child && otherChild)
- return relation | Ancestor;
- if (!child && !otherChild)
- return relation | Self;
- }
-
- QObject *parent = object()->parent();
- if (o == parent)
- return relation | Child;
-
- if (o->parent() == parent) {
- relation |= Sibling;
- QAccessibleInterface *sibIface = QAccessible::queryAccessibleInterface(o);
- Q_ASSERT(sibIface);
- QRect wg = rect(0);
- QRect sg = sibIface->rect(0);
- if (wg.intersects(sg)) {
- QAccessibleInterface *pIface = 0;
- sibIface->navigate(Ancestor, 1, &pIface);
- if (pIface && !((sibIface->state(0) | state(0)) & Invisible)) {
- int wi = pIface->indexOfChild(this);
- int si = pIface->indexOfChild(sibIface);
-
- if (wi > si)
- relation |= QAccessible::Covers;
- else
- relation |= QAccessible::Covered;
- }
- delete pIface;
- } else {
- QPoint wc = wg.center();
- QPoint sc = sg.center();
- if (wc.x() < sc.x())
- relation |= QAccessible::Left;
- else if(wc.x() > sc.x())
- relation |= QAccessible::Right;
- if (wc.y() < sc.y())
- relation |= QAccessible::Up;
- else if (wc.y() > sc.y())
- relation |= QAccessible::Down;
- }
- delete sibIface;
-
- return relation;
- }
-
- if (isAncestor(o, object()))
- return relation | Descendent;
- if (isAncestor(object(), o))
- return relation | Ancestor;
-
- return relation;
-}
-
-/*! \reimp */
-int QAccessibleWidget::navigate(RelationFlag relation, int entry,
- QAccessibleInterface **target) const
-{
- if (!target)
- return -1;
-
- *target = 0;
- QObject *targetObject = 0;
-
- QWidgetList childList = childWidgets(widget());
- bool complexWidget = childList.size() < childCount();
-
- switch (relation) {
- // Hierarchical
- case Self:
- targetObject = object();
- break;
- case Child:
- if (complexWidget) {
- if (entry > 0 && entry <= childCount())
- return entry;
- return -1;
- }else {
- if (entry > 0 && childList.size() >= entry)
- targetObject = childList.at(entry - 1);
- }
- break;
- case Ancestor:
- {
- if (entry <= 0)
- return -1;
- targetObject = widget()->parentWidget();
- int i;
- for (i = entry; i > 1 && targetObject; --i)
- targetObject = targetObject->parent();
- if (!targetObject && i == 1)
- targetObject = qApp;
- }
- break;
- case Sibling:
- {
- QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(parentObject());
- if (!iface)
- return -1;
-
- iface->navigate(Child, entry, target);
- delete iface;
- if (*target)
- return 0;
- }
- break;
-
- // Geometrical
- case QAccessible::Left:
- if (complexWidget && entry) {
- if (entry < 2 || widget()->height() > widget()->width() + 20) // looks vertical
- return -1;
- return entry - 1;
- }
- // fall through
- case QAccessible::Right:
- if (complexWidget && entry) {
- if (entry >= childCount() || widget()->height() > widget()->width() + 20) // looks vertical
- return -1;
- return entry + 1;
- }
- // fall through
- case QAccessible::Up:
- if (complexWidget && entry) {
- if (entry < 2 || widget()->width() > widget()->height() + 20) // looks horizontal
- return - 1;
- return entry - 1;
- }
- // fall through
- case QAccessible::Down:
- if (complexWidget && entry) {
- if (entry >= childCount() || widget()->width() > widget()->height() + 20) // looks horizontal
- return - 1;
- return entry + 1;
- } else {
- QAccessibleInterface *pIface = QAccessible::queryAccessibleInterface(parentObject());
- if (!pIface)
- return -1;
-
- QRect startg = rect(0);
- QPoint startc = startg.center();
- QAccessibleInterface *candidate = 0;
- int mindist = 100000;
- int sibCount = pIface->childCount();
- for (int i = 0; i < sibCount; ++i) {
- QAccessibleInterface *sibling = 0;
- pIface->navigate(Child, i+1, &sibling);
- Q_ASSERT(sibling);
- if ((relationTo(0, sibling, 0) & Self) || (sibling->state(0) & QAccessible::Invisible)) {
- //ignore ourself and invisible siblings
- delete sibling;
- continue;
- }
-
- QRect sibg = sibling->rect(0);
- QPoint sibc = sibg.center();
- QPoint sibp;
- QPoint startp;
- QPoint distp;
- switch (relation) {
- case QAccessible::Left:
- startp = QPoint(startg.left(), startg.top() + startg.height() / 2);
- sibp = QPoint(sibg.right(), sibg.top() + sibg.height() / 2);
- if (QPoint(sibc - startc).x() >= 0) {
- delete sibling;
- continue;
- }
- distp = sibp - startp;
- break;
- case QAccessible::Right:
- startp = QPoint(startg.right(), startg.top() + startg.height() / 2);
- sibp = QP