diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 06:56:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 06:56:24 (GMT) |
| commit | 369f899e69362b2156800f8c90dfb0bdbe5f2598 (patch) | |
| tree | ae5b78fa15d63f3b2764224cd3ad0b6f9e51a7fc /src/gui/text/qfontsubset.cpp | |
| parent | 4d848478706e1a32eb0d85e222ba029f68a768d7 (diff) | |
| parent | 0da153d47da2dcc59b33bc47ea949ceaf3189579 (diff) | |
| download | Qt-369f899e69362b2156800f8c90dfb0bdbe5f2598.zip Qt-369f899e69362b2156800f8c90dfb0bdbe5f2598.tar.gz Qt-369f899e69362b2156800f8c90dfb0bdbe5f2598.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Active window focus gain should not open virtual keypad
Use QElapsedTimer rather than QTime::elapsed()
Diffstat (limited to 'src/gui/text/qfontsubset.cpp')
0 files changed, 0 insertions, 0 deletions