diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-12 09:42:00 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-12 09:42:00 (GMT) |
commit | 10a0134c5a3b40d3fc5e6d43a753eca62c008166 (patch) | |
tree | d4c191e9e25505c2b083bc0eefc3f571f9d4f9c5 /util/qlalr/examples | |
parent | bf71ab63e805e49e59fbe25265104a414ab7d039 (diff) | |
parent | 2efba0002d26b584c771aa9260e6d699e5ff8da3 (diff) | |
download | Qt-10a0134c5a3b40d3fc5e6d43a753eca62c008166.zip Qt-10a0134c5a3b40d3fc5e6d43a753eca62c008166.tar.gz Qt-10a0134c5a3b40d3fc5e6d43a753eca62c008166.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: (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 'util/qlalr/examples')
-rw-r--r-- | util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp | 2 | ||||
-rw-r--r-- | util/qlalr/examples/dummy-xml/xml.g | 2 | ||||
-rw-r--r-- | util/qlalr/examples/glsl/build.sh | 2 | ||||
-rw-r--r-- | util/qlalr/examples/glsl/glsl-lex.l | 2 | ||||
-rw-r--r-- | util/qlalr/examples/glsl/glsl.g | 2 | ||||
-rw-r--r-- | util/qlalr/examples/lambda/lambda.g | 2 | ||||
-rw-r--r-- | util/qlalr/examples/lambda/main.cpp | 2 | ||||
-rw-r--r-- | util/qlalr/examples/qparser/calc.g | 2 | ||||
-rw-r--r-- | util/qlalr/examples/qparser/calc.l | 2 | ||||
-rw-r--r-- | util/qlalr/examples/qparser/qparser.cpp | 2 | ||||
-rw-r--r-- | util/qlalr/examples/qparser/qparser.h | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp b/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp index aa72abc..943e302 100644 --- a/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.cpp +++ b/util/qlalr/examples/dummy-xml/ll/dummy-xml-ll.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/util/qlalr/examples/dummy-xml/xml.g b/util/qlalr/examples/dummy-xml/xml.g index f879647..5de30a1 100644 --- a/util/qlalr/examples/dummy-xml/xml.g +++ b/util/qlalr/examples/dummy-xml/xml.g @@ -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/util/qlalr/examples/glsl/build.sh b/util/qlalr/examples/glsl/build.sh index d103086..9896815 100644 --- a/util/qlalr/examples/glsl/build.sh +++ b/util/qlalr/examples/glsl/build.sh @@ -1,7 +1,7 @@ #!/bin/sh ############################################################################# ## -## 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/util/qlalr/examples/glsl/glsl-lex.l b/util/qlalr/examples/glsl/glsl-lex.l index b50a2e2..1258b80 100644 --- a/util/qlalr/examples/glsl/glsl-lex.l +++ b/util/qlalr/examples/glsl/glsl-lex.l @@ -2,7 +2,7 @@ %{ /**************************************************************************** ** -** 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/util/qlalr/examples/glsl/glsl.g b/util/qlalr/examples/glsl/glsl.g index 3e825bc..669f334 100644 --- a/util/qlalr/examples/glsl/glsl.g +++ b/util/qlalr/examples/glsl/glsl.g @@ -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/util/qlalr/examples/lambda/lambda.g b/util/qlalr/examples/lambda/lambda.g index f26bd29..79be927 100644 --- a/util/qlalr/examples/lambda/lambda.g +++ b/util/qlalr/examples/lambda/lambda.g @@ -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/util/qlalr/examples/lambda/main.cpp b/util/qlalr/examples/lambda/main.cpp index d43f5f6..fe43bb6 100644 --- a/util/qlalr/examples/lambda/main.cpp +++ b/util/qlalr/examples/lambda/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/util/qlalr/examples/qparser/calc.g b/util/qlalr/examples/qparser/calc.g index 87e40f2..8fcd4dd 100644 --- a/util/qlalr/examples/qparser/calc.g +++ b/util/qlalr/examples/qparser/calc.g @@ -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/util/qlalr/examples/qparser/calc.l b/util/qlalr/examples/qparser/calc.l index dde8b99..cd40b1a 100644 --- a/util/qlalr/examples/qparser/calc.l +++ b/util/qlalr/examples/qparser/calc.l @@ -4,7 +4,7 @@ %{ /**************************************************************************** ** -** 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/util/qlalr/examples/qparser/qparser.cpp b/util/qlalr/examples/qparser/qparser.cpp index 6afae79..5fe2571 100644 --- a/util/qlalr/examples/qparser/qparser.cpp +++ b/util/qlalr/examples/qparser/qparser.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/util/qlalr/examples/qparser/qparser.h b/util/qlalr/examples/qparser/qparser.h index 8a730cb..3fb11dc 100644 --- a/util/qlalr/examples/qparser/qparser.h +++ b/util/qlalr/examples/qparser/qparser.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) ** |