aboutsummaryrefslogtreecommitdiffstats
path: root/examples/demos
diff options
context:
space:
mode:
Diffstat (limited to 'examples/demos')
-rw-r--r--examples/demos/calculator/CalculatorCore/Button.qml2
-rw-r--r--examples/demos/calculator/CalculatorCore/Display.qml2
-rw-r--r--examples/demos/calculator/calculator-desktop.qml2
-rw-r--r--examples/demos/calculator/calculator-mobile.qml2
-rw-r--r--examples/demos/calculator/calculator.pro2
-rw-r--r--examples/demos/calculator/main.cpp2
-rw-r--r--examples/demos/flickr/content/Button.qml2
-rw-r--r--examples/demos/flickr/content/GridDelegate.qml2
-rw-r--r--examples/demos/flickr/content/ImageDetails.qml2
-rw-r--r--examples/demos/flickr/content/ListDelegate.qml2
-rw-r--r--examples/demos/flickr/content/Progress.qml2
-rw-r--r--examples/demos/flickr/content/RssModel.qml2
-rw-r--r--examples/demos/flickr/content/ScrollBar.qml2
-rw-r--r--examples/demos/flickr/content/Slider.qml2
-rw-r--r--examples/demos/flickr/content/TitleBar.qml2
-rw-r--r--examples/demos/flickr/content/ToolBar.qml2
-rw-r--r--examples/demos/flickr/content/UnifiedDelegate.qml2
-rw-r--r--examples/demos/flickr/flickr-90.qml2
-rw-r--r--examples/demos/flickr/flickr.qml2
-rw-r--r--examples/demos/minehunt/MinehuntCore/Explosion.qml2
-rw-r--r--examples/demos/minehunt/MinehuntCore/Tile.qml2
-rw-r--r--examples/demos/minehunt/main.cpp4
-rw-r--r--examples/demos/minehunt/minehunt.cpp10
-rw-r--r--examples/demos/minehunt/minehunt.h6
-rw-r--r--examples/demos/minehunt/minehunt.pro2
-rw-r--r--examples/demos/minehunt/minehunt.qml2
-rw-r--r--examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml2
-rw-r--r--examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml2
-rw-r--r--examples/demos/photoviewer/PhotoViewerCore/Button.qml2
-rw-r--r--examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml2
-rw-r--r--examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml2
-rw-r--r--examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml2
-rw-r--r--examples/demos/photoviewer/PhotoViewerCore/RssModel.qml2
-rw-r--r--examples/demos/photoviewer/PhotoViewerCore/Tag.qml2
-rw-r--r--examples/demos/photoviewer/photoviewer.qml2
-rw-r--r--examples/demos/plasmapatrol/content/BlasterHardpoint.qml2
-rw-r--r--examples/demos/plasmapatrol/content/Button.qml2
-rw-r--r--examples/demos/plasmapatrol/content/CannonHardpoint.qml2
-rw-r--r--examples/demos/plasmapatrol/content/ChoiceBox.qml2
-rw-r--r--examples/demos/plasmapatrol/content/Cruiser.qml2
-rw-r--r--examples/demos/plasmapatrol/content/Frigate.qml2
-rw-r--r--examples/demos/plasmapatrol/content/Hardpoint.qml2
-rw-r--r--examples/demos/plasmapatrol/content/HelpScreens.qml2
-rw-r--r--examples/demos/plasmapatrol/content/LaserHardpoint.qml2
-rw-r--r--examples/demos/plasmapatrol/content/PlasmaPatrolParticles.qml2
-rw-r--r--examples/demos/plasmapatrol/content/SequentialLoader.qml2
-rw-r--r--examples/demos/plasmapatrol/content/Ship.qml2
-rw-r--r--examples/demos/plasmapatrol/content/Sloop.qml2
-rw-r--r--examples/demos/plasmapatrol/plasmapatrol.qml2
-rw-r--r--examples/demos/rssnews/content/BusyIndicator.qml2
-rw-r--r--examples/demos/rssnews/content/CategoryDelegate.qml2
-rw-r--r--examples/demos/rssnews/content/NewsDelegate.qml2
-rw-r--r--examples/demos/rssnews/content/RssFeeds.qml2
-rw-r--r--examples/demos/rssnews/content/ScrollBar.qml2
-rw-r--r--examples/demos/rssnews/rssnews.qml2
-rw-r--r--examples/demos/samegame/content/BoomBlock.qml2
-rw-r--r--examples/demos/samegame/content/Button.qml2
-rw-r--r--examples/demos/samegame/content/Dialog.qml2
-rw-r--r--examples/demos/samegame/content/GameArea.qml2
-rw-r--r--examples/demos/samegame/content/NameInputDialog.qml2
-rw-r--r--examples/demos/samegame/samegame.qml2
-rw-r--r--examples/demos/snake/content/Button.qml2
-rw-r--r--examples/demos/snake/content/Cookie.qml2
-rw-r--r--examples/demos/snake/content/HighScoreModel.qml2
-rw-r--r--examples/demos/snake/content/Link.qml2
-rw-r--r--examples/demos/snake/content/Skull.qml2
-rw-r--r--examples/demos/snake/snake.qml2
-rw-r--r--examples/demos/twitter/TwitterCore/Button.qml2
-rw-r--r--examples/demos/twitter/TwitterCore/FatDelegate.qml2
-rw-r--r--examples/demos/twitter/TwitterCore/Input.qml2
-rw-r--r--examples/demos/twitter/TwitterCore/Loading.qml2
-rw-r--r--examples/demos/twitter/TwitterCore/MultiTitleBar.qml2
-rw-r--r--examples/demos/twitter/TwitterCore/RssModel.qml2
-rw-r--r--examples/demos/twitter/TwitterCore/SearchView.qml2
-rw-r--r--examples/demos/twitter/TwitterCore/TitleBar.qml2
-rw-r--r--examples/demos/twitter/TwitterCore/ToolBar.qml2
-rw-r--r--examples/demos/twitter/TwitterCore/UserModel.qml2
-rw-r--r--examples/demos/twitter/twitter.qml2
78 files changed, 85 insertions, 85 deletions
diff --git a/examples/demos/calculator/CalculatorCore/Button.qml b/examples/demos/calculator/CalculatorCore/Button.qml
index 872fc81174..e7b3637b4c 100644
--- a/examples/demos/calculator/CalculatorCore/Button.qml
+++ b/examples/demos/calculator/CalculatorCore/Button.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/calculator/CalculatorCore/Display.qml b/examples/demos/calculator/CalculatorCore/Display.qml
index 3333484971..3dceeab169 100644
--- a/examples/demos/calculator/CalculatorCore/Display.qml
+++ b/examples/demos/calculator/CalculatorCore/Display.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/calculator/calculator-desktop.qml b/examples/demos/calculator/calculator-desktop.qml
index 7e72f50beb..be65c77170 100644
--- a/examples/demos/calculator/calculator-desktop.qml
+++ b/examples/demos/calculator/calculator-desktop.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/calculator/calculator-mobile.qml b/examples/demos/calculator/calculator-mobile.qml
index b4fc372b39..7ee622f698 100644
--- a/examples/demos/calculator/calculator-mobile.qml
+++ b/examples/demos/calculator/calculator-mobile.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/calculator/calculator.pro b/examples/demos/calculator/calculator.pro
index 3bf3b8ca2f..297d5cfdbb 100644
--- a/examples/demos/calculator/calculator.pro
+++ b/examples/demos/calculator/calculator.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
-QT += quick declarative
+QT += quick qml
SOURCES += main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/demos/calculator
diff --git a/examples/demos/calculator/main.cpp b/examples/demos/calculator/main.cpp
index c7f9b29952..fafe14fe46 100644
--- a/examples/demos/calculator/main.cpp
+++ b/examples/demos/calculator/main.cpp
@@ -41,7 +41,7 @@
#include <QGuiApplication>
#include <QStringList>
#include <QQuickView>
-#include <QDeclarativeEngine>
+#include <QQmlEngine>
void usage()
{
diff --git a/examples/demos/flickr/content/Button.qml b/examples/demos/flickr/content/Button.qml
index d6a8d3e001..57f846aec3 100644
--- a/examples/demos/flickr/content/Button.qml
+++ b/examples/demos/flickr/content/Button.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/content/GridDelegate.qml b/examples/demos/flickr/content/GridDelegate.qml
index 794d768c74..f8838bd609 100644
--- a/examples/demos/flickr/content/GridDelegate.qml
+++ b/examples/demos/flickr/content/GridDelegate.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/content/ImageDetails.qml b/examples/demos/flickr/content/ImageDetails.qml
index 83f2537d65..42b5e845ea 100644
--- a/examples/demos/flickr/content/ImageDetails.qml
+++ b/examples/demos/flickr/content/ImageDetails.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/content/ListDelegate.qml b/examples/demos/flickr/content/ListDelegate.qml
index 9c239151f1..00f837f862 100644
--- a/examples/demos/flickr/content/ListDelegate.qml
+++ b/examples/demos/flickr/content/ListDelegate.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/content/Progress.qml b/examples/demos/flickr/content/Progress.qml
index 81f1e79ed6..ed2629b48a 100644
--- a/examples/demos/flickr/content/Progress.qml
+++ b/examples/demos/flickr/content/Progress.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/content/RssModel.qml b/examples/demos/flickr/content/RssModel.qml
index f28a23d502..51cea498e6 100644
--- a/examples/demos/flickr/content/RssModel.qml
+++ b/examples/demos/flickr/content/RssModel.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/content/ScrollBar.qml b/examples/demos/flickr/content/ScrollBar.qml
index 388e43dc2d..7c62ad088f 100644
--- a/examples/demos/flickr/content/ScrollBar.qml
+++ b/examples/demos/flickr/content/ScrollBar.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/content/Slider.qml b/examples/demos/flickr/content/Slider.qml
index 0f9e8b20f2..c4e743641f 100644
--- a/examples/demos/flickr/content/Slider.qml
+++ b/examples/demos/flickr/content/Slider.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/content/TitleBar.qml b/examples/demos/flickr/content/TitleBar.qml
index 3dab005a11..223939f81a 100644
--- a/examples/demos/flickr/content/TitleBar.qml
+++ b/examples/demos/flickr/content/TitleBar.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/content/ToolBar.qml b/examples/demos/flickr/content/ToolBar.qml
index e82be63e7e..356993b41a 100644
--- a/examples/demos/flickr/content/ToolBar.qml
+++ b/examples/demos/flickr/content/ToolBar.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/content/UnifiedDelegate.qml b/examples/demos/flickr/content/UnifiedDelegate.qml
index 00a777b0a1..0b068c0abe 100644
--- a/examples/demos/flickr/content/UnifiedDelegate.qml
+++ b/examples/demos/flickr/content/UnifiedDelegate.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/flickr-90.qml b/examples/demos/flickr/flickr-90.qml
index ae06957649..b95b1c9872 100644
--- a/examples/demos/flickr/flickr-90.qml
+++ b/examples/demos/flickr/flickr-90.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/flickr/flickr.qml b/examples/demos/flickr/flickr.qml
index 74c41f185b..98ca5197ab 100644
--- a/examples/demos/flickr/flickr.qml
+++ b/examples/demos/flickr/flickr.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/minehunt/MinehuntCore/Explosion.qml b/examples/demos/minehunt/MinehuntCore/Explosion.qml
index 0983b68db4..a1b4292bcf 100644
--- a/examples/demos/minehunt/MinehuntCore/Explosion.qml
+++ b/examples/demos/minehunt/MinehuntCore/Explosion.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/minehunt/MinehuntCore/Tile.qml b/examples/demos/minehunt/MinehuntCore/Tile.qml
index 14c1f51f9e..1180b6f584 100644
--- a/examples/demos/minehunt/MinehuntCore/Tile.qml
+++ b/examples/demos/minehunt/MinehuntCore/Tile.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/minehunt/main.cpp b/examples/demos/minehunt/main.cpp
index 47c0436969..0aa11a1d7a 100644
--- a/examples/demos/minehunt/main.cpp
+++ b/examples/demos/minehunt/main.cpp
@@ -41,8 +41,8 @@
#include <QtGui/QGuiApplication>
#include <QtQuick/qquickview.h>
-#include <QtDeclarative/QDeclarativeContext>
-#include <QtDeclarative/QDeclarativeEngine>
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlEngine>
#include "minehunt.h"
diff --git a/examples/demos/minehunt/minehunt.cpp b/examples/demos/minehunt/minehunt.cpp
index facbec375a..cde30278b3 100644
--- a/examples/demos/minehunt/minehunt.cpp
+++ b/examples/demos/minehunt/minehunt.cpp
@@ -45,25 +45,25 @@
#include "minehunt.h"
-void tilesPropAppend(QDeclarativeListProperty<TileData>* prop, TileData* value)
+void tilesPropAppend(QQmlListProperty<TileData>* prop, TileData* value)
{
Q_UNUSED(prop);
Q_UNUSED(value);
return; //Append not supported
}
-int tilesPropCount(QDeclarativeListProperty<TileData>* prop)
+int tilesPropCount(QQmlListProperty<TileData>* prop)
{
return static_cast<QList<TileData*>*>(prop->data)->count();
}
-TileData* tilesPropAt(QDeclarativeListProperty<TileData>* prop, int index)
+TileData* tilesPropAt(QQmlListProperty<TileData>* prop, int index)
{
return static_cast<QList<TileData*>*>(prop->data)->at(index);
}
-QDeclarativeListProperty<TileData> MinehuntGame::tiles(){
- return QDeclarativeListProperty<TileData>(this, &_tiles, &tilesPropAppend,
+QQmlListProperty<TileData> MinehuntGame::tiles(){
+ return QQmlListProperty<TileData>(this, &_tiles, &tilesPropAppend,
&tilesPropCount, &tilesPropAt, 0);
}
diff --git a/examples/demos/minehunt/minehunt.h b/examples/demos/minehunt/minehunt.h
index a0ae23fa8a..34bab71218 100644
--- a/examples/demos/minehunt/minehunt.h
+++ b/examples/demos/minehunt/minehunt.h
@@ -40,7 +40,7 @@
****************************************************************************/
-#include <qdeclarative.h>
+#include <qqml.h>
class TileData : public QObject
{
@@ -85,8 +85,8 @@ class MinehuntGame : public QObject
public:
MinehuntGame();
- Q_PROPERTY(QDeclarativeListProperty<TileData> tiles READ tiles CONSTANT)
- QDeclarativeListProperty<TileData> tiles();
+ Q_PROPERTY(QQmlListProperty<TileData> tiles READ tiles CONSTANT)
+ QQmlListProperty<TileData> tiles();
Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged)
bool isPlaying() {return playing;}
diff --git a/examples/demos/minehunt/minehunt.pro b/examples/demos/minehunt/minehunt.pro
index 81b6b80486..78e874d805 100644
--- a/examples/demos/minehunt/minehunt.pro
+++ b/examples/demos/minehunt/minehunt.pro
@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
HEADERS += minehunt.h
SOURCES += main.cpp minehunt.cpp
diff --git a/examples/demos/minehunt/minehunt.qml b/examples/demos/minehunt/minehunt.qml
index 7c4948a3bb..42dc408fff 100644
--- a/examples/demos/minehunt/minehunt.qml
+++ b/examples/demos/minehunt/minehunt.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index f183c4b2a0..164f47faa9 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
index 2b1a75f369..867c268399 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/photoviewer/PhotoViewerCore/Button.qml b/examples/demos/photoviewer/PhotoViewerCore/Button.qml
index fcce969fbd..8f4177c097 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/Button.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/Button.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
index 5d845938c7..435ad2644f 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index b972c938eb..5d4e5aee5d 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
index 43c936e342..58beef57f3 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml b/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml
index ab818924ac..1598977bb1 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/photoviewer/PhotoViewerCore/Tag.qml b/examples/demos/photoviewer/PhotoViewerCore/Tag.qml
index 2b546a3ac6..ed4a248a7b 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/Tag.qml
+++ b/examples/demos/photoviewer/PhotoViewerCore/Tag.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/photoviewer/photoviewer.qml b/examples/demos/photoviewer/photoviewer.qml
index 918438832b..208720b9e6 100644
--- a/examples/demos/photoviewer/photoviewer.qml
+++ b/examples/demos/photoviewer/photoviewer.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/BlasterHardpoint.qml b/examples/demos/plasmapatrol/content/BlasterHardpoint.qml
index 4ac30d0202..10c50d43c8 100644
--- a/examples/demos/plasmapatrol/content/BlasterHardpoint.qml
+++ b/examples/demos/plasmapatrol/content/BlasterHardpoint.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/Button.qml b/examples/demos/plasmapatrol/content/Button.qml
index 405b99304f..992be295fc 100644
--- a/examples/demos/plasmapatrol/content/Button.qml
+++ b/examples/demos/plasmapatrol/content/Button.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/CannonHardpoint.qml b/examples/demos/plasmapatrol/content/CannonHardpoint.qml
index c4aa412760..48eb9d171a 100644
--- a/examples/demos/plasmapatrol/content/CannonHardpoint.qml
+++ b/examples/demos/plasmapatrol/content/CannonHardpoint.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/ChoiceBox.qml b/examples/demos/plasmapatrol/content/ChoiceBox.qml
index a678bc9dd4..6e21101f2e 100644
--- a/examples/demos/plasmapatrol/content/ChoiceBox.qml
+++ b/examples/demos/plasmapatrol/content/ChoiceBox.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/Cruiser.qml b/examples/demos/plasmapatrol/content/Cruiser.qml
index c689879dce..c469eb46d2 100644
--- a/examples/demos/plasmapatrol/content/Cruiser.qml
+++ b/examples/demos/plasmapatrol/content/Cruiser.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/Frigate.qml b/examples/demos/plasmapatrol/content/Frigate.qml
index de099bed72..92c63b87d1 100644
--- a/examples/demos/plasmapatrol/content/Frigate.qml
+++ b/examples/demos/plasmapatrol/content/Frigate.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/Hardpoint.qml b/examples/demos/plasmapatrol/content/Hardpoint.qml
index 5c7fb5521b..9e6057057d 100644
--- a/examples/demos/plasmapatrol/content/Hardpoint.qml
+++ b/examples/demos/plasmapatrol/content/Hardpoint.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/HelpScreens.qml b/examples/demos/plasmapatrol/content/HelpScreens.qml
index 9297f86f31..db70c6ee90 100644
--- a/examples/demos/plasmapatrol/content/HelpScreens.qml
+++ b/examples/demos/plasmapatrol/content/HelpScreens.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/LaserHardpoint.qml b/examples/demos/plasmapatrol/content/LaserHardpoint.qml
index 87ac3e9e62..a7baed604b 100644
--- a/examples/demos/plasmapatrol/content/LaserHardpoint.qml
+++ b/examples/demos/plasmapatrol/content/LaserHardpoint.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/PlasmaPatrolParticles.qml b/examples/demos/plasmapatrol/content/PlasmaPatrolParticles.qml
index 1d856b5805..e1924c3467 100644
--- a/examples/demos/plasmapatrol/content/PlasmaPatrolParticles.qml
+++ b/examples/demos/plasmapatrol/content/PlasmaPatrolParticles.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/SequentialLoader.qml b/examples/demos/plasmapatrol/content/SequentialLoader.qml
index eaef87fe57..3707759ce3 100644
--- a/examples/demos/plasmapatrol/content/SequentialLoader.qml
+++ b/examples/demos/plasmapatrol/content/SequentialLoader.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/Ship.qml b/examples/demos/plasmapatrol/content/Ship.qml
index a928cd2a2e..bd023b1dc2 100644
--- a/examples/demos/plasmapatrol/content/Ship.qml
+++ b/examples/demos/plasmapatrol/content/Ship.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/content/Sloop.qml b/examples/demos/plasmapatrol/content/Sloop.qml
index c6b1183162..3bc58a28b0 100644
--- a/examples/demos/plasmapatrol/content/Sloop.qml
+++ b/examples/demos/plasmapatrol/content/Sloop.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/plasmapatrol/plasmapatrol.qml b/examples/demos/plasmapatrol/plasmapatrol.qml
index 45f81c7222..b14ac6385b 100644
--- a/examples/demos/plasmapatrol/plasmapatrol.qml
+++ b/examples/demos/plasmapatrol/plasmapatrol.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/rssnews/content/BusyIndicator.qml b/examples/demos/rssnews/content/BusyIndicator.qml
index b6264ead92..f1abd1119c 100644
--- a/examples/demos/rssnews/content/BusyIndicator.qml
+++ b/examples/demos/rssnews/content/BusyIndicator.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/rssnews/content/CategoryDelegate.qml b/examples/demos/rssnews/content/CategoryDelegate.qml
index 1a56184489..fe64238adb 100644
--- a/examples/demos/rssnews/content/CategoryDelegate.qml
+++ b/examples/demos/rssnews/content/CategoryDelegate.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/rssnews/content/NewsDelegate.qml b/examples/demos/rssnews/content/NewsDelegate.qml
index 84019a9179..59ab269d3b 100644
--- a/examples/demos/rssnews/content/NewsDelegate.qml
+++ b/examples/demos/rssnews/content/NewsDelegate.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/rssnews/content/RssFeeds.qml b/examples/demos/rssnews/content/RssFeeds.qml
index 278f05752c..ed58ef3852 100644
--- a/examples/demos/rssnews/content/RssFeeds.qml
+++ b/examples/demos/rssnews/content/RssFeeds.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/rssnews/content/ScrollBar.qml b/examples/demos/rssnews/content/ScrollBar.qml
index 4ca4132c6b..7b1a2ac3e5 100644
--- a/examples/demos/rssnews/content/ScrollBar.qml
+++ b/examples/demos/rssnews/content/ScrollBar.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/rssnews/rssnews.qml b/examples/demos/rssnews/rssnews.qml
index 491cefda07..d26b94b6d3 100644
--- a/examples/demos/rssnews/rssnews.qml
+++ b/examples/demos/rssnews/rssnews.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/samegame/content/BoomBlock.qml b/examples/demos/samegame/content/BoomBlock.qml
index 47f86bd81b..a348368ae1 100644
--- a/examples/demos/samegame/content/BoomBlock.qml
+++ b/examples/demos/samegame/content/BoomBlock.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/samegame/content/Button.qml b/examples/demos/samegame/content/Button.qml
index b305455c92..2d1a993226 100644
--- a/examples/demos/samegame/content/Button.qml
+++ b/examples/demos/samegame/content/Button.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/samegame/content/Dialog.qml b/examples/demos/samegame/content/Dialog.qml
index 80e5984bfe..c81580e6a5 100644
--- a/examples/demos/samegame/content/Dialog.qml
+++ b/examples/demos/samegame/content/Dialog.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/samegame/content/GameArea.qml b/examples/demos/samegame/content/GameArea.qml
index a43d55117a..3422582b21 100644
--- a/examples/demos/samegame/content/GameArea.qml
+++ b/examples/demos/samegame/content/GameArea.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/samegame/content/NameInputDialog.qml b/examples/demos/samegame/content/NameInputDialog.qml
index 602e69789a..7c3bfa274a 100644
--- a/examples/demos/samegame/content/NameInputDialog.qml
+++ b/examples/demos/samegame/content/NameInputDialog.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/samegame/samegame.qml b/examples/demos/samegame/samegame.qml
index 201f826a29..b98b6a0074 100644
--- a/examples/demos/samegame/samegame.qml
+++ b/examples/demos/samegame/samegame.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/snake/content/Button.qml b/examples/demos/snake/content/Button.qml
index dfac45049a..4f294556b3 100644
--- a/examples/demos/snake/content/Button.qml
+++ b/examples/demos/snake/content/Button.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/snake/content/Cookie.qml b/examples/demos/snake/content/Cookie.qml
index cae53af525..35ffe400b8 100644
--- a/examples/demos/snake/content/Cookie.qml
+++ b/examples/demos/snake/content/Cookie.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/snake/content/HighScoreModel.qml b/examples/demos/snake/content/HighScoreModel.qml
index af66b99ede..734a661f5b 100644
--- a/examples/demos/snake/content/HighScoreModel.qml
+++ b/examples/demos/snake/content/HighScoreModel.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/snake/content/Link.qml b/examples/demos/snake/content/Link.qml
index 891adafe5e..aab005afd5 100644
--- a/examples/demos/snake/content/Link.qml
+++ b/examples/demos/snake/content/Link.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/snake/content/Skull.qml b/examples/demos/snake/content/Skull.qml
index 9026790a5d..0c173be7da 100644
--- a/examples/demos/snake/content/Skull.qml
+++ b/examples/demos/snake/content/Skull.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/snake/snake.qml b/examples/demos/snake/snake.qml
index fca3273def..efd5747173 100644
--- a/examples/demos/snake/snake.qml
+++ b/examples/demos/snake/snake.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/TwitterCore/Button.qml b/examples/demos/twitter/TwitterCore/Button.qml
index 064fd4b277..353b993742 100644
--- a/examples/demos/twitter/TwitterCore/Button.qml
+++ b/examples/demos/twitter/TwitterCore/Button.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/TwitterCore/FatDelegate.qml b/examples/demos/twitter/TwitterCore/FatDelegate.qml
index 5fd0d1622b..4cb0dfc713 100644
--- a/examples/demos/twitter/TwitterCore/FatDelegate.qml
+++ b/examples/demos/twitter/TwitterCore/FatDelegate.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/TwitterCore/Input.qml b/examples/demos/twitter/TwitterCore/Input.qml
index 2987b9e5d8..68b1c6186a 100644
--- a/examples/demos/twitter/TwitterCore/Input.qml
+++ b/examples/demos/twitter/TwitterCore/Input.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/TwitterCore/Loading.qml b/examples/demos/twitter/TwitterCore/Loading.qml
index 8f7c868bee..566857b8b2 100644
--- a/examples/demos/twitter/TwitterCore/Loading.qml
+++ b/examples/demos/twitter/TwitterCore/Loading.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/TwitterCore/MultiTitleBar.qml b/examples/demos/twitter/TwitterCore/MultiTitleBar.qml
index f52ce5be26..3920520b7a 100644
--- a/examples/demos/twitter/TwitterCore/MultiTitleBar.qml
+++ b/examples/demos/twitter/TwitterCore/MultiTitleBar.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/TwitterCore/RssModel.qml b/examples/demos/twitter/TwitterCore/RssModel.qml
index c4050994e6..27f7495be2 100644
--- a/examples/demos/twitter/TwitterCore/RssModel.qml
+++ b/examples/demos/twitter/TwitterCore/RssModel.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/TwitterCore/SearchView.qml b/examples/demos/twitter/TwitterCore/SearchView.qml
index 82a8559889..7732e6f68d 100644
--- a/examples/demos/twitter/TwitterCore/SearchView.qml
+++ b/examples/demos/twitter/TwitterCore/SearchView.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/TwitterCore/TitleBar.qml b/examples/demos/twitter/TwitterCore/TitleBar.qml
index 3624048c4d..3e0818b0dd 100644
--- a/examples/demos/twitter/TwitterCore/TitleBar.qml
+++ b/examples/demos/twitter/TwitterCore/TitleBar.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/TwitterCore/ToolBar.qml b/examples/demos/twitter/TwitterCore/ToolBar.qml
index 06d3324ee3..d4265f3e98 100644
--- a/examples/demos/twitter/TwitterCore/ToolBar.qml
+++ b/examples/demos/twitter/TwitterCore/ToolBar.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/TwitterCore/UserModel.qml b/examples/demos/twitter/TwitterCore/UserModel.qml
index f88837c344..428089b539 100644
--- a/examples/demos/twitter/TwitterCore/UserModel.qml
+++ b/examples/demos/twitter/TwitterCore/UserModel.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/examples/demos/twitter/twitter.qml b/examples/demos/twitter/twitter.qml
index 26e4a7079b..aca0968cfb 100644
--- a/examples/demos/twitter/twitter.qml
+++ b/examples/demos/twitter/twitter.qml
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage