diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-25 13:12:02 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-25 13:12:02 +1000 |
| commit | a0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (patch) | |
| tree | fafbbb89ac57a26ec4397b650ab4be1c6f2e6b46 /tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp | |
| parent | 4fcce8c4b2323e054c90048a11a2a483f7884dd7 (diff) | |
| parent | cfb7c16d738993fc8a594361f4bdf10e24fa754a (diff) | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Avoid possible font name collisions on fbserv
Diffstat (limited to 'tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp')
0 files changed, 0 insertions, 0 deletions