diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 06:23:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-13 06:23:42 (GMT) |
| commit | afcf63661173b78623245b4892cd282f9c7d8986 (patch) | |
| tree | 4997377d04e38a28952f1b7a90cae41e76971e7d /doc/src/snippets/code/doc_src_qmake-manual.cpp | |
| parent | f08dba7fbbc53f4dcc8cc431e69c74192141eeba (diff) | |
| parent | 163a4a4c38453cd4ed32c5a436763e11ce580687 (diff) | |
| download | Qt-afcf63661173b78623245b4892cd282f9c7d8986.zip Qt-afcf63661173b78623245b4892cd282f9c7d8986.tar.gz Qt-afcf63661173b78623245b4892cd282f9c7d8986.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Allow enum values to be used as signal parameters
ListModel::clear() should not clear roles
Make sure removed QTextBlock is invalid
Cocoa: Fixup wrong code in patch baaa5ae
Diffstat (limited to 'doc/src/snippets/code/doc_src_qmake-manual.cpp')
0 files changed, 0 insertions, 0 deletions