diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-08-04 10:33:24 (GMT) |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-08-04 10:33:24 (GMT) |
commit | 67ae1b0dac175f48875507f3187ed49276a29ddf (patch) | |
tree | f8367c5f583a7d279ad137ec88517f36004ca89b /src/gui/widgets/qlineedit_p.h | |
parent | 4aafbd6222e7aeafd59a4a4356ba8c53b2bfa1d1 (diff) | |
download | Qt-67ae1b0dac175f48875507f3187ed49276a29ddf.zip Qt-67ae1b0dac175f48875507f3187ed49276a29ddf.tar.gz Qt-67ae1b0dac175f48875507f3187ed49276a29ddf.tar.bz2 |
Fix more compile breakages after merging qt/master-stable.
A lot of the logic was factored out of QLineEdit(Private) and into a
private class called QLineControl, however the changes did not compile
when keypad navigation is enabled so fix them.
Diffstat (limited to 'src/gui/widgets/qlineedit_p.h')
-rw-r--r-- | src/gui/widgets/qlineedit_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qlineedit_p.h b/src/gui/widgets/qlineedit_p.h index 230023d..b09c3f0 100644 --- a/src/gui/widgets/qlineedit_p.h +++ b/src/gui/widgets/qlineedit_p.h @@ -76,7 +76,7 @@ public: QLineEditPrivate() : control(0), frame(1), contextMenuEnabled(1), cursorVisible(0), - dragEnabled(0), hscroll(0), vscroll(0), + dragEnabled(0), hscroll(0), vscroll(0), clickCausedFocus(0), alignment(Qt::AlignLeading | Qt::AlignVCenter), leftTextMargin(0), topTextMargin(0), rightTextMargin(0), bottomTextMargin(0) { @@ -110,6 +110,7 @@ public: uint contextMenuEnabled : 1; uint cursorVisible : 1; uint dragEnabled : 1; + uint clickCausedFocus : 1; int hscroll; int vscroll; uint alignment; |