diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-14 00:31:37 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-14 00:31:37 (GMT) |
commit | 2ec89699a6f372ccbd92ce2bda753ec0e28f8650 (patch) | |
tree | e8f5a9c9bb8cb41a7e47e7b75cd3f6ddac702814 /src/activeqt/control | |
parent | 351060bd313220044b9323d59d56627e78deea9f (diff) | |
parent | 48592026bc9eb024f304411895c3f233b2296cfa (diff) | |
download | Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.zip Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.tar.gz Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.tar.bz2 |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
bin/syncqt
src/corelib/io/qurl.cpp
Diffstat (limited to 'src/activeqt/control')
-rw-r--r-- | src/activeqt/control/qaxaggregated.h | 2 | ||||
-rw-r--r-- | src/activeqt/control/qaxbindable.cpp | 2 | ||||
-rw-r--r-- | src/activeqt/control/qaxbindable.h | 2 | ||||
-rw-r--r-- | src/activeqt/control/qaxfactory.cpp | 2 | ||||
-rw-r--r-- | src/activeqt/control/qaxfactory.h | 2 | ||||
-rw-r--r-- | src/activeqt/control/qaxmain.cpp | 2 | ||||
-rw-r--r-- | src/activeqt/control/qaxserver.cpp | 2 | ||||
-rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 2 | ||||
-rw-r--r-- | src/activeqt/control/qaxserverdll.cpp | 2 | ||||
-rw-r--r-- | src/activeqt/control/qaxservermain.cpp | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/src/activeqt/control/qaxaggregated.h b/src/activeqt/control/qaxaggregated.h index 8a3a763..7b51125 100644 --- a/src/activeqt/control/qaxaggregated.h +++ b/src/activeqt/control/qaxaggregated.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/src/activeqt/control/qaxbindable.cpp b/src/activeqt/control/qaxbindable.cpp index e3e316f..1a3fb61 100644 --- a/src/activeqt/control/qaxbindable.cpp +++ b/src/activeqt/control/qaxbindable.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/src/activeqt/control/qaxbindable.h b/src/activeqt/control/qaxbindable.h index e02030f..96c9939 100644 --- a/src/activeqt/control/qaxbindable.h +++ b/src/activeqt/control/qaxbindable.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/src/activeqt/control/qaxfactory.cpp b/src/activeqt/control/qaxfactory.cpp index ef7168c..7437433 100644 --- a/src/activeqt/control/qaxfactory.cpp +++ b/src/activeqt/control/qaxfactory.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/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index 5d83570..c44cff2 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.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/src/activeqt/control/qaxmain.cpp b/src/activeqt/control/qaxmain.cpp index bb13f13..2daea02 100644 --- a/src/activeqt/control/qaxmain.cpp +++ b/src/activeqt/control/qaxmain.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/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp index 261a60e..7728e50 100644 --- a/src/activeqt/control/qaxserver.cpp +++ b/src/activeqt/control/qaxserver.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/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index f52d779..5fa0aad 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.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/src/activeqt/control/qaxserverdll.cpp b/src/activeqt/control/qaxserverdll.cpp index 4e8c65b..ab5dbaa 100644 --- a/src/activeqt/control/qaxserverdll.cpp +++ b/src/activeqt/control/qaxserverdll.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/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp index 6143db1..3a10cd7 100644 --- a/src/activeqt/control/qaxservermain.cpp +++ b/src/activeqt/control/qaxservermain.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) ** |