diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-01 17:25:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-01 17:25:38 (GMT) |
| commit | 95b17fbe91eb3b1b0fcac92d8a8934769e4cd847 (patch) | |
| tree | b5a1e5549a118ea5e4da612fc40d814ca2e9c401 /qmake/meta.h | |
| parent | e5974b024828578945bd4c349f5f87f82a635225 (diff) | |
| parent | bb84c5ef4f620af659395b66e6ed792a380b9a1f (diff) | |
| download | Qt-95b17fbe91eb3b1b0fcac92d8a8934769e4cd847.zip Qt-95b17fbe91eb3b1b0fcac92d8a8934769e4cd847.tar.gz Qt-95b17fbe91eb3b1b0fcac92d8a8934769e4cd847.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't ignore source-text when generating qsTrId translations for QML
Fix a crash when undoing form layout
Diffstat (limited to 'qmake/meta.h')
0 files changed, 0 insertions, 0 deletions