diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-09 08:39:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-09 08:39:29 (GMT) |
| commit | 83d9dc81898d1e5b2cfe01f12c6e4c5a04a04a56 (patch) | |
| tree | ea73e67dc8b9d9be09337cf717665ab00dfb182a /tools/qtconcurrent | |
| parent | ec82a2e2c596fd623c58a4a003dd2e7603931993 (diff) | |
| parent | 148401f3a1b8f9203c3f45465f0ec29fefcd61d3 (diff) | |
| download | Qt-83d9dc81898d1e5b2cfe01f12c6e4c5a04a04a56.zip Qt-83d9dc81898d1e5b2cfe01f12c6e4c5a04a04a56.tar.gz Qt-83d9dc81898d1e5b2cfe01f12c6e4c5a04a04a56.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: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
Diffstat (limited to 'tools/qtconcurrent')
4 files changed, 6 insertions, 6 deletions
diff --git a/tools/qtconcurrent/codegenerator/example/main.cpp b/tools/qtconcurrent/codegenerator/example/main.cpp index 3b7f5e1..148bb93 100644 --- a/tools/qtconcurrent/codegenerator/example/main.cpp +++ b/tools/qtconcurrent/codegenerator/example/main.cpp @@ -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) ** diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp index a643136..31902ae 100644 --- a/tools/qtconcurrent/codegenerator/src/codegenerator.cpp +++ b/tools/qtconcurrent/codegenerator/src/codegenerator.cpp @@ -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) ** diff --git a/tools/qtconcurrent/codegenerator/src/codegenerator.h b/tools/qtconcurrent/codegenerator/src/codegenerator.h index 0b23c68..c1aefe9 100644 --- a/tools/qtconcurrent/codegenerator/src/codegenerator.h +++ b/tools/qtconcurrent/codegenerator/src/codegenerator.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) ** diff --git a/tools/qtconcurrent/generaterun/main.cpp b/tools/qtconcurrent/generaterun/main.cpp index d6ea141..8a7ebe9 100644 --- a/tools/qtconcurrent/generaterun/main.cpp +++ b/tools/qtconcurrent/generaterun/main.cpp @@ -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) ** @@ -325,7 +325,7 @@ int main() Item run = ( Line("/****************************************************************************") + Line("**") + - Line("** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).") + + Line("** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).") + Line("** Contact: Nokia Corporation (qt-info@nokia.com)") + Line("**") + Line("** This file is part of the Qt Toolkit.") + @@ -375,7 +375,7 @@ int main() Item storedFunctionCall = ( Line("/****************************************************************************") + Line("**") + - Line("** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).") + + Line("** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).") + Line("** Contact: Nokia Corporation (qt-info@nokia.com)") + Line("**") + Line("** This file is part of the Qt Toolkit.") + |