diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
commit | 9c54d0ef8f6442e32d5762edccef46db80b68681 (patch) | |
tree | 0fdbc2be98a2e7fd7728a3860d56c94db3e173bb /examples/quick/window | |
parent | 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763 (diff) | |
parent | 36a42ed6b11dce102d0e0f93fbd441011b003157 (diff) |
Merge branch 'stable' into dev
Conflicts:
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
Diffstat (limited to 'examples/quick/window')
-rw-r--r-- | examples/quick/window/screen/screenInfo.qml | 2 | ||||
-rw-r--r-- | examples/quick/window/window/Window.qml | 2 | ||||
-rw-r--r-- | examples/quick/window/window/nogui.qml | 2 | ||||
-rw-r--r-- | examples/quick/window/window/standalone.qml | 2 | ||||
-rw-r--r-- | examples/quick/window/window/twowindows.qml | 2 | ||||
-rw-r--r-- | examples/quick/window/window/window.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/quick/window/screen/screenInfo.qml b/examples/quick/window/screen/screenInfo.qml index adf92ee028..8f60d83933 100644 --- a/examples/quick/window/screen/screenInfo.qml +++ b/examples/quick/window/screen/screenInfo.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/examples/quick/window/window/Window.qml b/examples/quick/window/window/Window.qml index b7fbf7206c..07900930d3 100644 --- a/examples/quick/window/window/Window.qml +++ b/examples/quick/window/window/Window.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/examples/quick/window/window/nogui.qml b/examples/quick/window/window/nogui.qml index bed055679d..2a5734c773 100644 --- a/examples/quick/window/window/nogui.qml +++ b/examples/quick/window/window/nogui.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/examples/quick/window/window/standalone.qml b/examples/quick/window/window/standalone.qml index a7a7ed2d7a..db73bf66eb 100644 --- a/examples/quick/window/window/standalone.qml +++ b/examples/quick/window/window/standalone.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/examples/quick/window/window/twowindows.qml b/examples/quick/window/window/twowindows.qml index 345598cf12..4a8d2f4f1b 100644 --- a/examples/quick/window/window/twowindows.qml +++ b/examples/quick/window/window/twowindows.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/examples/quick/window/window/window.cpp b/examples/quick/window/window/window.cpp index 619e275f75..277effc20c 100644 --- a/examples/quick/window/window/window.cpp +++ b/examples/quick/window/window/window.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. |