diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-07-22 14:16:22 +0200 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-07-22 14:16:22 +0200 |
| commit | 5ef9227a5931e87cd18354967013056ef59405ca (patch) | |
| tree | dea07caa94be3b92702951813d373120cee81071 /src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | |
| parent | e3994b506c21b9967248ea404cfdfef82060c13e (diff) | |
| parent | 6c25a7cdea912f212ce00f43c7cfc862c1ecdd50 (diff) | |
Merge commit 'origin/4.5'
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qt_cocoa_helpers_mac_p.h
Diffstat (limited to 'src/plugins/gfxdrivers/directfb/qdirectfbscreen.h')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index fced673269..69b09e991b 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -44,6 +44,7 @@ #include <QtGui/qscreen_qws.h> #include <directfb.h> +#include <directfb_version.h> QT_BEGIN_HEADER |