diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-17 09:23:06 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-17 09:23:06 (GMT) |
| commit | 9657c4fa2040758b8aa3a5f7f7c81442cbaba621 (patch) | |
| tree | 1d9b018f9563fa6eff1059291dc9edf94be67c9b /examples/tools/customcompleter | |
| parent | b5d34f3daafc843c9f9cb63cf8e2733900f0be69 (diff) | |
| parent | ec0d663282e191bfb9837e76e709ed2ffe6e8aac (diff) | |
| download | Qt-9657c4fa2040758b8aa3a5f7f7c81442cbaba621.zip Qt-9657c4fa2040758b8aa3a5f7f7c81442cbaba621.tar.gz Qt-9657c4fa2040758b8aa3a5f7f7c81442cbaba621.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/declarative/elements.qdoc
doc/src/declarative/extending.qdoc
src/declarative/qml/qdeclarativecomponent.cpp
Diffstat (limited to 'examples/tools/customcompleter')
| -rw-r--r-- | examples/tools/customcompleter/main.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/customcompleter/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/customcompleter/mainwindow.h | 2 | ||||
| -rw-r--r-- | examples/tools/customcompleter/textedit.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/customcompleter/textedit.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/tools/customcompleter/main.cpp b/examples/tools/customcompleter/main.cpp index 5c0c1a1..2024f50 100644 --- a/examples/tools/customcompleter/main.cpp +++ b/examples/tools/customcompleter/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/tools/customcompleter/mainwindow.cpp b/examples/tools/customcompleter/mainwindow.cpp index 36fb94c..c4a7c76 100644 --- a/examples/tools/customcompleter/mainwindow.cpp +++ b/examples/tools/customcompleter/mainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/tools/customcompleter/mainwindow.h b/examples/tools/customcompleter/mainwindow.h index ba4de5b..b645984 100644 --- a/examples/tools/customcompleter/mainwindow.h +++ b/examples/tools/customcompleter/mainwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/tools/customcompleter/textedit.cpp b/examples/tools/customcompleter/textedit.cpp index 77699e0..4f6ae07 100644 --- a/examples/tools/customcompleter/textedit.cpp +++ b/examples/tools/customcompleter/textedit.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/examples/tools/customcompleter/textedit.h b/examples/tools/customcompleter/textedit.h index b80645f..7ab21b7 100644 --- a/examples/tools/customcompleter/textedit.h +++ b/examples/tools/customcompleter/textedit.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |