diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-12 15:51:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-12 15:51:54 (GMT) |
| commit | 796f8235d1d41878030e6992a225fafb1ee64fbe (patch) | |
| tree | 323a7455a64abdd440a160b9f8ada5a6b82a62b5 /src/opengl/qgl_egl_p.h | |
| parent | bf71ab63e805e49e59fbe25265104a414ab7d039 (diff) | |
| parent | 152e4ee249915b15241c5f37830f37bb569151b6 (diff) | |
| download | Qt-796f8235d1d41878030e6992a225fafb1ee64fbe.zip Qt-796f8235d1d41878030e6992a225fafb1ee64fbe.tar.gz Qt-796f8235d1d41878030e6992a225fafb1ee64fbe.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: (87 commits)
Fix D-Bus calls with QDBus::BlockWithGui.
Fixes: Add some changes for 4.6.1
Skip tst_QSystemLock::processes
Autotest: set these files to executable. They are CGI scripts.
Fix an issue with HTTP headers like "private, max-age=300".
Autotest: don't depend on QtGui just because of QDesktopServices::storageLocation
My changes to changes-4.6.1
my changelog for 4.6.1
Revert "Fixed qxmlstream autotest when using shadow builds."
Changed log updated
doc: Updated the descriptions of the connection types.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd6591b4acaf2172ab05702153ef539c0ac89cbb )
Update changelog with some of my stuff
my 4.6.1 changelog contributions
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.
...
Diffstat (limited to 'src/opengl/qgl_egl_p.h')
| -rw-r--r-- | src/opengl/qgl_egl_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_egl_p.h b/src/opengl/qgl_egl_p.h index 47a4a19..c503724 100644 --- a/src/opengl/qgl_egl_p.h +++ b/src/opengl/qgl_egl_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) ** |