diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-24 06:24:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-24 06:24:10 (GMT) |
| commit | 02e2ff4597a7fe81ecbb4b1ef3c5e4a5ac6b7339 (patch) | |
| tree | 578716637feeaeffaca8908c62a7c350aeef8e22 /tests/auto | |
| parent | 9374c12ee1a21768a2e364a052b2374ce6a1ac39 (diff) | |
| parent | 130e906f38dfdbc5be59da3316da35a842a505de (diff) | |
| download | Qt-02e2ff4597a7fe81ecbb4b1ef3c5e4a5ac6b7339.zip Qt-02e2ff4597a7fe81ecbb4b1ef3c5e4a5ac6b7339.tar.gz Qt-02e2ff4597a7fe81ecbb4b1ef3c5e4a5ac6b7339.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Spelling fix
Fixed lost flushes in raster window surface.
uikit: Use correct pixmap data format.
Correctly position aliased lines with flat caps
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp b/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp index d14c75b..4e93663 100644 --- a/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp +++ b/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp @@ -154,7 +154,7 @@ void tst_QAbstractSpinBox::task228728_cssselector() { //QAbstractSpinBox does some call to stylehint into his constructor. //so while the stylesheet want to access property, it should not crash - qApp->setStyleSheet("[alignement=\"1\"], [text=\"foo\"] { color:black; }" ); + qApp->setStyleSheet("[alignment=\"1\"], [text=\"foo\"] { color:black; }" ); QSpinBox box; } |