diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-07 06:02:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-07 06:02:23 (GMT) |
| commit | b63cfd1d90dfd8be70c49c409b4f6f1cca176735 (patch) | |
| tree | 1c9813d932cd57c3ec1f026e1bd3142285c82122 /src/tools/uic/option.h | |
| parent | 7a5bca82738e6b782047e50a813972eccd928307 (diff) | |
| parent | 859bc191b1096c02cebad011c75a4573289904e7 (diff) | |
| download | Qt-b63cfd1d90dfd8be70c49c409b4f6f1cca176735.zip Qt-b63cfd1d90dfd8be70c49c409b4f6f1cca176735.tar.gz Qt-b63cfd1d90dfd8be70c49c409b4f6f1cca176735.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QIODevice: Fix readAll()
Temporary hackiesh solution to prevent BOM in the xml data.
Fixed qxmlstream autotest when using shadow builds.
Attempt at readding the capital P headers for Phonon
Remove special Phonon processing from syncqt.
Use the lowercase/shortname.h headers for Phonon includes
Fixes a crash when setting focus on a widget with a focus proxy.
Update copyright year to 2010
doc: Clarified activeSubControls and subControls.
Remove warning "statement with no effect"
doc: Clarified that .lnk files are System files on Windows.
Diffstat (limited to 'src/tools/uic/option.h')
| -rw-r--r-- | src/tools/uic/option.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/uic/option.h b/src/tools/uic/option.h index 00eb8aa..f1198a0 100644 --- a/src/tools/uic/option.h +++ b/src/tools/uic/option.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |