Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (79 commits)
  configure: fixed configure on mac.
  Add util/xkbdatagen/README
  Application background is incorrect if app locked to landscape.
  QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
  Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"
  Temporary fix for ambiguous cast from four letter char constant
  add autotest for digest authentication
  Fix cursor position adjustment when removing strings
  Fix QMAKE_POST_LINK in Symbian for targets with special characters.
  QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
  Improved performance of mapFromGlobal/mapToGlobal on X11
  Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
  Avoid possible font name collisions on fbserv
  Update of Czech translation for Qt 4.7-stable
  Fix crash in QtScript/JSC stack allocator on Symbian
  HTTP: fix digest authentication
  Fix loop count in animanted gifs sometimes being incorrect
  Fixed UTF-8 application names in device application menu in Symbian
  Validate arguments to QDBusConnection::connect
  make the test a bit stricter
  ...

1 files changed, 2 insertions, 0 deletions

diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index e37e06d..b5bc5d0 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -774,6 +774,8 @@ public:
     void x11UpdateIsOpaque();
     bool isBackgroundInherited() const;
     void updateX11AcceptFocus();
+    QPoint mapToGlobal(const QPoint &pos) const;
+    QPoint mapFromGlobal(const QPoint &pos) const;
 #elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN
     uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine()
 #ifndef QT_NO_GESTURES