Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix exports for widgets. | Friedemann Kleint | 2011-08-25 | 1 | -0/+4 |
| | | | | | | | Change-Id: Id505aa13dfd3b34659961e44473abae99d18ee4c Reviewed-on: http://codereview.qt.nokia.com/3597 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> | ||||
* | Merge branch 'master' into refactor | Gunnar Sletta | 2011-08-25 | 1 | -3/+36 |
| | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_qpa.cpp src/gui/kernel/qcursor_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.h src/gui/kernel/qwindowsysteminterface_qpa_p.h src/gui/text/qtextcontrol.cpp src/plugins/platforms/wayland/wayland.pro src/widgets/accessible/qaccessible2.h src/widgets/widgets/qwidgetlinecontrol_p.h Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74 | ||||
* | Renamed QLine/TextControl to QWidgetLine/TextControl | Lars Knoll | 2011-06-27 | 1 | -0/+462 |
Renamed them to free up the QTextControl and QLineControl class names for a new API in QtGui. Reviewed-by: Jørgen Lind |