Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend

Conflicts:
	src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp
	src/script/qscriptbuffer_p.h
	src/script/qscriptclassinfo_p.h
	src/script/qscriptecmadate.cpp
	src/script/qscriptgc_p.h
	src/script/qscriptmemberfwd_p.h
	src/script/qscriptsyntaxcheckresult_p.h
	src/script/qscriptvalueimplfwd_p.h
	tests/auto/qscriptengine/tst_qscriptengine.cpp
	util/webkit/mkdist-webkit

1 files changed, 64 insertions, 0 deletions

diff --git a/demos/sub-attaq/mainwindow.h b/demos/sub-attaq/mainwindow.h
new file mode 100644
index 0000000..08cfcd9
--- /dev/null
+++ b/demos/sub-attaq/mainwindow.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore 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://www.qtsoftware.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef __MAINWINDOW__H__
+#define __MAINWINDOW__H__
+
+//Qt
+#include <QtGui/QMainWindow>
+class GraphicsScene;
+QT_BEGIN_NAMESPACE
+class QGraphicsView;
+QT_END_NAMESPACE
+
+class MainWindow : public QMainWindow
+{
+Q_OBJECT
+public:
+    MainWindow();
+    ~MainWindow();
+
+private:
+    GraphicsScene *scene;
+    QGraphicsView *view;
+};
+
+#endif //__MAINWINDOW__H__