Merge commit 'qt/master'

Conflicts:
	configure.exe
	examples/examples.pro
	qmake/Makefile.unix
	qmake/Makefile.win32
	qmake/Makefile.win32-g++
	qmake/Makefile.win32-g++-sh
	qmake/qmake.pro
	src/script/api/qscriptable.h
	src/script/api/qscriptclasspropertyiterator.h
	src/script/api/qscriptcontext.h
	src/script/api/qscriptengineagent.cpp
	src/script/api/qscriptstring.cpp
	src/script/api/qscriptstring.h
	src/script/api/qscriptvalueiterator.cpp
	src/script/api/qscriptvalueiterator.h
	src/script/qscriptclass.cpp
	src/script/qscriptcontext.cpp
	src/script/qscriptengine.cpp
	src/script/qscriptengine_p.cpp
	src/script/qscriptvalue.cpp
	src/script/qscriptvalue_p.h
	src/script/qscriptvalueimplfwd_p.h
	src/script/script.pro
	src/src.pro
	tests/auto/auto.pro
	tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
	tools/configure/configureapp.cpp

1 files changed, 0 insertions, 127 deletions

diff --git a/src/script/qscriptvalueiteratorimpl_p.h b/src/script/qscriptvalueiteratorimpl_p.h
deleted file mode 100644
index d72295e..0000000
--- a/src/script/qscriptvalueiteratorimpl_p.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtScript module 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSCRIPTVALUEITERATORIMPL_P_H
-#define QSCRIPTVALUEITERATORIMPL_P_H
-
-#include "qscriptvalueimplfwd_p.h"
-
-#ifndef QT_NO_SCRIPT
-
-#include "qscriptmemberfwd_p.h"
-
-QT_BEGIN_NAMESPACE
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-class QScriptClassDataIterator;
-class QScriptNameIdImpl;
-
-class QScriptValueIteratorImpl
-{
-public:
-    QScriptValueIteratorImpl(const QScriptValueImpl &obj);
-    ~QScriptValueIteratorImpl();
-
-    bool ignoresDontEnum() const;
-    void setIgnoresDontEnum(bool ignore);
-
-    bool enumeratePrototype() const;
-    void setEnumeratePrototype(bool enable);
-
-    bool hasNext();
-    void next();
-
-    bool hasPrevious();
-    void previous();
-
-    QScript::Member *member();
-
-    QScriptNameIdImpl *nameId() const;
-    QString name() const;
-
-    QScriptValueImpl value() const;
-    void setValue(const QScriptValueImpl &value);
-
-    uint flags() const;
-
-    void remove();
-
-    void toFront();
-    void toBack();
-
-    QScriptValueImpl object() const;
-    void setObject(const QScriptValueImpl &obj);
-
-private:
-    bool acceptsMember(const QScriptValueImpl &o, const QScript::Member &m) const;
-    QScriptClassDataIterator *getClassDataIterator();
-
-    QScriptValueImpl m_frontObject;
-
-    bool m_ignoresDontEnum;
-    bool m_enumerateProto;
-
-    QScriptValueImpl m_object;
-    QScript::Member m_member;
-
-    int m_searchIndex;
-    QScriptValueImpl m_foundObject;
-    QScript::Member m_foundMember;
-    bool m_foundForward;
-    QScriptClassDataIterator *m_classDataIterator;
-    bool m_searchClassDataIterator;
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
-
-#endif