diff options
| author | ck <qt-info@nokia.com> | 2009-07-07 09:26:48 (GMT) |
|---|---|---|
| committer | ck <qt-info@nokia.com> | 2009-07-07 09:26:48 (GMT) |
| commit | ea80c1682ec2bb3bc876d63518e3e6ce794df913 (patch) | |
| tree | fe5dd17351437a45f126b6be631415d7c5dd2073 /tests/auto | |
| parent | ac6fad8a677eb113839ff4ca79c8185e0aa8237b (diff) | |
| parent | a28dc778305cf67830f15119b29c5a77754a8c18 (diff) | |
| download | Qt-ea80c1682ec2bb3bc876d63518e3e6ce794df913.zip Qt-ea80c1682ec2bb3bc876d63518e3e6ce794df913.tar.gz Qt-ea80c1682ec2bb3bc876d63518e3e6ce794df913.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qfontcombobox/tst_qfontcombobox.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/qfontcombobox/tst_qfontcombobox.cpp index 62bfdf7..e2515ae 100644 --- a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp +++ b/tests/auto/qfontcombobox/tst_qfontcombobox.cpp @@ -122,7 +122,10 @@ void tst_QFontComboBox::currentFont_data() { QTest::addColumn<QFont>("currentFont"); // Normalize the names - QTest::newRow("default") << QFont(QFontInfo(QFont()).family()); + QFont defaultFont; + QTest::newRow("default") << defaultFont; + defaultFont.setPointSize(defaultFont.pointSize() + 10); + QTest::newRow("default") << defaultFont; QFontDatabase db; QStringList list = db.families(); for (int i = 0; i < list.count(); ++i) { @@ -141,6 +144,7 @@ void tst_QFontComboBox::currentFont() QFont oldCurrentFont = box.currentFont(); box.setCurrentFont(currentFont); + QCOMPARE(box.currentFont(), currentFont); QString boxFontFamily = QFontInfo(box.currentFont()).family(); QRegExp foundry(" \\[.*\\]"); if (!currentFont.family().contains(foundry)) |