diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-11 15:14:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-11 16:42:01 +0200 |
| commit | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (patch) | |
| tree | 14810e4d0168c0cc3d69cb286574bf28375c07bc /tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp | |
| parent | b06304e164ba47351fa292662c1e6383c081b5ca (diff) | |
| parent | 7b9d6cf844ece18fef884f51117e25ad4ac31db5 (diff) | |
Merge branch 'stable' into dev
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/json/qjsonwriter.cpp
src/corelib/kernel/qeventdispatcher_blackberry.cpp
src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
Diffstat (limited to 'tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp')
| -rw-r--r-- | tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp index 7925820b70..e942f13562 100644 --- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp +++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp @@ -87,6 +87,7 @@ private slots: void layoutSpacings(); void smallMiniNormalExclusivity_data(); void smallMiniNormalExclusivity(); + void passwordCharacter(); private: static QSize msh(QWidget *widget); @@ -405,6 +406,17 @@ void tst_QMacStyle::smallMiniNormalExclusivity() } } +void tst_QMacStyle::passwordCharacter() +{ + QLineEdit lineEdit; + lineEdit.setEchoMode(QLineEdit::Password); + QTest::keyClick(&lineEdit, Qt::Key_P); + // Should be no password delay; text should instantly be masked. + const QChar bullet(0x2022); + const QString expected(1, bullet); + QCOMPARE(lineEdit.displayText(), expected); +} + QTEST_MAIN(tst_QMacStyle) #include "tst_qmacstyle.moc" |