9 files changed, 596 insertions, 162 deletions

diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp
new file mode 100644
index 0000000..710023e
--- /dev/null
+++ b/src/corelib/tools/qmargins.cpp
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmargins.h"
+#include "qdatastream.h"
+#include "qdebug.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QMargins
+    \ingroup painting
+
+    \brief The QMargins 
+
+    QMargin defines a set of four margins; left, top, right and bottom,
+    that describe the size of the borders surrounding a rectangle.
+
+    The isNull() function returns true only if all margins are set to zero.
+
+    QMargin objects can be streamed as well as compared.
+
+*/
+
+
+/*****************************************************************************
+  QMargins member functions
+ *****************************************************************************/
+
+/*!
+    \fn QMargins::QMargins()
+
+    Constructs a margins object with all margins set to 0.
+
+    \sa isValid()
+*/
+
+/*!
+    \fn QMargins::QMargins(int left, int top, int right, int bottom)
+
+    Constructs margins with the given \a left, \a top, \a right, \a bottom
+
+    \sa setWidth(), setHeight()
+*/
+
+/*!
+    \fn bool QMargins::isNull() const
+
+    Returns true if all margins are is 0; otherwise returns
+    false.
+
+    \sa isValid(), isEmpty()
+*/
+
+
+/*!
+    \fn int QMargins::left() const
+
+    Returns the left margin.
+
+    \sa setLeft()
+*/
+
+/*!
+    \fn int QMargins::top() const
+
+    Returns the top margin.
+
+    \sa setTop()
+*/
+
+/*!
+    \fn int QMargins::right() const
+
+    Returns the right margin.
+*/
+
+/*!
+    \fn int QMargins::bottom() const
+
+    Returns the bottom margin.
+*/
+
+
+/*!
+    \fn void QMargins::setLeft(int left)
+
+    Sets the left margin to \a left.
+*/
+
+/*!
+    \fn void QMargins::setTop(int Top)
+
+    Sets the Top margin to \a Top.
+*/
+
+/*!
+    \fn void QMargins::setRight(int right)
+
+    Sets the right margin to \a right.
+*/
+
+/*!
+    \fn void QMargins::setBottom(int bottom)
+
+    Sets the bottom margin to \a bottom.
+*/
+
+/*!
+    \fn bool operator==(const QMargins &m1, const QMargins &m2)
+    \relates QMargins
+
+    Returns true if \a m1 and \a m2 are equal; otherwise returns false.
+*/
+
+/*!
+    \fn bool operator!=(const QMargins &m1, const QMargins &m2)
+    \relates QMargins
+
+    Returns true if \a m1 and \a m2 are different; otherwise returns false.
+*/
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, const QMargins &m) {
+    dbg.nospace() << "QMargins(" << m.left() << ", "
+            << m.top() << ", " << m.right() << ", " << m.bottom() << ')';
+    return dbg.space();
+}
+#endif
+
+QT_END_NAMESPACE
diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h
new file mode 100644
index 0000000..de5ce0d
--- /dev/null
+++ b/src/corelib/tools/qmargins.h
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMARGINS_H
+#define QMARGINS_H
+
+#include <QtCore/qnamespace.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Core)
+
+class Q_CORE_EXPORT QMargins
+{
+public:
+    QMargins();
+    QMargins(int left, int top, int right, int bottom);
+
+    bool isNull() const;
+
+    int left() const;
+    int top() const;
+    int right() const;
+    int bottom() const;
+
+    void setLeft(int left);
+    void setTop(int top);
+    void setRight(int right);
+    void setBottom(int bottom);
+
+    int &rleft();
+    int &rtop();
+    int &rright();
+    int &rbottom();
+
+private:
+    int m_left;
+    int m_top;
+    int m_right;
+    int m_bottom;
+
+    friend inline bool operator==(const QMargins &, const QMargins &);
+    friend inline bool operator!=(const QMargins &, const QMargins &);
+};
+
+Q_DECLARE_TYPEINFO(QMargins, Q_MOVABLE_TYPE);
+
+/*****************************************************************************
+  QMargins inline functions
+ *****************************************************************************/
+
+inline QMargins::QMargins()
+{ m_top = m_bottom = m_left = m_right = 0; }
+
+inline QMargins::QMargins(int left, int top, int right, int bottom)
+{ m_left = left; m_top = top; m_right = right; m_bottom = bottom; }
+
+inline bool QMargins::isNull() const
+{ return m_left==0 && m_top==0 && m_right==0 && m_bottom==0; }
+
+inline int QMargins::left() const
+{ return m_left; }
+
+inline int QMargins::top() const
+{ return m_top; }
+
+inline int QMargins::right() const
+{ return m_right; }
+
+inline int QMargins::bottom() const
+{ return m_bottom; }
+
+
+inline void QMargins::setLeft(int left)
+{ m_left = left; }
+
+inline void QMargins::setTop(int top)
+{ m_top = top; }
+
+inline void QMargins::setRight(int right)
+{ m_right = right; }
+
+inline void QMargins::setBottom(int bottom)
+{ m_bottom = bottom; }
+
+inline bool operator==(const QMargins &m1, const QMargins &m2)
+{
+    return
+            m1.m_left == m2.m_left &&
+            m1.m_top == m2.m_top &&
+            m1.m_right == m2.m_right &&
+            m1.m_bottom == m2.m_bottom;
+}
+
+inline bool operator!=(const QMargins &m1, const QMargins &m2)
+{
+    return
+            m1.m_left != m2.m_left ||
+            m1.m_top != m2.m_top ||
+            m1.m_right != m2.m_right ||
+            m1.m_bottom != m2.m_bottom;
+}
+
+#ifndef QT_NO_DEBUG_STREAM
+Q_CORE_EXPORT QDebug operator<<(QDebug, const QMargins &);
+#endif
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QMARGINS_H
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 464c60f..007b763 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -1,77 +1,79 @@
 # Qt tools module
 
 HEADERS +=  \
-	tools/qalgorithms.h \
-	tools/qbitarray.h \
-	tools/qbytearray.h \
-	tools/qbytearraymatcher.h \
+        tools/qalgorithms.h \
+        tools/qbitarray.h \
+        tools/qbytearray.h \
+        tools/qbytearraymatcher.h \
         tools/qbytedata_p.h \
-	tools/qcache.h \
-	tools/qchar.h \
-	tools/qcontainerfwd.h \
-	tools/qcryptographichash.h \
-	tools/qdatetime.h \
-	tools/qdatetime_p.h \
+        tools/qcache.h \
+        tools/qchar.h \
+        tools/qcontainerfwd.h \
+        tools/qcryptographichash.h \
+        tools/qdatetime.h \
+        tools/qdatetime_p.h \
         tools/qeasingcurve.h \
-	tools/qhash.h \
+        tools/qhash.h \
         tools/qline.h \
-	tools/qlinkedlist.h \
-	tools/qlist.h \
-	tools/qlocale.h \
-	tools/qlocale_p.h \
-	tools/qlocale_data_p.h \
-	tools/qmap.h \
+        tools/qlinkedlist.h \
+        tools/qlist.h \
+        tools/qlocale.h \
+        tools/qlocale_p.h \
+        tools/qlocale_data_p.h \
+        tools/qmap.h \
+        tools/qmargins.h \
         tools/qcontiguouscache.h \
         tools/qpodlist_p.h \
         tools/qpoint.h \
-	tools/qqueue.h \
+        tools/qqueue.h \
         tools/qrect.h \
-	tools/qregexp.h \
-	tools/qringbuffer_p.h \
-	tools/qshareddata.h \
+        tools/qregexp.h \
+        tools/qringbuffer_p.h \
+        tools/qshareddata.h \
         tools/qsharedpointer.h \
         tools/qsharedpointer_impl.h \
-	tools/qset.h \
+        tools/qset.h \
         tools/qsize.h \
-	tools/qstack.h \
-	tools/qstring.h \
-	tools/qstringbuilder.h \
-	tools/qstringlist.h \
-	tools/qstringmatcher.h \
-	tools/qtextboundaryfinder.h \
-	tools/qtimeline.h \
-	tools/qunicodetables_p.h \
-	tools/qvarlengtharray.h \
-	tools/qvector.h \
+        tools/qstack.h \
+        tools/qstring.h \
+        tools/qstringbuilder.h \
+        tools/qstringlist.h \
+        tools/qstringmatcher.h \
+        tools/qtextboundaryfinder.h \
+        tools/qtimeline.h \
+        tools/qunicodetables_p.h \
+        tools/qvarlengtharray.h \
+        tools/qvector.h \
         tools/qscopedpointer.h
 
 
 SOURCES += \
-	tools/qbitarray.cpp \
-	tools/qbytearray.cpp \
-	tools/qbytearraymatcher.cpp \
-	tools/qcryptographichash.cpp \
-	tools/qdatetime.cpp \
+        tools/qbitarray.cpp \
+        tools/qbytearray.cpp \
+        tools/qbytearraymatcher.cpp \
+        tools/qcryptographichash.cpp \
+        tools/qdatetime.cpp \
         tools/qeasingcurve.cpp \
-	tools/qhash.cpp \
+        tools/qhash.cpp \
         tools/qline.cpp \
-	tools/qlinkedlist.cpp \
-	tools/qlist.cpp \
-	tools/qlocale.cpp \
+        tools/qlinkedlist.cpp \
+        tools/qlist.cpp \
+        tools/qlocale.cpp \
         tools/qpoint.cpp \
-	tools/qmap.cpp \
-	tools/qcontiguouscache.cpp \
+        tools/qmap.cpp \
+        tools/qmargins.cpp \
+        tools/qcontiguouscache.cpp \
         tools/qrect.cpp \
-	tools/qregexp.cpp \
-	tools/qshareddata.cpp \
-	tools/qsharedpointer.cpp \
+        tools/qregexp.cpp \
+        tools/qshareddata.cpp \
+        tools/qsharedpointer.cpp \
         tools/qsize.cpp \
-	tools/qstring.cpp \
-	tools/qstringbuilder.cpp \
-	tools/qstringlist.cpp \
-	tools/qtextboundaryfinder.cpp \
-	tools/qtimeline.cpp \
-	tools/qvector.cpp \
+        tools/qstring.cpp \
+        tools/qstringbuilder.cpp \
+        tools/qstringlist.cpp \
+        tools/qtextboundaryfinder.cpp \
+        tools/qtimeline.cpp \
+        tools/qvector.cpp \
         tools/qvsnprintf.cpp
 
 symbian:SOURCES+=tools/qlocale_symbian.cpp
@@ -81,17 +83,17 @@ contains(QT_CONFIG, zlib) {
    wince*: DEFINES += NO_ERRNO_H
    INCLUDEPATH += ../3rdparty/zlib
    SOURCES+= \
-	../3rdparty/zlib/adler32.c \
-	../3rdparty/zlib/compress.c \
-	../3rdparty/zlib/crc32.c \
-	../3rdparty/zlib/deflate.c \
-	../3rdparty/zlib/gzio.c \
-	../3rdparty/zlib/inffast.c \
-	../3rdparty/zlib/inflate.c \
-	../3rdparty/zlib/inftrees.c \
-	../3rdparty/zlib/trees.c \
-	../3rdparty/zlib/uncompr.c \
-	../3rdparty/zlib/zutil.c
+        ../3rdparty/zlib/adler32.c \
+        ../3rdparty/zlib/compress.c \
+        ../3rdparty/zlib/crc32.c \
+        ../3rdparty/zlib/deflate.c \
+        ../3rdparty/zlib/gzio.c \
+        ../3rdparty/zlib/inffast.c \
+        ../3rdparty/zlib/inflate.c \
+        ../3rdparty/zlib/inftrees.c \
+        ../3rdparty/zlib/trees.c \
+        ../3rdparty/zlib/uncompr.c \
+        ../3rdparty/zlib/zutil.c
 } else:!contains(QT_CONFIG, no-zlib) {
    unix:LIBS_PRIVATE += -lz
 #  win32:LIBS += libz.lib
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index ff644b8..37ffa8fb 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -6748,7 +6748,27 @@ void QWidget::setContentsMargins(int left, int top, int right, int bottom)
     QApplication::sendEvent(this, &e);
 }
 
-/*!  Returns the widget's contents margins for \a left, \a top, \a
+/*!
+  \overload
+  \since 4.6
+
+  Sets the margins around the contents of the widget to have the
+  sizes determined by \a margins. The margins are
+  used by the layout system, and may be used by subclasses to
+  specify the area to draw in (e.g. excluding the frame).
+
+  Changing the margins will trigger a resizeEvent().
+
+  \sa contentsRect(), getContentsMargins()
+*/
+void QWidget::setContentsMargins(const QMargins &margins)
+{
+    setContentsMargins(margins.left(), margins.top(),
+                       margins.right(), margins.bottom());
+}
+
+/*!
+  Returns the widget's contents margins for \a left, \a top, \a
   right, and \a bottom.
 
   \sa setContentsMargins(), contentsRect()
@@ -6767,6 +6787,20 @@ void QWidget::getContentsMargins(int *left, int *top, int *right, int *bottom) c
 }
 
 /*!
+  \since 4.6
+
+  Returns the widget's contents margins.
+
+  \sa getContentsMargins(), setContentsMargins(), contentsRect()
+ */
+QMargins QWidget::contentsMargins() const
+{
+    Q_D(const QWidget);
+    return QMargins(d->leftmargin, d->topmargin, d->rightmargin, d->bottommargin);
+}
+
+
+/*!
     Returns the area inside the widget's margins.
 
     \sa setContentsMargins(), getContentsMargins()
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index 38650f0..f398dbd 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -44,6 +44,7 @@
 
 #include <QtGui/qwindowdefs.h>
 #include <QtCore/qobject.h>
+#include <QtCore/qmargins.h>
 #include <QtGui/qpaintdevice.h>
 #include <QtGui/qpalette.h>
 #include <QtGui/qfont.h>
@@ -527,7 +528,10 @@ public:
     QRegion visibleRegion() const;
 
     void setContentsMargins(int left, int top, int right, int bottom);
+    void setContentsMargins(const QMargins &margins);
     void getContentsMargins(int *left, int *top, int *right, int *bottom) const;
+    QMargins contentsMargins() const;
+
     QRect contentsRect() const;
 
 public:
diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp
index 59a5063..2220206 100644
--- a/src/gui/painting/qdrawutil.cpp
+++ b/src/gui/painting/qdrawutil.cpp
@@ -1038,27 +1038,6 @@ void qDrawItem(QPainter *p, Qt::GUIStyle gs,
 #endif
 
 /*!
-    \class QMargins
-    \since 4.6
-
-    Holds the borders used to split a pixmap into nine segments in order to
-    draw it, similar to \l{http://www.w3.org/TR/css3-background/}
-    {CSS3 border-images}.
-
-    \sa Qt::TileRule, QTileRules
-*/
-
-/*! \fn QMargins::QMargins(int margin)
-  Constructs a QMargins with the top, left, bottom, and
-  right margins set to \a margin.
-*/
-
-/*! \fn QMargins::QMargins(int topMargin, int leftMargin, int bottomMargin, int rightMargin)
-  Constructs a QMargins with the given \a topMargin, \a leftMargin,
-  \a bottomMargin, and \a rightMargin.
- */
-
-/*!
     \class QTileRules
     \since 4.6
 
@@ -1195,79 +1174,79 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
     // source center
     const int sourceTop = sourceRect.top();
     const int sourceLeft = sourceRect.left();
-    const int sourceCenterTop = sourceTop + sourceMargins.top;
-    const int sourceCenterLeft = sourceLeft + sourceMargins.left;
-    const int sourceCenterBottom = sourceRect.bottom() - sourceMargins.bottom + 1;
-    const int sourceCenterRight = sourceRect.right() - sourceMargins.right + 1;
-    const int sourceCenterWidth = sourceCenterRight - sourceMargins.left;
-    const int sourceCenterHeight = sourceCenterBottom - sourceMargins.top;
+    const int sourceCenterTop = sourceTop + sourceMargins.top();
+    const int sourceCenterLeft = sourceLeft + sourceMargins.left();
+    const int sourceCenterBottom = sourceRect.bottom() - sourceMargins.bottom() + 1;
+    const int sourceCenterRight = sourceRect.right() - sourceMargins.right() + 1;
+    const int sourceCenterWidth = sourceCenterRight - sourceMargins.left();
+    const int sourceCenterHeight = sourceCenterBottom - sourceMargins.top();
     // target center
     const int targetTop = targetRect.top();
     const int targetLeft = targetRect.left();
-    const int targetCenterTop = targetTop + targetMargins.top;
-    const int targetCenterLeft = targetLeft + targetMargins.left;
-    const int targetCenterBottom = targetRect.bottom() - targetMargins.bottom + 1;
-    const int targetCenterRight = targetRect.right() - targetMargins.right + 1;
+    const int targetCenterTop = targetTop + targetMargins.top();
+    const int targetCenterLeft = targetLeft + targetMargins.left();
+    const int targetCenterBottom = targetRect.bottom() - targetMargins.bottom() + 1;
+    const int targetCenterRight = targetRect.right() - targetMargins.right() + 1;
     const int targetCenterWidth = targetCenterRight - targetCenterLeft;
     const int targetCenterHeight = targetCenterBottom - targetCenterTop;
 
     // corners
-    if (targetMargins.top > 0 && targetMargins.left > 0 && sourceMargins.top > 0 && sourceMargins.left > 0) { // top left
-        const QRect targetTopLeftRect(targetLeft, targetTop, targetMargins.left, targetMargins.top);
-        const QRect sourceTopLeftRect(sourceLeft, sourceTop, sourceMargins.left, sourceMargins.top);
+    if (targetMargins.top() > 0 && targetMargins.left() > 0 && sourceMargins.top() > 0 && sourceMargins.left() > 0) { // top left
+        const QRect targetTopLeftRect(targetLeft, targetTop, targetMargins.left(), targetMargins.top());
+        const QRect sourceTopLeftRect(sourceLeft, sourceTop, sourceMargins.left(), sourceMargins.top());
         qDrawPixmap(painter, targetTopLeftRect, pixmap, sourceTopLeftRect);
     }
-    if (targetMargins.top > 0 && targetMargins.right > 0 && sourceMargins.top > 0 && sourceMargins.right > 0) { // top right
-        const QRect targetTopRightRect(targetCenterRight, targetTop, targetMargins.right, targetMargins.top);
-        const QRect sourceTopRightRect(sourceCenterRight, sourceTop, sourceMargins.right, sourceMargins.top);
+    if (targetMargins.top() > 0 && targetMargins.right() > 0 && sourceMargins.top() > 0 && sourceMargins.right() > 0) { // top right
+        const QRect targetTopRightRect(targetCenterRight, targetTop, targetMargins.right(), targetMargins.top());
+        const QRect sourceTopRightRect(sourceCenterRight, sourceTop, sourceMargins.right(), sourceMargins.top());
         qDrawPixmap(painter, targetTopRightRect, pixmap, sourceTopRightRect);
     }
-    if (targetMargins.bottom > 0 && targetMargins.left > 0 && sourceMargins.bottom > 0 && sourceMargins.left > 0) { // bottom left
-        const QRect targetBottomLeftRect(targetLeft, targetCenterBottom, targetMargins.left, targetMargins.bottom);
-        const QRect sourceBottomLeftRect(sourceLeft, sourceCenterBottom, sourceMargins.left, sourceMargins.bottom);
+    if (targetMargins.bottom() > 0 && targetMargins.left() > 0 && sourceMargins.bottom() > 0 && sourceMargins.left() > 0) { // bottom left
+        const QRect targetBottomLeftRect(targetLeft, targetCenterBottom, targetMargins.left(), targetMargins.bottom());
+        const QRect sourceBottomLeftRect(sourceLeft, sourceCenterBottom, sourceMargins.left(), sourceMargins.bottom());
         qDrawPixmap(painter, targetBottomLeftRect, pixmap, sourceBottomLeftRect);
     }
-    if (targetMargins.bottom > 0 && targetMargins.right > 0 && sourceMargins.bottom > 0 && sourceMargins.right > 0) { // bottom right
-        const QRect targetBottomRightRect(targetCenterRight, targetCenterBottom, targetMargins.right, targetMargins.bottom);
-        const QRect sourceBottomRightRect(sourceCenterRight, sourceCenterBottom, sourceMargins.right, sourceMargins.bottom);
+    if (targetMargins.bottom() > 0 && targetMargins.right() > 0 && sourceMargins.bottom() > 0 && sourceMargins.right() > 0) { // bottom right
+        const QRect targetBottomRightRect(targetCenterRight, targetCenterBottom, targetMargins.right(), targetMargins.bottom());
+        const QRect sourceBottomRightRect(sourceCenterRight, sourceCenterBottom, sourceMargins.right(), sourceMargins.bottom());
         qDrawPixmap(painter, targetBottomRightRect, pixmap, sourceBottomRightRect);
     }
 
     // horizontal edges
     switch (rules.horizontal) {
         case Qt::Stretch:
-        if (targetMargins.top > 0 && sourceMargins.top > 0) { // top
-            const QRect targetTopRect(targetCenterLeft, targetTop, targetCenterWidth, targetMargins.top);
-            const QRect sourceTopRect(sourceCenterLeft, sourceTop, sourceCenterWidth, sourceMargins.top);
+        if (targetMargins.top() > 0 && sourceMargins.top() > 0) { // top
+            const QRect targetTopRect(targetCenterLeft, targetTop, targetCenterWidth, targetMargins.top());
+            const QRect sourceTopRect(sourceCenterLeft, sourceTop, sourceCenterWidth, sourceMargins.top());
             qDrawPixmap(painter, targetTopRect, pixmap, sourceTopRect);
         }
-        if (targetMargins.bottom > 0 && sourceMargins.bottom > 0) { // bottom
-            const QRect targetBottomRect(targetCenterLeft, targetCenterBottom, targetCenterWidth, targetMargins.bottom);
-            const QRect sourceBottomRect(sourceCenterLeft, sourceCenterBottom, sourceCenterWidth, sourceMargins.bottom);
+        if (targetMargins.bottom() > 0 && sourceMargins.bottom() > 0) { // bottom
+            const QRect targetBottomRect(targetCenterLeft, targetCenterBottom, targetCenterWidth, targetMargins.bottom());
+            const QRect sourceBottomRect(sourceCenterLeft, sourceCenterBottom, sourceCenterWidth, sourceMargins.bottom());
             qDrawPixmap(painter, targetBottomRect, pixmap, sourceBottomRect);
         }
         break;
         case Qt::Repeat:
-        if (targetMargins.top > 0 && sourceMargins.top > 0) { // top
-            const QRect targetTopRect(targetCenterLeft, targetTop, targetCenterWidth, targetMargins.top);
-            const QRect sourceTopRect(sourceCenterLeft, sourceTop, sourceCenterWidth, sourceMargins.top);
+        if (targetMargins.top() > 0 && sourceMargins.top() > 0) { // top
+            const QRect targetTopRect(targetCenterLeft, targetTop, targetCenterWidth, targetMargins.top());
+            const QRect sourceTopRect(sourceCenterLeft, sourceTop, sourceCenterWidth, sourceMargins.top());
             qDrawHorizontallyRepeatedPixmap(painter, targetTopRect, pixmap, sourceTopRect);
         }
-        if (targetMargins.bottom > 0 && sourceMargins.bottom > 0) { // bottom
-            const QRect targetBottomRect(targetCenterLeft, targetCenterBottom, targetCenterWidth, targetMargins.bottom);
-            const QRect sourceBottomRect(sourceCenterLeft, sourceCenterBottom, sourceCenterWidth, sourceMargins.bottom);
+        if (targetMargins.bottom() > 0 && sourceMargins.bottom() > 0) { // bottom
+            const QRect targetBottomRect(targetCenterLeft, targetCenterBottom, targetCenterWidth, targetMargins.bottom());
+            const QRect sourceBottomRect(sourceCenterLeft, sourceCenterBottom, sourceCenterWidth, sourceMargins.bottom());
             qDrawHorizontallyRepeatedPixmap(painter, targetBottomRect, pixmap, sourceBottomRect);
         }
         break;
         case Qt::Round:
-        if (targetMargins.top > 0 && sourceMargins.top > 0) { // top
-            const QRect targetTopRect(targetCenterLeft, targetTop, targetCenterWidth, targetMargins.top);
-            const QRect sourceTopRect(sourceCenterLeft, sourceTop, sourceCenterWidth, sourceMargins.top);
+        if (targetMargins.top() > 0 && sourceMargins.top() > 0) { // top
+            const QRect targetTopRect(targetCenterLeft, targetTop, targetCenterWidth, targetMargins.top());
+            const QRect sourceTopRect(sourceCenterLeft, sourceTop, sourceCenterWidth, sourceMargins.top());
             qDrawHorizontallyRoundedPixmap(painter, targetTopRect, pixmap, sourceTopRect);
         }
-        if (targetMargins.bottom > 0 && sourceMargins.bottom > 0) { // bottom
-            const QRect targetBottomRect(targetCenterLeft, targetCenterBottom, targetCenterWidth, targetMargins.bottom);
-            const QRect sourceBottomRect(sourceCenterLeft, sourceCenterBottom, sourceCenterWidth, sourceMargins.bottom);
+        if (targetMargins.bottom() > 0 && sourceMargins.bottom() > 0) { // bottom
+            const QRect targetBottomRect(targetCenterLeft, targetCenterBottom, targetCenterWidth, targetMargins.bottom());
+            const QRect sourceBottomRect(sourceCenterLeft, sourceCenterBottom, sourceCenterWidth, sourceMargins.bottom());
             qDrawHorizontallyRoundedPixmap(painter, targetBottomRect, pixmap, sourceBottomRect);
         }
         break;
@@ -1276,38 +1255,38 @@ void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargin
     // vertical edges
     switch (rules.vertical) {
         case Qt::Stretch:
-        if (targetMargins.left > 0 && sourceMargins.left > 0) { // left
-            const QRect targetLeftRect(targetLeft, targetCenterTop, targetMargins.left, targetCenterHeight);
-            const QRect sourceLeftRect(sourceLeft, sourceCenterTop, sourceMargins.left, sourceCenterHeight);
+        if (targetMargins.left() > 0 && sourceMargins.left() > 0) { // left
+            const QRect targetLeftRect(targetLeft, targetCenterTop, targetMargins.left(), targetCenterHeight);
+            const QRect sourceLeftRect(sourceLeft, sourceCenterTop, sourceMargins.left(), sourceCenterHeight);
             qDrawPixmap(painter, targetLeftRect, pixmap, sourceLeftRect);
         }
-        if (targetMargins.right > 0 && sourceMargins.right > 0) { // right
-            const QRect targetRightRect(targetCenterRight, targetCenterTop, targetMargins.right, targetCenterHeight);
-            const QRect sourceRightRect(sourceCenterRight, sourceCenterTop, sourceMargins.right, sourceCenterHeight);
+        if (targetMargins.right() > 0 && sourceMargins.right() > 0) { // right
+            const QRect targetRightRect(targetCenterRight, targetCenterTop, targetMargins.right(), targetCenterHeight);
+            const QRect sourceRightRect(sourceCenterRight, sourceCenterTop, sourceMargins.right(), sourceCenterHeight);
             qDrawPixmap(painter, targetRightRect, pixmap, sourceRightRect);
         }
         break;
         case Qt::Repeat:
-        if (targetMargins.left > 0 && sourceMargins.left > 0) { // left
-            const QRect targetLeftRect(targetLeft, targetCenterTop, targetMargins.left, targetCenterHeight);
-            const QRect sourceLeftRect(sourceLeft, sourceCenterTop, sourceMargins.left, sourceCenterHeight);
+        if (targetMargins.left() > 0 && sourceMargins.left() > 0) { // left
+            const QRect targetLeftRect(targetLeft, targetCenterTop, targetMargins.left(), targetCenterHeight);
+            const QRect sourceLeftRect(sourceLeft, sourceCenterTop, sourceMargins.left(), sourceCenterHeight);
             qDrawVerticallyRepeatedPixmap(painter, targetLeftRect, pixmap, sourceLeftRect);
         }
-        if (targetMargins.right > 0 && sourceMargins.right > 0) { // right
-            const QRect targetRightRect(targetCenterRight, targetCenterTop, targetMargins.right, targetCenterHeight);
-            const QRect sourceRightRect(sourceCenterRight, sourceCenterTop, sourceMargins.right, sourceCenterHeight);
+        if (targetMargins.right() > 0 && sourceMargins.right() > 0) { // right
+            const QRect targetRightRect(targetCenterRight, targetCenterTop, targetMargins.right(), targetCenterHeight);
+            const QRect sourceRightRect(sourceCenterRight, sourceCenterTop, sourceMargins.right(), sourceCenterHeight);
             qDrawVerticallyRepeatedPixmap(painter, targetRightRect, pixmap, sourceRightRect);
         }
         break;
         case Qt::Round:
-        if (targetMargins.left > 0 && sourceMargins.left > 0) { // left
-            const QRect targetLeftRect(targetLeft, targetCenterTop, targetMargins.left, targetCenterHeight);
-            const QRect sourceLeftRect(sourceLeft, sourceCenterTop, sourceMargins.left, sourceCenterHeight);
+        if (targetMargins.left() > 0 && sourceMargins.left() > 0) { // left
+            const QRect targetLeftRect(targetLeft, targetCenterTop, targetMargins.left(), targetCenterHeight);
+            const QRect sourceLeftRect(sourceLeft, sourceCenterTop, sourceMargins.left(), sourceCenterHeight);
             qDrawVerticallyRoundedPixmap(painter, targetLeftRect, pixmap, sourceLeftRect);
         }
-        if (targetMargins.right > 0 && sourceMargins.right > 0) { // right
-            const QRect targetRightRect(targetCenterRight, targetCenterTop, targetMargins.right, targetCenterHeight);
-            const QRect sourceRightRect(sourceCenterRight, sourceCenterTop, sourceMargins.right, sourceCenterHeight);
+        if (targetMargins.right() > 0 && sourceMargins.right() > 0) { // right
+            const QRect targetRightRect(targetCenterRight, targetCenterTop, targetMargins.right(), targetCenterHeight);
+            const QRect sourceRightRect(sourceCenterRight, sourceCenterTop, sourceMargins.right(), sourceCenterHeight);
             qDrawVerticallyRoundedPixmap(painter, targetRightRect, pixmap, sourceRightRect);
         }
         break;
diff --git a/src/gui/painting/qdrawutil.h b/src/gui/painting/qdrawutil.h
index 4135c19..38ef30e 100644
--- a/src/gui/painting/qdrawutil.h
+++ b/src/gui/painting/qdrawutil.h
@@ -44,8 +44,8 @@
 
 #include <QtCore/qnamespace.h>
 #include <QtCore/qstring.h> // char*->QString conversion
+#include <QtCore/qmargins.h>
 #include <QtGui/qpixmap.h>
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -133,24 +133,6 @@ Q_GUI_EXPORT QT3_SUPPORT void qDrawArrow(QPainter *p, Qt::ArrowType type, Qt::GU
                           const QPalette &pal, bool enabled);
 #endif
 
-struct QMargins
-{
-    inline QMargins(int margin = 0)
-        : top(margin),
-          left(margin),
-          bottom(margin),
-          right(margin) {}
-    inline QMargins(int topMargin, int leftMargin, int bottomMargin, int rightMargin)
-         : top(topMargin),
-           left(leftMargin),
-           bottom(bottomMargin),
-           right(rightMargin) {}
-    int top;
-    int left;
-    int bottom;
-    int right;
-};
-
 struct QTileRules
 {
     inline QTileRules(Qt::TileRule horizontalRule, Qt::TileRule verticalRule = Qt::Stretch)
diff --git a/tests/auto/qmargins/qmargins.pro b/tests/auto/qmargins/qmargins.pro
new file mode 100644
index 0000000..5a6aa4f
--- /dev/null
+++ b/tests/auto/qmargins/qmargins.pro
@@ -0,0 +1,3 @@
+load(qttest_p4)
+SOURCES += tst_qmargins.cpp
+QT = core
diff --git a/tests/auto/qmargins/tst_qmargins.cpp b/tests/auto/qmargins/tst_qmargins.cpp
new file mode 100644
index 0000000..070aa19
--- /dev/null
+++ b/tests/auto/qmargins/tst_qmargins.cpp
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+#include <qmargins.h>
+
+Q_DECLARE_METATYPE(QMargins)
+
+//TESTED_CLASS=
+//TESTED_FILES=
+
+class tst_QMargins : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QMargins();
+    virtual ~tst_QMargins();
+
+
+public slots:
+    void init();
+    void cleanup();
+private slots:
+    void getSetCheck();
+};
+
+// Testing get/set functions
+void tst_QMargins::getSetCheck()
+{
+    QMargins margins;
+    // int QMargins::width()
+    // void QMargins::setWidth(int)
+    margins.setLeft(0);
+    QCOMPARE(0, margins.left());
+    margins.setTop(INT_MIN);
+    QCOMPARE(INT_MIN, margins.top());
+    margins.setBottom(INT_MAX);
+    QCOMPARE(INT_MAX, margins.bottom());
+    margins.setRight(INT_MAX);
+    QCOMPARE(INT_MAX, margins.right());
+
+    margins = QMargins();
+    QVERIFY(margins.isNull());
+    margins.setLeft(5);
+    margins.setRight(5);
+    QVERIFY(!margins.isNull());
+    QCOMPARE(margins, QMargins(5, 0, 5, 0));
+} 
+
+tst_QMargins::tst_QMargins()
+{
+}
+
+tst_QMargins::~tst_QMargins()
+{
+}
+
+void tst_QMargins::init()
+{
+}
+
+void tst_QMargins::cleanup()
+{
+}
+
+
+
+QTEST_APPLESS_MAIN(tst_QMargins)
+#include "tst_qmargins.moc"