diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-13 09:49:43 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-13 09:49:49 (GMT) |
| commit | 6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9 (patch) | |
| tree | 94da799a697ebf32a98ccc13a53adfb2569f7c16 /src/gui/kernel/qt_x11_p.h | |
| parent | b664d54867139b371e158f1c63076c4a970cbb2a (diff) | |
| parent | 4f2dcef95299f2da628b30607021e8deb1d868b6 (diff) | |
| download | Qt-6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9.zip Qt-6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9.tar.gz Qt-6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9.tar.bz2 | |
Merge oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'src/gui/kernel/qt_x11_p.h')
| -rw-r--r-- | src/gui/kernel/qt_x11_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index 9f08dc6..9e4cf60 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -163,7 +163,9 @@ extern "C" { #endif // QT_NO_XRENDER #ifndef QT_NO_XSYNC +extern "C" { # include "X11/extensions/sync.h" +} #endif // #define QT_NO_XKB |