diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-30 06:33:48 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-30 06:33:48 (GMT) |
| commit | 4aaacb65d75ed58d5b69204f5bd53dc0acee1644 (patch) | |
| tree | fae3869d7e4a56ac2d77dfbfae15c18316359d0a /demos/declarative/minehunt/main.cpp | |
| parent | 9c8774e4aff4e21eb7dc4b98ce525e0b1a8285f6 (diff) | |
| parent | fed23e1171d12c4b069652acacc2d718c9691c12 (diff) | |
| download | Qt-4aaacb65d75ed58d5b69204f5bd53dc0acee1644.zip Qt-4aaacb65d75ed58d5b69204f5bd53dc0acee1644.tar.gz Qt-4aaacb65d75ed58d5b69204f5bd53dc0acee1644.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/debugger/qmldebug.cpp
src/declarative/fx/qmlgraphicsimagebase_p.h
src/declarative/util/qmlanimation.h
src/declarative/util/qmlstate.h
src/declarative/util/qmltimer.cpp
Diffstat (limited to 'demos/declarative/minehunt/main.cpp')
| -rw-r--r-- | demos/declarative/minehunt/main.cpp | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp index a7c7111..f4cd6a5 100644 --- a/demos/declarative/minehunt/main.cpp +++ b/demos/declarative/minehunt/main.cpp @@ -1,3 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the demonstration applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ #include "qmlengine.h" #include "qmlcontext.h" #include "qml.h" |