diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-12 10:42:00 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-12 10:42:00 +0100 |
| commit | 10a0134c5a3b40d3fc5e6d43a753eca62c008166 (patch) | |
| tree | d4c191e9e25505c2b083bc0eefc3f571f9d4f9c5 /src/gui/text/qfontengine_s60_p.h | |
| parent | bf71ab63e805e49e59fbe25265104a414ab7d039 (diff) | |
| parent | 2efba0002d26b584c771aa9260e6d699e5ff8da3 (diff) | |
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: (73 commits)
doc: update snippets for QtScript function expressions
Prevent a crash when creating an inputContext from the QApplication dtor.
QNAM HTTP Code: Cache socket state inside ensureConnection()
tst_qhttpnetworkconnection: Test also HEAD in some tests
tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities
QNAM HTTP Code: When starting new request, prefer connected sockets.
typo fix
Added the 'framecapture' WebKit example to the default build.
Fix code example
fix typo in qreadwritelock's documentation
QNAM HTTP: Don't call d_func() so often
QNAM HTTP: Fix readBuffer maximum size.
QNAM HTTP: Optimize eatWhitespace()
QNAM HTTP: Check if socket already tries to connect.
network internals: fix build on S60
[syncqt] Make -separate-module work with WebKit's directory structure
doc: Corrected explanation of when append() does nothing.
doc: Added clarification about allocating space for the 0 terminator.
Add a way to access the normalised URL in QUrl.
[syncqt] Make it possible to synchronize headers for a separate module
...
Diffstat (limited to 'src/gui/text/qfontengine_s60_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_s60_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h index b21f1c8384..ff819e2883 100644 --- a/src/gui/text/qfontengine_s60_p.h +++ b/src/gui/text/qfontengine_s60_p.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) ** |