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

8 files changed, 14 insertions, 806 deletions

diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 7ab61f0830..fcf43c88b3 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -19,21 +19,7 @@ QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qgl
       qfsfileengine_iterator.o qregexp.o qvector.o qbitarray.o qdir.o qdiriterator.o quuid.o qhash.o \
       qfileinfo.o qdatetime.o qstringlist.o qabstractfileengine.o qtemporaryfile.o \
       qmap.o qmetatype.o qsettings.o qlibraryinfo.o qvariant.o qvsnprintf.o \
-      qlocale.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o \
-      qscriptasm.o qscriptast.o qscriptastvisitor.o \
-      qscriptcompiler.o qscriptecmaarray.o qscriptecmaboolean.o \
-      qscriptecmacore.o qscriptecmadate.o qscriptecmafunction.o \
-      qscriptecmaglobal.o qscriptecmamath.o qscriptecmanumber.o \
-      qscriptecmaobject.o qscriptecmaregexp.o qscriptecmastring.o \
-      qscriptecmaerror.o qscriptcontext_p.o qscriptengine.o \
-      qscriptengine_p.o qscriptextenumeration.o qscriptextvariant.o \
-      qscriptcontext.o qscriptfunction.o \
-      qscriptgrammar.o qscriptlexer.o qscriptclassdata.o \
-      qscriptparser.o qscriptprettypretty.o qscriptsyntaxchecker.o \
-      qscriptvalue.o qscriptvalueimpl.o qscriptvalueiterator.o \
-      qscriptvalueiteratorimpl.o qxmlstream.o qxmlutils.o \
-      qscriptclass.o qscriptclasspropertyiterator.o \
-      qscriptengineagent.o qscriptcontextinfo.o qscriptstring.o \
+      qlocale.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o qxmlstream.o qxmlutils.o \
       $(QTOBJS)
 
 
@@ -69,36 +55,15 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
 	   $(SOURCE_PATH)/src/corelib/io/qsettings.cpp $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
 	   $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \
 	   $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptasm.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptast.cpp $(SOURCE_PATH)/src/script/qscriptastvisitor.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptcompiler.cpp $(SOURCE_PATH)/src/script/qscriptecmaarray.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp $(SOURCE_PATH)/src/script/qscriptecmacore.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptecmadate.cpp $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp $(SOURCE_PATH)/src/script/qscriptecmamath.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp $(SOURCE_PATH)/src/script/qscriptecmastring.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptengine.cpp $(SOURCE_PATH)/src/script/qscriptengine_p.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp $(SOURCE_PATH)/src/script/qscriptextvariant.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptcontext.cpp $(SOURCE_PATH)/src/script/qscriptfunction.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptgrammar.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptlexer.cpp $(SOURCE_PATH)/src/script/qscriptclassdata.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptparser.cpp $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptvalue.cpp $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp \
 	   $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp \
 	   $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptclass.cpp $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptengineagent.cpp $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp \
-	   $(SOURCE_PATH)/src/script/qscriptstring.cpp \
 	   $(QTSRCS)
 
 CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \
 	   -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
-	   -I$(BUILD_PATH)/src/corelib/global \
-	   -I$(SOURCE_PATH)/src/script -I$(BUILD_PATH)/src/corelib/xml \
-	   -DQT_NO_PCRE -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
+	   -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \
+	   -DQT_NO_PCRE \
+	   -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \
 	   -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
 	   -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
            -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
@@ -319,126 +284,11 @@ initprojectdeploy_symbian.o: generators/symbian/initprojectdeploy_symbian.cpp
 projectgenerator.o: generators/projectgenerator.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) generators/projectgenerator.cpp
 
-qscriptasm.o: $(SOURCE_PATH)/src/script/qscriptasm.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptasm.cpp
-
-qscriptast.o: $(SOURCE_PATH)/src/script/qscriptast.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptast.cpp
-
-qscriptastvisitor.o: $(SOURCE_PATH)/src/script/qscriptastvisitor.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptastvisitor.cpp
-
-qscriptcompiler.o: $(SOURCE_PATH)/src/script/qscriptcompiler.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcompiler.cpp
-
-qscriptecmaarray.o: $(SOURCE_PATH)/src/script/qscriptecmaarray.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaarray.cpp
-
-qscriptecmaboolean.o: $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
-
-qscriptecmacore.o: $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
-
-qscriptecmadate.o: $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
-
-qscriptecmafunction.o: $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
-
-qscriptecmaglobal.o: $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
-
-qscriptecmamath.o: $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
-
-qscriptecmanumber.o: $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
-
-qscriptecmaobject.o: $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
-
-qscriptecmaregexp.o: $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
-
-qscriptecmastring.o: $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
-
-qscriptecmaerror.o: $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
-
-qscriptcontext_p.o: $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
-
-qscriptengine.o: $(SOURCE_PATH)/src/script/qscriptengine.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine.cpp
-
-qscriptengine_p.o: $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
-
-qscriptextenumeration.o: $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
-
-qscriptextvariant.o: $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
-
-qscriptcontext.o: $(SOURCE_PATH)/src/script/qscriptcontext.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext.cpp
-
-qscriptfunction.o: $(SOURCE_PATH)/src/script/qscriptfunction.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptfunction.cpp
-
-qscriptgrammar.o: $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
-
-qscriptlexer.o: $(SOURCE_PATH)/src/script/qscriptlexer.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptlexer.cpp
-
-qscriptclassdata.o: $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
-
-qscriptparser.o: $(SOURCE_PATH)/src/script/qscriptparser.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptparser.cpp
-
-qscriptprettypretty.o: $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
-
-qscriptsyntaxchecker.o: $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
-
-qscriptvalue.o: $(SOURCE_PATH)/src/script/qscriptvalue.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalue.cpp
-
-qscriptvalueimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
-
-qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
-
-qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
-
 qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
 
 qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp
-
-qscriptclass.o: $(SOURCE_PATH)/src/script/qscriptclass.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclass.cpp
-
-qscriptclasspropertyiterator.o: $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
-
-qscriptengineagent.o: $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
-
-qscriptcontextinfo.o: $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
-
-qscriptstring.o: $(SOURCE_PATH)/src/script/qscriptstring.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptstring.cpp
-
 #default rules
 .cpp.o:
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index edb450346d..e6bbcd5df9 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -32,7 +32,6 @@ CFLAGS	     = -c -Fo$@ \
               -I$(BUILD_PATH)\include -I$(BUILD_PATH)\include\QtCore \
               -I$(SOURCE_PATH)\include -I$(SOURCE_PATH)\include\QtCore \
               -I$(BUILD_PATH)\src\corelib\global \
-              -I$(BUILD_PATH)\include\QtScript \
               -I$(BUILD_PATH)\src\corelib\xml \
               -I$(SOURCE_PATH)\mkspecs\$(QMAKESPEC)  \
               -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NODLL -DQT_NO_STL \
@@ -124,47 +123,9 @@ QTOBJS= \
 	qurl.obj \
 	qsettings_win.obj \
 	qmetatype.obj \
-	qnumeric.obj \
-	qscriptasm.obj \
-	qscriptast.obj \
-	qscriptastvisitor.obj \
-	qscriptcompiler.obj \
-	qscriptecmaarray.obj \
-	qscriptecmaboolean.obj \
-	qscriptecmacore.obj \
-	qscriptecmadate.obj \
-	qscriptecmafunction.obj \
-	qscriptecmaglobal.obj \
-	qscriptecmamath.obj \
-	qscriptecmanumber.obj \
-	qscriptecmaobject.obj \
-	qscriptecmaregexp.obj \
-	qscriptecmastring.obj \
-	qscriptecmaerror.obj \
-	qscriptcontext_p.obj \
-	qscriptengine.obj \
-	qscriptengine_p.obj \
-	qscriptengineagent.obj \
-	qscriptextenumeration.obj \
-	qscriptextvariant.obj \
-	qscriptcontext.obj \
-	qscriptcontextinfo.obj \
-	qscriptfunction.obj \
-	qscriptgrammar.obj \
-	qscriptlexer.obj \
-	qscriptclassdata.obj \
-	qscriptparser.obj \
-	qscriptprettypretty.obj \
-	qscriptsyntaxchecker.obj \
-	qscriptclass.obj \
-	qscriptclasspropertyiterator.obj \
-	qscriptstring.obj \
-	qscriptvalue.obj \
-	qscriptvalueimpl.obj \
-	qscriptvalueiterator.obj \
-	qscriptvalueiteratorimpl.obj \
 	qxmlstream.obj \
-	qxmlutils.obj
+	qxmlutils.obj \
+	qnumeric.obj
 
 
 first all: qmake.exe
@@ -238,47 +199,9 @@ clean::
 	-del symmake_sbsv2.obj
 	-del initprojectdeploy_symbian.obj
 	-del pbuilder_pbx.obj
-	-del qnumeric.obj \
-	-del qscriptasm.obj \
-	-del qscriptast.obj \
-	-del qscriptastvisitor.obj \
-	-del qscriptcompiler.obj \
-	-del qscriptecmaarray.obj \
-	-del qscriptecmaboolean.obj \
-	-del qscriptecmacore.obj \
-	-del qscriptecmadate.obj \
-	-del qscriptecmafunction.obj \
-	-del qscriptecmaglobal.obj \
-	-del qscriptecmamath.obj \
-	-del qscriptecmanumber.obj \
-	-del qscriptecmaobject.obj \
-	-del qscriptecmaregexp.obj \
-	-del qscriptecmastring.obj \
-	-del qscriptecmaerror.obj \
-	-del qscriptcontext_p.obj \
-	-del qscriptengine.obj \
-	-del qscriptengine_p.obj \
-	-del qscriptengineagent.obj \
-	-del qscriptextenumeration.obj \
-	-del qscriptextvariant.obj \
-	-del qscriptcontext.obj \
-	-del qscriptcontextinfo.obj \
-	-del qscriptfunction.obj \
-	-del qscriptgrammar.obj \
-	-del qscriptlexer.obj \
-	-del qscriptclassdata.obj \
-	-del qscriptparser.obj \
-	-del qscriptprettypretty.obj \
-	-del qscriptsyntaxchecker.obj \
-	-del qscriptclass.obj \
-	-del qscriptclasspropertyiterator.obj \
-	-del qscriptstring.obj \
-	-del qscriptvalue.obj \
-	-del qscriptvalueimpl.obj \
-	-del qscriptvalueiterator.obj \
-	-del qscriptvalueiteratorimpl.obj
 	-del qxmlstream.obj
 	-del qxmlutils.obj
+	-del qnumeric.obj
 	-del vc60.pdb
 	-del vc70.pdb
 	-del qmake.pdb
@@ -507,120 +430,6 @@ metamakefile.obj: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
 xmloutput.obj: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp
 	$(CXX) $(CXXFLAGS) generators/xmloutput.cpp
 
-qscriptasm.obj: $(SOURCE_PATH)\src\script\qscriptasm.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptasm.cpp
-
-qscriptast.obj: $(SOURCE_PATH)\src\script\qscriptast.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptast.cpp
-
-qscriptastvisitor.obj: $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
-
-qscriptcompiler.obj: $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
-
-qscriptecmaarray.obj: $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
-
-qscriptecmaboolean.obj: $(SOURCE_PATH)\src\script\qscriptecmaboolean.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaboolean.cpp
-
-qscriptecmacore.obj: $(SOURCE_PATH)\src\script\qscriptecmacore.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmacore.cpp
-
-qscriptecmadate.obj: $(SOURCE_PATH)\src\script\qscriptecmadate.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmadate.cpp
-
-qscriptecmafunction.obj: $(SOURCE_PATH)\src\script\qscriptecmafunction.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmafunction.cpp
-
-qscriptecmaglobal.obj: $(SOURCE_PATH)\src\script\qscriptecmaglobal.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaglobal.cpp
-
-qscriptecmamath.obj: $(SOURCE_PATH)\src\script\qscriptecmamath.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmamath.cpp
-
-qscriptecmanumber.obj: $(SOURCE_PATH)\src\script\qscriptecmanumber.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmanumber.cpp
-
-qscriptecmaobject.obj: $(SOURCE_PATH)\src\script\qscriptecmaobject.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaobject.cpp
-
-qscriptecmaregexp.obj: $(SOURCE_PATH)\src\script\qscriptecmaregexp.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaregexp.cpp
-
-qscriptecmastring.obj: $(SOURCE_PATH)\src\script\qscriptecmastring.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmastring.cpp
-
-qscriptecmaerror.obj: $(SOURCE_PATH)\src\script\qscriptecmaerror.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaerror.cpp
-
-qscriptcontext_p.obj: $(SOURCE_PATH)\src\script\qscriptcontext_p.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcontext_p.cpp
-
-qscriptengine.obj: $(SOURCE_PATH)\src\script\qscriptengine.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptengine.cpp
-
-qscriptengine_p.obj: $(SOURCE_PATH)\src\script\qscriptengine_p.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptengine_p.cpp
-
-qscriptengineagent.obj: $(SOURCE_PATH)\src\script\qscriptengineagent.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptengineagent.cpp
-
-qscriptextenumeration.obj: $(SOURCE_PATH)\src\script\qscriptextenumeration.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptextenumeration.cpp
-
-qscriptextvariant.obj: $(SOURCE_PATH)\src\script\qscriptextvariant.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptextvariant.cpp
-
-qscriptcontext.obj: $(SOURCE_PATH)\src\script\qscriptcontext.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcontext.cpp
-
-qscriptcontextinfo.obj: $(SOURCE_PATH)\src\script\qscriptcontextinfo.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcontextinfo.cpp
-
-qscriptfunction.obj: $(SOURCE_PATH)\src\script\qscriptfunction.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptfunction.cpp
-
-qscriptgrammar.obj: $(SOURCE_PATH)\src\script\qscriptgrammar.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptgrammar.cpp
-
-qscriptlexer.obj: $(SOURCE_PATH)\src\script\qscriptlexer.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptlexer.cpp
-
-qscriptclassdata.obj: $(SOURCE_PATH)\src\script\qscriptclassdata.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptclassdata.cpp
-
-qscriptparser.obj: $(SOURCE_PATH)\src\script\qscriptparser.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptparser.cpp
-
-qscriptprettypretty.obj: $(SOURCE_PATH)\src\script\qscriptprettypretty.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptprettypretty.cpp
-
-qscriptsyntaxchecker.obj: $(SOURCE_PATH)\src\script\qscriptsyntaxchecker.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptsyntaxchecker.cpp
-
-qscriptstring.obj: $(SOURCE_PATH)\src\script\qscriptstring.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptstring.cpp
-
-qscriptclass.obj: $(SOURCE_PATH)\src\script\qscriptclass.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptclass.cpp
-
-qscriptclasspropertyiterator.obj: $(SOURCE_PATH)\src\script\qscriptclasspropertyiterator.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptclasspropertyiterator.cpp
-
-qscriptvalue.obj: $(SOURCE_PATH)\src\script\qscriptvalue.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptvalue.cpp
-
-qscriptvalueimpl.obj: $(SOURCE_PATH)\src\script\qscriptvalueimpl.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptvalueimpl.cpp
-
-qscriptvalueiterator.obj: $(SOURCE_PATH)\src\script\qscriptvalueiterator.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptvalueiterator.cpp
-
-qscriptvalueiteratorimpl.obj: $(SOURCE_PATH)\src\script\qscriptvalueiteratorimpl.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptvalueiteratorimpl.cpp
-
 qxmlstream.obj: $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\xml\qxmlstream.cpp
 
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index de25daeb49..ade379b2ce 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -19,7 +19,6 @@ CFLAGS	    =	-c -o$@ -O \
 		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
 		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
 		-I$(BUILD_PATH)/src/corelib/global \
-		-I$(BUILD_PATH)/include/QtScript \
 		-I$(BUILD_PATH)/src/corelib/xml \
 		-I$(SOURCE_PATH)/mkspecs/win32-g++  \
 		-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
@@ -87,47 +86,9 @@ QTOBJS= \
 	qsettings_win.o \
 	qvariant.o \
 	qmetatype.o \
-	qnumeric.o \
-	qscriptasm.o \
-	qscriptast.o \
-	qscriptastvisitor.o \
-	qscriptcompiler.o \
-	qscriptecmaarray.o \
-	qscriptecmaboolean.o \
-	qscriptecmacore.o \
-	qscriptecmadate.o \
-	qscriptecmafunction.o \
-	qscriptecmaglobal.o \
-	qscriptecmamath.o \
-	qscriptecmanumber.o \
-	qscriptecmaobject.o \
-	qscriptecmaregexp.o \
-	qscriptecmastring.o \
-	qscriptecmaerror.o \
-	qscriptcontext_p.o \
-	qscriptengine.o \
-	qscriptengine_p.o \
-	qscriptengineagent.o \
-	qscriptextenumeration.o \
-	qscriptextvariant.o \
-	qscriptcontext.o \
-	qscriptcontextinfo.o \
-	qscriptfunction.o \
-	qscriptgrammar.o \
-	qscriptlexer.o \
-	qscriptclassdata.o \
-	qscriptparser.o \
-	qscriptprettypretty.o \
-	qscriptsyntaxchecker.o \
-	qscriptclass.o \
-	qscriptclasspropertyiterator.o \
-	qscriptstring.o \
-	qscriptvalue.o \
-	qscriptvalueimpl.o \
-	qscriptvalueiterator.o \
-	qscriptvalueiteratorimpl.o \
 	qxmlstream.o \
-	qxmlutils.o
+	qxmlutils.o \
+	qnumeric.o
 
 
 qmake.exe: $(OBJS) $(QTOBJS)
@@ -347,120 +308,6 @@ metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
 xmloutput.o: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp
 	$(CXX) $(CXXFLAGS) generators/xmloutput.cpp
 
-qscriptasm.o: $(SOURCE_PATH)\src\script\qscriptasm.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptasm.cpp
-
-qscriptast.o: $(SOURCE_PATH)\src\script\qscriptast.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptast.cpp
-
-qscriptastvisitor.o: $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
-
-qscriptcompiler.o: $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
-
-qscriptecmaarray.o: $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
-
-qscriptecmaboolean.o: $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
-
-qscriptecmacore.o: $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
-
-qscriptecmadate.o: $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
-
-qscriptecmafunction.o: $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
-
-qscriptecmaglobal.o: $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
-
-qscriptecmamath.o: $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
-
-qscriptecmanumber.o: $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
-
-qscriptecmaobject.o: $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
-
-qscriptecmaregexp.o: $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
-
-qscriptecmastring.o: $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
-
-qscriptecmaerror.o: $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
-
-qscriptcontext_p.o: $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
-
-qscriptengine.o: $(SOURCE_PATH)/src/script/qscriptengine.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine.cpp
-
-qscriptengine_p.o: $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
-
-qscriptengineagent.o: $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
-
-qscriptextenumeration.o: $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
-
-qscriptextvariant.o: $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
-
-qscriptcontext.o: $(SOURCE_PATH)/src/script/qscriptcontext.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext.cpp
-
-qscriptcontextinfo.o: $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
-
-qscriptfunction.o: $(SOURCE_PATH)/src/script/qscriptfunction.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptfunction.cpp
-
-qscriptgrammar.o: $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
-
-qscriptlexer.o: $(SOURCE_PATH)/src/script/qscriptlexer.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptlexer.cpp
-
-qscriptclassdata.o: $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
-
-qscriptparser.o: $(SOURCE_PATH)/src/script/qscriptparser.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptparser.cpp
-
-qscriptprettypretty.o: $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
-
-qscriptsyntaxchecker.o: $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
-
-qscriptclass.o: $(SOURCE_PATH)/src/script/qscriptclass.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclass.cpp
-
-qscriptclasspropertyiterator.o: $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
-
-qscriptstring.o: $(SOURCE_PATH)/src/script/qscriptstring.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptstring.cpp
-
-qscriptvalue.o: $(SOURCE_PATH)/src/script/qscriptvalue.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalue.cpp
-
-qscriptvalueimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
-
-qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
-
-qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
-
 qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
 
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
index 83a33c1ec6..8d2723cf3d 100644
--- a/qmake/Makefile.win32-g++-sh
+++ b/qmake/Makefile.win32-g++-sh
@@ -19,7 +19,6 @@ CFLAGS	    =	-c -o$@ -O \
 		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
 		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
 		-I$(BUILD_PATH)/src/corelib/global \
-		-I$(BUILD_PATH)/include/QtScript \
 		-I$(BUILD_PATH)/src/corelib/xml \
 		-I$(SOURCE_PATH)/mkspecs/win32-g++  \
 		-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
@@ -87,47 +86,9 @@ QTOBJS= \
 	qsettings_win.o \
 	qvariant.o \
 	qmetatype.o \
-	qnumeric.o \
-	qscriptasm.o \
-	qscriptast.o \
-	qscriptastvisitor.o \
-	qscriptcompiler.o \
-	qscriptecmaarray.o \
-	qscriptecmaboolean.o \
-	qscriptecmacore.o \
-	qscriptecmadate.o \
-	qscriptecmafunction.o \
-	qscriptecmaglobal.o \
-	qscriptecmamath.o \
-	qscriptecmanumber.o \
-	qscriptecmaobject.o \
-	qscriptecmaregexp.o \
-	qscriptecmastring.o \
-	qscriptecmaerror.o \
-	qscriptcontext_p.o \
-	qscriptengine.o \
-	qscriptengine_p.o \
-	qscriptengineagent.o \
-	qscriptextenumeration.o \
-	qscriptextvariant.o \
-	qscriptcontext.o \
-	qscriptcontextinfo.o \
-	qscriptfunction.o \
-	qscriptgrammar.o \
-	qscriptlexer.o \
-	qscriptclassdata.o \
-	qscriptparser.o \
-	qscriptprettypretty.o \
-	qscriptsyntaxchecker.o \
-	qscriptclass.o \
-	qscriptclasspropertyiterator.o \
-	qscriptstring.o \
-	qscriptvalue.o \
-	qscriptvalueimpl.o \
-	qscriptvalueiterator.o \
-	qscriptvalueiteratorimpl.o \
 	qxmlstream.o \
-	qxmlutils.o
+	qxmlutils.o \
+	qnumeric.o
 
 qmake.exe: $(OBJS) $(QTOBJS)
 	$(LINKQMAKE)
@@ -346,120 +307,6 @@ metamakefile.o: $(SOURCE_PATH)/qmake/generators/metamakefile.cpp
 xmloutput.o: $(SOURCE_PATH)/qmake/generators/xmloutput.cpp
 	$(CXX) $(CXXFLAGS) generators/xmloutput.cpp
 
-qscriptasm.o: $(SOURCE_PATH)\src\script\qscriptasm.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptasm.cpp
-
-qscriptast.o: $(SOURCE_PATH)\src\script\qscriptast.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptast.cpp
-
-qscriptastvisitor.o: $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptastvisitor.cpp
-
-qscriptcompiler.o: $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptcompiler.cpp
-
-qscriptecmaarray.o: $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\script\qscriptecmaarray.cpp
-
-qscriptecmaboolean.o: $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp
-
-qscriptecmacore.o: $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmacore.cpp
-
-qscriptecmadate.o: $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmadate.cpp
-
-qscriptecmafunction.o: $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp
-
-qscriptecmaglobal.o: $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp
-
-qscriptecmamath.o: $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmamath.cpp
-
-qscriptecmanumber.o: $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp
-
-qscriptecmaobject.o: $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp
-
-qscriptecmaregexp.o: $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp
-
-qscriptecmastring.o: $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmastring.cpp
-
-qscriptecmaerror.o: $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp
-
-qscriptcontext_p.o: $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp
-
-qscriptengine.o: $(SOURCE_PATH)/src/script/qscriptengine.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine.cpp
-
-qscriptengine_p.o: $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine_p.cpp
-
-qscriptengineagent.o: $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengineagent.cpp
-
-qscriptextenumeration.o: $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp
-
-qscriptextvariant.o: $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextvariant.cpp
-
-qscriptcontext.o: $(SOURCE_PATH)/src/script/qscriptcontext.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext.cpp
-
-qscriptcontextinfo.o: $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp
-
-qscriptfunction.o: $(SOURCE_PATH)/src/script/qscriptfunction.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptfunction.cpp
-
-qscriptgrammar.o: $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptgrammar.cpp
-
-qscriptlexer.o: $(SOURCE_PATH)/src/script/qscriptlexer.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptlexer.cpp
-
-qscriptclassdata.o: $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclassdata.cpp
-
-qscriptparser.o: $(SOURCE_PATH)/src/script/qscriptparser.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptparser.cpp
-
-qscriptprettypretty.o: $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp
-
-qscriptsyntaxchecker.o: $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp
-
-qscriptclass.o: $(SOURCE_PATH)/src/script/qscriptclass.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclass.cpp
-
-qscriptclasspropertyiterator.o: $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp
-
-qscriptstring.o: $(SOURCE_PATH)/src/script/qscriptstring.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptstring.cpp
-
-qscriptvalue.o: $(SOURCE_PATH)/src/script/qscriptvalue.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalue.cpp
-
-qscriptvalueimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp
-
-qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp
-
-qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
-	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp
-
 qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp
 
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 7239ee97bb..dc5f74ebaf 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -157,91 +157,6 @@ QMap<QString, TestFunc> qmake_testFunctions()
     return *qmake_test_functions;
 }
 
-QT_END_NAMESPACE
-
-#ifdef QTSCRIPT_SUPPORT
-#include "qscriptvalue.h"
-#include "qscriptengine.h"
-#include "qscriptvalueiterator.h"
-
-QT_BEGIN_NAMESPACE
-
-static QScriptValue qscript_projectWrapper(QScriptEngine *eng, QMakeProject *project,
-                                    const QMap<QString, QStringList> &place);
-
-static bool qscript_createQMakeProjectMap(QMap<QString, QStringList> &vars, QScriptValue js)
-{
-    QScriptValueIterator it(js);
-    while(it.hasNext()) {
-        it.next();
-        vars[it.name()] = qscriptvalue_cast<QStringList>(it.value());
-    }
-    return true;
-}
-
-static QScriptValue qscript_call_testfunction(QScriptContext *context, QScriptEngine *engine)
-{
-    QMakeProject *self = qscriptvalue_cast<QMakeProject*>(context->callee().property("qmakeProject"));
-    QString func = context->callee().property("functionName").toString();
-    QStringList args;
-    for(int i = 0; i < context->argumentCount(); ++i)
-        args += context->argument(i).toString();
-    QMap<QString, QStringList> place = self->variables();
-    qscript_createQMakeProjectMap(place, engine->globalObject().property("qmake"));
-    QScriptValue ret(engine, self->doProjectTest(func, args, place));
-    engine->globalObject().setProperty("qmake", qscript_projectWrapper(engine, self, place));
-    return ret;
-}
-
-static QScriptValue qscript_call_expandfunction(QScriptContext *context, QScriptEngine *engine)
-{
-    QMakeProject *self = qscriptvalue_cast<QMakeProject*>(context->callee().property("qmakeProject"));
-    QString func = context->callee().property("functionName").toString();
-    QStringList args;
-    for(int i = 0; i < context->argumentCount(); ++i)
-        args += context->argument(i).toString();
-    QMap<QString, QStringList> place = self->variables();
-    qscript_createQMakeProjectMap(place, engine->globalObject().property("qmake"));
-    QScriptValue ret = qScriptValueFromValue(engine, self->doProjectExpand(func, args, place));
-    engine->globalObject().setProperty("qmake", qscript_projectWrapper(engine, self, place));
-    return ret;
-}
-
-static QScriptValue qscript_projectWrapper(QScriptEngine *eng, QMakeProject *project,
-                                           const QMap<QString, QStringList> &place)
-{
-    QScriptValue ret = eng->newObject();
-    {
-        QStringList testFuncs = qmake_testFunctions().keys() + project->userTestFunctions();
-        for(int i = 0; i < testFuncs.size(); ++i) {
-            QString funcName = testFuncs.at(i);
-            QScriptValue fun = eng->newFunction(qscript_call_testfunction);
-            fun.setProperty("qmakeProject", eng->newVariant(qVariantFromValue(project)));
-            fun.setProperty("functionName", QScriptValue(eng, funcName));
-            eng->globalObject().setProperty(funcName, fun);
-        }
-    }
-    {
-        QStringList testFuncs = qmake_expandFunctions().keys() + project->userExpandFunctions();
-        for(int i = 0; i < testFuncs.size(); ++i) {
-            QString funcName = testFuncs.at(i);
-            QScriptValue fun = eng->newFunction(qscript_call_expandfunction);
-            fun.setProperty("qmakeProject", eng->newVariant(qVariantFromValue(project)));
-            fun.setProperty("functionName", QScriptValue(eng, funcName));
-            eng->globalObject().setProperty(funcName, fun);
-        }
-    }
-    for(QMap<QString, QStringList>::ConstIterator it = place.begin(); it != place.end(); ++it)
-        ret.setProperty(it.key(), qScriptValueFromValue(eng, it.value()));
-    return ret;
-}
-
-QT_END_NAMESPACE
-
-#endif
-
-QT_BEGIN_NAMESPACE
-
 struct parser_info {
     QString file;
     int line_no;
@@ -1886,27 +1801,8 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QMap<QString, QStringL
     bool parsed = false;
     parser_info pi = parser;
     if(format == JSFormat) {
-#ifdef QTSCRIPT_SUPPORT
-        eng.globalObject().setProperty("qmake", qscript_projectWrapper(&eng, this, place));
-        QFile f(file);
-        if (f.open(QFile::ReadOnly)) {
-            QString code = f.readAll();
-            QScriptValue r = eng.evaluate(code);
-            if(eng.hasUncaughtException()) {
-                const int lineNo = eng.uncaughtExceptionLineNumber();
-                fprintf(stderr, "%s:%d: %s\n", file.toLatin1().constData(), lineNo,
-                        r.toString().toLatin1().constData());
-            } else {
-                parsed = true;
-                QScriptValue variables = eng.globalObject().property("qmake");
-                if (variables.isValid() && variables.isObject())
-                    qscript_createQMakeProjectMap(place, variables);
-            }
-        }
-#else
         warn_msg(WarnParser, "%s:%d: QtScript support disabled for %s.",
                  pi.file.toLatin1().constData(), pi.line_no, orig_file.toLatin1().constData());
-#endif
     } else {
         QStack<ScopeBlock> sc = scope_blocks;
         IteratorBlock *it = iterator;
@@ -2405,19 +2301,6 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
         }
         break; }
     default: {
-#ifdef QTSCRIPT_SUPPORT
-        {
-            QScriptValue jsFunc = eng.globalObject().property(func);
-            if(jsFunc.isFunction()) {
-                QScriptValueList jsArgs;
-                for(int i = 0; i < args.size(); ++i)
-                    jsArgs += QScriptValue(&eng, args.at(i));
-                QScriptValue jsRet = jsFunc.call(eng.globalObject(), jsArgs);
-                ret = qscriptvalue_cast<QStringList>(jsRet);
-                break;
-            }
-        }
-#endif
         fprintf(stderr, "%s:%d: Unknown replace function: %s\n",
                 parser.file.toLatin1().constData(), parser.line_no,
                 func.toLatin1().constData());
@@ -2886,20 +2769,6 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QMap<QSt
 #endif
         return true; }
     default:
-#ifdef QTSCRIPT_SUPPORT
-        {
-            QScriptValue jsFunc = eng.globalObject().property(func);
-            if(jsFunc.isFunction()) {
-                QScriptValueList jsArgs;
-                for(int i = 0; i < args.size(); ++i)
-                    jsArgs += QScriptValue(&eng, args.at(i));
-                QScriptValue jsRet = jsFunc.call(eng.globalObject(), jsArgs);
-                if(eng.hasUncaughtException())
-                    return false;
-                return qscriptvalue_cast<bool>(jsRet);
-            }
-        }
-#endif
         fprintf(stderr, "%s:%d: Unknown test function: %s\n", parser.file.toLatin1().constData(), parser.line_no,
                 func.toLatin1().constData());
     }
diff --git a/qmake/project.h b/qmake/project.h
index 7273c2b1c8..348ffb969a 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -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;
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 206c1c24c3..efe4f3608a 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -134,10 +134,9 @@ bootstrap { #Qt code
         LFLAGS += -lcpp
     }
     DEFINES *= QT_NO_QOBJECT
-    include($$QT_SOURCE_TREE/src/script/script.pri)
 } else {
     CONFIG += qt 
-    QT = core script
+    QT = core
 }
 *-g++:profiling {
   QMAKE_CFLAGS = -pg
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index acf77181a5..560aee9e13 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -17,11 +17,9 @@ VPATH += $$QT_SOURCE_TREE/src/corelib/global \
          $$QT_SOURCE_TREE/src/corelib/kernel \
          $$QT_SOURCE_TREE/src/corelib/codecs \
          $$QT_SOURCE_TREE/src/corelib/plugin \
-	 $$QT_SOURCE_TREE/src/corelib/io \
 	 $$QT_SOURCE_TREE/src/corelib/xml \
-	 $$QT_SOURCE_TREE/src/script
+	 $$QT_SOURCE_TREE/src/corelib/io
 INCPATH += generators generators/unix generators/win32 generators/mac generators/symbian \
-           $$QT_SOURCE_TREE/include $$QT_SOURCE_TREE/include/QtCore \
-           $$QT_SOURCE_TREE/qmake $$QT_SOURCE_TREE/include/QtScript
+           $$QT_SOURCE_TREE/include $$QT_SOURCE_TREE/include/QtCore
 include(qmake.pri)