diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /tools/qmlviewer | |
parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'tools/qmlviewer')
-rw-r--r-- | tools/qmlviewer/browser/Browser.qml | 2 | ||||
-rw-r--r-- | tools/qmlviewer/deviceorientation.cpp | 2 | ||||
-rw-r--r-- | tools/qmlviewer/deviceorientation.h | 2 | ||||
-rw-r--r-- | tools/qmlviewer/deviceorientation_harmattan.cpp | 2 | ||||
-rw-r--r-- | tools/qmlviewer/loggerwidget.cpp | 2 | ||||
-rw-r--r-- | tools/qmlviewer/loggerwidget.h | 2 | ||||
-rw-r--r-- | tools/qmlviewer/main.cpp | 2 | ||||
-rw-r--r-- | tools/qmlviewer/proxysettings.cpp | 2 | ||||
-rw-r--r-- | tools/qmlviewer/proxysettings.h | 2 | ||||
-rw-r--r-- | tools/qmlviewer/qdeclarativetester.cpp | 2 | ||||
-rw-r--r-- | tools/qmlviewer/qdeclarativetester.h | 2 | ||||
-rw-r--r-- | tools/qmlviewer/qmlruntime.cpp | 2 | ||||
-rw-r--r-- | tools/qmlviewer/qmlruntime.h | 2 | ||||
-rw-r--r-- | tools/qmlviewer/startup/Logo.qml | 2 | ||||
-rw-r--r-- | tools/qmlviewer/startup/startup.qml | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/tools/qmlviewer/browser/Browser.qml b/tools/qmlviewer/browser/Browser.qml index 5c5598b57b..e163a1f98a 100644 --- a/tools/qmlviewer/browser/Browser.qml +++ b/tools/qmlviewer/browser/Browser.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** diff --git a/tools/qmlviewer/deviceorientation.cpp b/tools/qmlviewer/deviceorientation.cpp index d37df09b17..2a19ba7d3e 100644 --- a/tools/qmlviewer/deviceorientation.cpp +++ b/tools/qmlviewer/deviceorientation.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/deviceorientation.h b/tools/qmlviewer/deviceorientation.h index 7662d3ffc8..447125963f 100644 --- a/tools/qmlviewer/deviceorientation.h +++ b/tools/qmlviewer/deviceorientation.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/deviceorientation_harmattan.cpp b/tools/qmlviewer/deviceorientation_harmattan.cpp index 7cc57bb16c..065516cdc8 100644 --- a/tools/qmlviewer/deviceorientation_harmattan.cpp +++ b/tools/qmlviewer/deviceorientation_harmattan.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/loggerwidget.cpp b/tools/qmlviewer/loggerwidget.cpp index f9ae552736..f19ac578d5 100644 --- a/tools/qmlviewer/loggerwidget.cpp +++ b/tools/qmlviewer/loggerwidget.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/loggerwidget.h b/tools/qmlviewer/loggerwidget.h index abe67534af..ca3c9b332d 100644 --- a/tools/qmlviewer/loggerwidget.h +++ b/tools/qmlviewer/loggerwidget.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp index 03cb4456b5..707d7705b2 100644 --- a/tools/qmlviewer/main.cpp +++ b/tools/qmlviewer/main.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/proxysettings.cpp b/tools/qmlviewer/proxysettings.cpp index b8d88dc9b1..fc9b6ba83f 100644 --- a/tools/qmlviewer/proxysettings.cpp +++ b/tools/qmlviewer/proxysettings.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/proxysettings.h b/tools/qmlviewer/proxysettings.h index 5fe3cf6575..322190e989 100644 --- a/tools/qmlviewer/proxysettings.h +++ b/tools/qmlviewer/proxysettings.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/qdeclarativetester.cpp b/tools/qmlviewer/qdeclarativetester.cpp index b197652bfb..1a125cdb09 100644 --- a/tools/qmlviewer/qdeclarativetester.cpp +++ b/tools/qmlviewer/qdeclarativetester.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/qdeclarativetester.h b/tools/qmlviewer/qdeclarativetester.h index 04418a1e23..968274c97e 100644 --- a/tools/qmlviewer/qdeclarativetester.h +++ b/tools/qmlviewer/qdeclarativetester.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/qmlruntime.cpp b/tools/qmlviewer/qmlruntime.cpp index d40da6121e..b0a729d232 100644 --- a/tools/qmlviewer/qmlruntime.cpp +++ b/tools/qmlviewer/qmlruntime.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/qmlruntime.h b/tools/qmlviewer/qmlruntime.h index 52f2fddee7..5870f943e8 100644 --- a/tools/qmlviewer/qmlruntime.h +++ b/tools/qmlviewer/qmlruntime.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/tools/qmlviewer/startup/Logo.qml b/tools/qmlviewer/startup/Logo.qml index 9d088eef3d..aa115060fc 100644 --- a/tools/qmlviewer/startup/Logo.qml +++ b/tools/qmlviewer/startup/Logo.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** diff --git a/tools/qmlviewer/startup/startup.qml b/tools/qmlviewer/startup/startup.qml index d91a8f6958..14ded1cac4 100644 --- a/tools/qmlviewer/startup/startup.qml +++ b/tools/qmlviewer/startup/startup.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** |