Merge commit 'qt/4.6' into mmfphonon

Conflicts:
	demos/embedded/fluidlauncher/config_s60/config.xml
	demos/embedded/fluidlauncher/fluidlauncher.pro
	src/corelib/io/io.pri
	src/gui/kernel/qapplication_s60.cpp
	src/gui/kernel/qwidget_s60.cpp
	src/s60installs/qt_libs.pro

1 files changed, 16 insertions, 30 deletions

diff --git a/qmake/project.h b/qmake/project.h
index 8d15724..b12085b 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** 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 qmake application of the Qt Toolkit.
@@ -9,8 +10,8 @@
 ** 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.
+** 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
@@ -20,21 +21,20 @@
 ** 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.
+** 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.
+**
+**
+**
+**
+**
+**
 **
-** 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$
 **
 ****************************************************************************/
@@ -49,14 +49,6 @@
 #include <qmap.h>
 #include <qmetatype.h>
 
-#ifndef QT_BUILD_QMAKE_LIBRARY
-# define QTSCRIPT_SUPPORT
-#endif
-
-#ifdef QTSCRIPT_SUPPORT
-# include <qscriptengine.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 class QMakeProperty;
@@ -80,9 +72,6 @@ class QMakeProject
     friend struct IteratorBlock;
     friend struct FunctionBlock;
 
-#ifdef QTSCRIPT_SUPPORT
-    QScriptEngine eng;
-#endif
     QStack<ScopeBlock> scope_blocks;
     QStack<FunctionBlock *> function_blocks;
     IteratorBlock *iterator;
@@ -203,10 +192,7 @@ inline QString QMakeProject::first(const QString &v)
 inline QMap<QString, QStringList> &QMakeProject::variables()
 { return vars; }
 
-// Helper functions needed for Symbian .mmp files and deployment
-QString generate_test_uid(const QString& target);
-QString generate_uid(const QString& target);
-QString epocRoot();
+// Helper functions needed for Symbian
 bool isForSymbian();
 bool isForSymbianSbsv2();