diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-11 23:59:05 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-11 23:59:05 +0100 |
| commit | f08189b8d7abb17e2694c4049184bbbf7837fd19 (patch) | |
| tree | 463c5b242c8411bad5e61408536b5e35726f0a56 /src/script/bridge/qscriptdeclarativeclass_p.h | |
| parent | 6900cf8d7cb8d1e98f3af2ac7ce909dc3b5fc2ef (diff) | |
| parent | 3efc651f6695ec224374bf29ad5b695a8e492a65 (diff) | |
| download | qt4-tools-f08189b8d7abb17e2694c4049184bbbf7837fd19.tar.gz | |
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: (71 commits)
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
[syncqt] Make it possible to override the base directory
network internals: start HTTP GET requests right away when called
...
Diffstat (limited to 'src/script/bridge/qscriptdeclarativeclass_p.h')
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeclass_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h index f2557bd453..d28a37171a 100644 --- a/src/script/bridge/qscriptdeclarativeclass_p.h +++ b/src/script/bridge/qscriptdeclarativeclass_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) ** |