summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qlineedit.h
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2009-11-09 23:21:25 (GMT)
committerBill King <bill.king@nokia.com>2009-11-09 23:21:25 (GMT)
commite80adac9902abfd423aae23dd22f490a33763228 (patch)
tree63cc04b5546454fcf668125169c6793fcdbdf04c /src/gui/widgets/qlineedit.h
parent87fb186c553d0875c92938a6fd5a9aaf8d69a057 (diff)
parentb770abdd564f28a8d9dde816f72f73e6b15984af (diff)
downloadQt-e80adac9902abfd423aae23dd22f490a33763228.zip
Qt-e80adac9902abfd423aae23dd22f490a33763228.tar.gz
Qt-e80adac9902abfd423aae23dd22f490a33763228.tar.bz2
Merge branch '4.6' of ../qt into 4.6
Diffstat (limited to 'src/gui/widgets/qlineedit.h')
-rw-r--r--src/gui/widgets/qlineedit.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/widgets/qlineedit.h b/src/gui/widgets/qlineedit.h
index 214509a..ac918c7 100644
--- a/src/gui/widgets/qlineedit.h
+++ b/src/gui/widgets/qlineedit.h
@@ -44,6 +44,7 @@
#include <QtGui/qframe.h>
#include <QtCore/qstring.h>
+#include <QtCore/qmargins.h>
QT_BEGIN_HEADER
@@ -158,7 +159,9 @@ public:
bool hasAcceptableInput() const;
void setTextMargins(int left, int top, int right, int bottom);
+ void setTextMargins(const QMargins &margins);
void getTextMargins(int *left, int *top, int *right, int *bottom) const;
+ QMargins textMargins() const;
public Q_SLOTS:
void setText(const QString &);