summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qdesktopwidget.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-10-29 05:35:30 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-10-29 05:35:30 (GMT)
commitfbf4dc0f22177375d4591e76cf1c243c3cf985e2 (patch)
tree54fa0880f7ccbe6c07ee45c06c92f8f92c2c8b87 /src/gui/kernel/qdesktopwidget.cpp
parent6c3b7fb91fe512479f7321eb4d3f577cb8bbd1a7 (diff)
parente532322a7bb58f6b2527fa42063b5bccde318105 (diff)
downloadQt-fbf4dc0f22177375d4591e76cf1c243c3cf985e2.zip
Qt-fbf4dc0f22177375d4591e76cf1c243c3cf985e2.tar.gz
Qt-fbf4dc0f22177375d4591e76cf1c243c3cf985e2.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qdesktopwidget.cpp')
-rw-r--r--src/gui/kernel/qdesktopwidget.cpp5
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);