summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-09 09:01:01 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-09 09:01:01 (GMT)
commit6165ab0203fa80d31f3488ead7e7f7c088c8668c (patch)
treef860c58e85bf4ef5115535728319acb272326b09 /src/3rdparty
parentd80c2837a41903f66159617fbd0b8b69e4a8da75 (diff)
parent11d9e81b3b1a7f3463edb98fa2303a44f8499462 (diff)
downloadQt-6165ab0203fa80d31f3488ead7e7f7c088c8668c.zip
Qt-6165ab0203fa80d31f3488ead7e7f7c088c8668c.tar.gz
Qt-6165ab0203fa80d31f3488ead7e7f7c088c8668c.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: Assistant: Add missing license header. 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/3rdparty')
0 files changed, 0 insertions, 0 deletions