diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 20:18:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 20:18:40 (GMT) |
| commit | 9c897d3fa7c98824c72b68ad4f2606778add493b (patch) | |
| tree | 0e6a6011cc77ba6723799df39d1b0b866b03e20b /src/corelib/concurrent/qtconcurrentexception.cpp | |
| parent | d80c2837a41903f66159617fbd0b8b69e4a8da75 (diff) | |
| parent | 51ab4559f35b5b96e06cf92e53bea65e71280f68 (diff) | |
| download | Qt-9c897d3fa7c98824c72b68ad4f2606778add493b.zip Qt-9c897d3fa7c98824c72b68ad4f2606778add493b.tar.gz Qt-9c897d3fa7c98824c72b68ad4f2606778add493b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Compile fixes.
S60 style: Compile fix.
A few trivial optimizations
Rewrote bookmark handling, the previous code was just plain awful.
Small style cleanup.
Fix some warnings.
Designer: Emit QDesignerPropertyEditorInterface::propertyChanged().
Designer: Support the 'windowOpacity'-property for forms.
Expanded tst_QFileSystemModel::rootPath() to check directories ending in "." or ".."
Assistant: Treat "unfiltered" filter in a apecial way.
Assistant: Give meaningful context to translations.
Fixed handling of paths containing ".." in QFileSystemModel on Windows.
QAbstractItemModel docs: Fix typo.
Assistant: Eliminate private tr contexts.
Diffstat (limited to 'src/corelib/concurrent/qtconcurrentexception.cpp')
0 files changed, 0 insertions, 0 deletions