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 /src/script/bridge | |
| 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 'src/script/bridge')
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeclass.cpp | 2 | ||||
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeclass_p.h | 2 | ||||
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeobject.cpp | 2 | ||||
| -rw-r--r-- | src/script/bridge/qscriptdeclarativeobject_p.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp index 1e59f66..f0c1c45 100644 --- a/src/script/bridge/qscriptdeclarativeclass.cpp +++ b/src/script/bridge/qscriptdeclarativeclass.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtScript module of the Qt Toolkit. +** This file is part of the QtDeclarative module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h index 559e842..4e06931 100644 --- a/src/script/bridge/qscriptdeclarativeclass_p.h +++ b/src/script/bridge/qscriptdeclarativeclass_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtScript module of the Qt Toolkit. +** This file is part of the QtDeclarative module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/script/bridge/qscriptdeclarativeobject.cpp b/src/script/bridge/qscriptdeclarativeobject.cpp index 76c2eb0..1af632d 100644 --- a/src/script/bridge/qscriptdeclarativeobject.cpp +++ b/src/script/bridge/qscriptdeclarativeobject.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtScript module of the Qt Toolkit. +** This file is part of the QtDeclarative module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/script/bridge/qscriptdeclarativeobject_p.h b/src/script/bridge/qscriptdeclarativeobject_p.h index c6dfb83..73e5527 100644 --- a/src/script/bridge/qscriptdeclarativeobject_p.h +++ b/src/script/bridge/qscriptdeclarativeobject_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtScript module of the Qt Toolkit. +** This file is part of the QtDeclarative module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |