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 /examples/embedded | |
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 'examples/embedded')
-rw-r--r-- | examples/embedded/qmlcalculator/qmlcalculator.cpp | 2 | ||||
-rw-r--r-- | examples/embedded/qmlclocks/qmlclocks.cpp | 2 | ||||
-rw-r--r-- | examples/embedded/qmldialcontrol/qmldialcontrol.cpp | 2 | ||||
-rw-r--r-- | examples/embedded/qmleasing/qmleasing.cpp | 2 | ||||
-rw-r--r-- | examples/embedded/qmlflickr/qmlflickr.cpp | 2 | ||||
-rw-r--r-- | examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp | 2 | ||||
-rw-r--r-- | examples/embedded/qmltwitter/qmltwitter.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp index f3c1427152..771cfeea06 100644 --- a/examples/embedded/qmlcalculator/qmlcalculator.cpp +++ b/examples/embedded/qmlcalculator/qmlcalculator.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 demonstration applications of the Qt Toolkit. ** diff --git a/examples/embedded/qmlclocks/qmlclocks.cpp b/examples/embedded/qmlclocks/qmlclocks.cpp index 7b12b27587..c1b86f29b1 100644 --- a/examples/embedded/qmlclocks/qmlclocks.cpp +++ b/examples/embedded/qmlclocks/qmlclocks.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 demonstration applications of the Qt Toolkit. ** diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp index 6d36c50857..7b08bf0662 100644 --- a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp +++ b/examples/embedded/qmldialcontrol/qmldialcontrol.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 demonstration applications of the Qt Toolkit. ** diff --git a/examples/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp index 24e43cb01c..f07a5f9eef 100644 --- a/examples/embedded/qmleasing/qmleasing.cpp +++ b/examples/embedded/qmleasing/qmleasing.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 demonstration applications of the Qt Toolkit. ** diff --git a/examples/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp index 8d42ddec9a..779cfb12e6 100644 --- a/examples/embedded/qmlflickr/qmlflickr.cpp +++ b/examples/embedded/qmlflickr/qmlflickr.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 demonstration applications of the Qt Toolkit. ** diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp index f21cb1dbb4..f89430c134 100644 --- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.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 demonstration applications of the Qt Toolkit. ** diff --git a/examples/embedded/qmltwitter/qmltwitter.cpp b/examples/embedded/qmltwitter/qmltwitter.cpp index e0801b63f3..e6264852ba 100644 --- a/examples/embedded/qmltwitter/qmltwitter.cpp +++ b/examples/embedded/qmltwitter/qmltwitter.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 demonstration applications of the Qt Toolkit. ** |