From: Michael Brasser <michael.brasser@nokia.com>
Date: Tue, 7 Jun 2011 00:15:38 +0000 (+1000)
Subject: Merge branch 'master' into v8
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=26942a682c82bd347da65b143442d53d58533263;p=konrad%2Fqtdeclarative.git

Merge branch 'master' into v8

Conflicts:
	src/declarative/graphicsitems/qdeclarativeitem.cpp
	src/declarative/qml/qdeclarativecontextscriptclass.cpp
	src/declarative/qml/qdeclarativeengine.cpp
	src/declarative/qml/qdeclarativeengine_p.h
	src/declarative/qml/qdeclarativeglobalscriptclass.cpp
	src/declarative/qml/qdeclarativeinclude.cpp
	src/declarative/qml/qdeclarativelistscriptclass.cpp
	src/declarative/qml/qdeclarativeobjectscriptclass.cpp
	src/declarative/qml/qdeclarativeobjectscriptclass_p.h
	src/declarative/qml/qdeclarativetypenamescriptclass.cpp
	src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
---

26942a682c82bd347da65b143442d53d58533263
diff --cc src/declarative/qml/qdeclarativeengine.cpp
index c4e9d0e,ecd6a2b..f3c4204
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@@ -67,8 -71,11 +67,9 @@@
  #include "private/qdeclarativenotifier_p.h"
  #include "private/qdeclarativedebugtrace_p.h"
  #include "private/qdeclarativeapplication_p.h"
+ #include "private/qjsdebugservice_p.h"
  
  #include <QtCore/qmetaobject.h>
 -#include <QScriptClass>
  #include <QNetworkReply>
  #include <QNetworkRequest>
  #include <QNetworkAccessManager>
diff --cc tests/auto/declarative/v8/tst_v8.cpp
index a406380,e6ea02e..740bd89
--- a/tests/auto/declarative/v8/tst_v8.cpp
+++ b/tests/auto/declarative/v8/tst_v8.cpp
@@@ -4,32 -4,32 +4,32 @@@
  ** All rights reserved.
  ** Contact: Nokia Corporation (qt-info@nokia.com)
  **
 -** This file is part of the QtDeclarative module of the Qt Toolkit.
 +** This file is part of the test suite 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.
+ ** 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
+ ** 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.
- **
- **
- **
+ ** GNU General Public License Usage
+ ** Alternatively, this file may be used under the terms of the GNU General
+ ** Public License version 3.0 as published by the Free Software Foundation
+ ** and appearing in the file LICENSE.GPL included in the packaging of this
+ ** file. Please review the following information to ensure the GNU General
+ ** Public License version 3.0 requirements will be met:
+ ** http://www.gnu.org/copyleft/gpl.html.
+ **
+ ** Other Usage
+ ** Alternatively, this file may be used in accordance with the terms and
+ ** conditions contained in a signed written agreement between you and Nokia.
  **
  **
  **