diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 16:03:03 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 16:03:03 (GMT) |
commit | 6820fc145dd1eb9a22384eed63a5a11d4118f147 (patch) | |
tree | 8f6777026e5aa7b35942c14cee1322484229a9cd /demos/qtdemo/menumanager.cpp | |
parent | 844171ae6d0a3a02cfb9a39ff18a27d7204a8755 (diff) | |
parent | 7258ad9817ae811808ea89c790b059474d145654 (diff) | |
download | Qt-6820fc145dd1eb9a22384eed63a5a11d4118f147.zip Qt-6820fc145dd1eb9a22384eed63a5a11d4118f147.tar.gz Qt-6820fc145dd1eb9a22384eed63a5a11d4118f147.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:
warn about stray meta data
don't complain multiple times about same abuse of //% meta strings
fix double percent sign after migration to yyMsg()
Improved QCommandLinkButton's vertical spacing
syncqt: abort on permission error writing to include/Qt
added a comment for QByteArray::replace(..)
Diffstat (limited to 'demos/qtdemo/menumanager.cpp')
0 files changed, 0 insertions, 0 deletions