diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-03 11:03:22 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-03 11:03:22 +0200 |
| commit | 92c998afb66a2ec900d50cab57929c0a97ad46ac (patch) | |
| tree | 1f6219dc64c236c85d7365f8e07ee1df1f27a610 /dist/changes-5.0.0 | |
| parent | 6c4dec7bff6f55b0c41729f4a4ab6962a037af15 (diff) | |
| parent | 6f4212e5936b96a8be0eacddbfc4dd7ca5abd776 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/kernel/qapplication_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlinecontrol_p.h
src/gui/widgets/qtabwidget.h
Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
Diffstat (limited to 'dist/changes-5.0.0')
| -rw-r--r-- | dist/changes-5.0.0 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index 344edb6517..523d649573 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -17,6 +17,9 @@ information about a particular change. - Unite clipping support has been removed from QPainter. The alternative is to unite QRegion's and using the result on QPainter. +- QLibrary::resolve() now returns a function pointer instead of a void + pointer. + **************************************************************************** * General * **************************************************************************** |