diff options
| author | axis <qt-info@nokia.com> | 2009-10-29 08:20:38 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-29 08:20:38 (GMT) |
| commit | eed04255446df8a749390e14cef7672c26329f6e (patch) | |
| tree | 1b6cbd53bb0f90f27db3d4e36370bca024e4abad /src/gui/kernel | |
| parent | f360555f3c7ded3c729ce972fbd65f035876b1b4 (diff) | |
| parent | f425c08d4f2e7f061a0ee8e4a1eee2b17fa64962 (diff) | |
| download | Qt-eed04255446df8a749390e14cef7672c26329f6e.zip Qt-eed04255446df8a749390e14cef7672c26329f6e.tar.gz Qt-eed04255446df8a749390e14cef7672c26329f6e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qdesktopwidget.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/kernel/qdesktopwidget.cpp b/src/gui/kernel/qdesktopwidget.cpp index b1e1008..c6d5000 100644 --- a/src/gui/kernel/qdesktopwidget.cpp +++ b/src/gui/kernel/qdesktopwidget.cpp @@ -40,12 +40,11 @@ ****************************************************************************/ #include "qglobal.h" - -QT_BEGIN_NAMESPACE - #include "qdesktopwidget.h" #include "qwidget_p.h" +QT_BEGIN_NAMESPACE + const QRect QDesktopWidget::screenGeometry(const QWidget *widget) const { QRect rect = QWidgetPrivate::screenGeometry(widget); |