add configure options for (not) building the QtScript module

-script (default) and -no-script.

This means we can get rid of the SCRIPT feature from qfeatures,
since it's now handled by the new configure variable.

It also allows us to get rid of all the QT_NO_SCRIPT ifdefs from
the source files, since qmake isn't going to include those files
for compilation when you configure with -no-script.

The QtScriptTools module will be disabled if the QtScript module
is not built. You'll have to build the old QtScript back-end
(will be made available in a separate package), then build the
QtScriptTools module yourself.

Reviewed-by: Simon Hausmann

58 files changed, 0 insertions, 229 deletions

diff --git a/src/script/api/qscriptable.cpp b/src/script/api/qscriptable.cpp
index 8b11ff0d0d..cbe29c551a 100644
--- a/src/script/api/qscriptable.cpp
+++ b/src/script/api/qscriptable.cpp
@@ -45,8 +45,6 @@
 #include "qscriptable_p.h"
 #include "qscriptengine.h"
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -185,7 +183,6 @@ QScriptValue QScriptable::argument(int index) const
     return QScriptValue();
 }
 
-#endif // QT_NO_SCRIPT
 #endif // QT_NO_QOBJECT
 
 QT_END_NAMESPACE
diff --git a/src/script/api/qscriptable.h b/src/script/api/qscriptable.h
index 1015a00848..f358ad1c56 100644
--- a/src/script/api/qscriptable.h
+++ b/src/script/api/qscriptable.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -85,5 +83,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
 #endif // QSCRIPTABLE_H
diff --git a/src/script/api/qscriptable_p.h b/src/script/api/qscriptable_p.h
index 3aa394280f..4bf63e2d2d 100644
--- a/src/script/api/qscriptable_p.h
+++ b/src/script/api/qscriptable_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 class QScriptable;
@@ -78,6 +76,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptclass.cpp b/src/script/api/qscriptclass.cpp
index 5a5363e712..b011323990 100644
--- a/src/script/api/qscriptclass.cpp
+++ b/src/script/api/qscriptclass.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptclass.h"
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -398,5 +396,3 @@ QVariant QScriptClass::extension(Extension extension, const QVariant &argument)
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/api/qscriptclass.h b/src/script/api/qscriptclass.h
index dec53e832d..14a7060953 100644
--- a/src/script/api/qscriptclass.h
+++ b/src/script/api/qscriptclass.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qstring.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtCore/qvariant.h>
 #include <QtScript/qscriptvalue.h>
 
@@ -116,6 +114,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptclasspropertyiterator.cpp b/src/script/api/qscriptclasspropertyiterator.cpp
index e94e90ef77..9328962ed7 100644
--- a/src/script/api/qscriptclasspropertyiterator.cpp
+++ b/src/script/api/qscriptclasspropertyiterator.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptclasspropertyiterator.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptstring.h"
 
 QT_BEGIN_NAMESPACE
@@ -224,5 +222,3 @@ QScriptValue::PropertyFlags QScriptClassPropertyIterator::flags() const
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/api/qscriptclasspropertyiterator.h b/src/script/api/qscriptclasspropertyiterator.h
index 03d9c71a7b..ad27fbf4bc 100644
--- a/src/script/api/qscriptclasspropertyiterator.h
+++ b/src/script/api/qscriptclasspropertyiterator.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qstring.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtScript/qscriptvalue.h>
 
 QT_BEGIN_HEADER
@@ -91,6 +89,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp
index 852ed6b7d9..bce76870e5 100644
--- a/src/script/api/qscriptcontext.cpp
+++ b/src/script/api/qscriptcontext.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptcontext.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptcontext_p.h"
 #include "qscriptcontextinfo.h"
 #include "qscriptengine.h"
@@ -696,5 +694,3 @@ QScriptValue QScriptContext::popScope()
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/api/qscriptcontext.h b/src/script/api/qscriptcontext.h
index c8094dae62..cd6a92c2e1 100644
--- a/src/script/api/qscriptcontext.h
+++ b/src/script/api/qscriptcontext.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtScript/qscriptvalue.h>
 
 QT_BEGIN_HEADER
@@ -121,5 +119,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
 #endif
diff --git a/src/script/api/qscriptcontext_p.h b/src/script/api/qscriptcontext_p.h
index 663e758a23..21884bea78 100644
--- a/src/script/api/qscriptcontext_p.h
+++ b/src/script/api/qscriptcontext_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 namespace JSC
@@ -75,6 +73,4 @@ class QScriptContext;
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp
index 5001cc8c9b..4e28d6216b 100644
--- a/src/script/api/qscriptcontextinfo.cpp
+++ b/src/script/api/qscriptcontextinfo.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptcontextinfo.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptcontext_p.h"
 #include "../bridge/qscriptqobject_p.h"
 #include <QtCore/qdatastream.h>
@@ -515,5 +513,3 @@ Q_SCRIPT_EXPORT QDataStream &operator>>(QDataStream &in, QScriptContextInfo &inf
 #endif
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/api/qscriptcontextinfo.h b/src/script/api/qscriptcontextinfo.h
index c0c5090a98..7d4668497b 100644
--- a/src/script/api/qscriptcontextinfo.h
+++ b/src/script/api/qscriptcontextinfo.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtCore/qlist.h>
 #include <QtCore/qstringlist.h>
 
@@ -120,6 +118,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 36f0f440cd..fa6e8dd749 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -43,8 +43,6 @@
 #include "qscriptsyntaxchecker_p.h"
 #include "qnumeric.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptengine_p.h"
 #include "qscriptcontext_p.h"
 #include "qscriptstring_p.h"
@@ -3738,5 +3736,3 @@ QScriptSyntaxCheckResult &QScriptSyntaxCheckResult::operator=(const QScriptSynta
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h
index da443c07c6..e21ca13ccd 100644
--- a/src/script/api/qscriptengine.h
+++ b/src/script/api/qscriptengine.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qmetatype.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtCore/qvariant.h>
 
 #ifndef QT_NO_QOBJECT
@@ -476,5 +474,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
 #endif // QSCRIPTENGINE_H
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index 77c4561277..20b2616dd2 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -55,8 +55,6 @@
 
 #include "private/qobject_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtCore/qhash.h>
 #include <QtCore/qset.h>
 
@@ -264,6 +262,4 @@ class QScriptPushScopeHelper
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp
index c4f932969e..3d96725230 100644
--- a/src/script/api/qscriptengineagent.cpp
+++ b/src/script/api/qscriptengineagent.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptengineagent.h"
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -444,5 +442,3 @@ QScriptEngine *QScriptEngineAgent::engine() const
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/api/qscriptengineagent.h b/src/script/api/qscriptengineagent.h
index 7b3c30d410..32e9b52846 100644
--- a/src/script/api/qscriptengineagent.h
+++ b/src/script/api/qscriptengineagent.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtCore/qvariant.h>
 
 QT_BEGIN_HEADER
@@ -107,6 +105,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptengineagent_p.h b/src/script/api/qscriptengineagent_p.h
index 1a99c4b7a2..9d1f798f88 100644
--- a/src/script/api/qscriptengineagent_p.h
+++ b/src/script/api/qscriptengineagent_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 class QScriptEngine;
@@ -76,6 +74,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptextensioninterface.h b/src/script/api/qscriptextensioninterface.h
index 45d8659fbb..843b0dddd2 100644
--- a/src/script/api/qscriptextensioninterface.h
+++ b/src/script/api/qscriptextensioninterface.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qfactoryinterface.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
@@ -69,5 +67,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
 #endif // QSCRIPTEXTENSIONINTERFACE_H
diff --git a/src/script/api/qscriptextensionplugin.cpp b/src/script/api/qscriptextensionplugin.cpp
index 1be154cfae..58c12d78a5 100644
--- a/src/script/api/qscriptextensionplugin.cpp
+++ b/src/script/api/qscriptextensionplugin.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptextensionplugin.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptvalue.h"
 #include "qscriptengine.h"
 
@@ -143,5 +141,3 @@ QScriptValue QScriptExtensionPlugin::setupPackage(
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/api/qscriptextensionplugin.h b/src/script/api/qscriptextensionplugin.h
index 41d36f45b9..3061dc554a 100644
--- a/src/script/api/qscriptextensionplugin.h
+++ b/src/script/api/qscriptextensionplugin.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qplugin.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtScript/qscriptextensioninterface.h>
 
 QT_BEGIN_HEADER
@@ -75,5 +73,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
 #endif // QSCRIPTEXTENSIONPLUGIN_H
diff --git a/src/script/api/qscriptstring.cpp b/src/script/api/qscriptstring.cpp
index 9aa2724074..ad290ccc9e 100644
--- a/src/script/api/qscriptstring.cpp
+++ b/src/script/api/qscriptstring.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptstring.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptstring_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -210,5 +208,3 @@ QScriptString::operator QString() const
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h
index 049c115358..73e92952d9 100644
--- a/src/script/api/qscriptstring.h
+++ b/src/script/api/qscriptstring.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qstring.h>
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -82,5 +80,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
 #endif // QSCRIPTSTRING_H
diff --git a/src/script/api/qscriptstring_p.h b/src/script/api/qscriptstring_p.h
index fda1f47676..892e367c9c 100644
--- a/src/script/api/qscriptstring_p.h
+++ b/src/script/api/qscriptstring_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtCore/qstring.h>
 #include <QtCore/qpointer.h>
 #include "qscriptengine.h"
@@ -87,6 +85,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index 47f51b9d5c..b24c67a3da 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptvalue.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptvalue_p.h"
 #include "qscriptengine.h"
 #include "qscriptengine_p.h"
@@ -2555,5 +2553,3 @@ qint64 QScriptValue::objectId() const
     return d_ptr?d_ptr->id:-1;
 }
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/api/qscriptvalue.h b/src/script/api/qscriptvalue.h
index 15a11e3df1..691d31cf2d 100644
--- a/src/script/api/qscriptvalue.h
+++ b/src/script/api/qscriptvalue.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qstring.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtCore/qlist.h>
 
 QT_BEGIN_HEADER
@@ -233,6 +231,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptvalue_p.h b/src/script/api/qscriptvalue_p.h
index 1d4c115e48..3359cba9e4 100644
--- a/src/script/api/qscriptvalue_p.h
+++ b/src/script/api/qscriptvalue_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 #include "wtf/Platform.h"
@@ -171,6 +169,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp
index 5d2c43bbd5..0f3fc62dd0 100644
--- a/src/script/api/qscriptvalueiterator.cpp
+++ b/src/script/api/qscriptvalueiterator.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptvalueiterator.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptstring.h"
 #include "qscriptengine.h"
 #include "qscriptengine_p.h"
@@ -359,5 +357,3 @@ QScriptValueIterator& QScriptValueIterator::operator=(QScriptValue &object)
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/api/qscriptvalueiterator.h b/src/script/api/qscriptvalueiterator.h
index 2242c6850c..8ab710db05 100644
--- a/src/script/api/qscriptvalueiterator.h
+++ b/src/script/api/qscriptvalueiterator.h
@@ -44,8 +44,6 @@
 
 #include <QtScript/qscriptvalue.h>
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -94,6 +92,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QT_NO_SCRIPT
-
 #endif // QSCRIPTVALUEITERATOR_H
diff --git a/src/script/bridge/qscriptactivationobject.cpp b/src/script/bridge/qscriptactivationobject.cpp
index 0e3b37ad00..ee2fb88efe 100644
--- a/src/script/bridge/qscriptactivationobject.cpp
+++ b/src/script/bridge/qscriptactivationobject.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptactivationobject_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "JSVariableObject.h"
 
 namespace JSC
@@ -87,5 +85,3 @@ void QScriptActivationObject::putWithAttributes(JSC::ExecState *exec, const JSC:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
diff --git a/src/script/bridge/qscriptactivationobject_p.h b/src/script/bridge/qscriptactivationobject_p.h
index 4e277dce23..91c9a9c545 100644
--- a/src/script/bridge/qscriptactivationobject_p.h
+++ b/src/script/bridge/qscriptactivationobject_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include "JSVariableObject.h"
 
 QT_BEGIN_NAMESPACE
@@ -91,6 +89,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp
index f805f65009..2c28ca0628 100644
--- a/src/script/bridge/qscriptclassobject.cpp
+++ b/src/script/bridge/qscriptclassobject.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptclassobject_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "../api/qscriptengine.h"
 #include "../api/qscriptengine_p.h"
 #include "../api/qscriptcontext.h"
@@ -265,5 +263,3 @@ bool ClassObjectDelegate::hasInstance(QScriptObject* object, JSC::ExecState *exe
 } // namespace QScript
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/bridge/qscriptclassobject_p.h b/src/script/bridge/qscriptclassobject_p.h
index 10920471b3..53c18a68d4 100644
--- a/src/script/bridge/qscriptclassobject_p.h
+++ b/src/script/bridge/qscriptclassobject_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptobject_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -110,6 +108,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/bridge/qscriptfunction.cpp b/src/script/bridge/qscriptfunction.cpp
index 1c8ea915a4..ac8ca8312a 100644
--- a/src/script/bridge/qscriptfunction.cpp
+++ b/src/script/bridge/qscriptfunction.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptfunction_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "private/qscriptengine_p.h"
 #include "qscriptcontext.h"
 #include "private/qscriptcontext_p.h"
@@ -173,5 +171,3 @@ JSC::JSObject* FunctionWithArgWrapper::proxyConstruct(JSC::ExecState *exec, JSC:
 } // namespace QScript
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/bridge/qscriptfunction_p.h b/src/script/bridge/qscriptfunction_p.h
index 69672743f9..1fe1398dab 100644
--- a/src/script/bridge/qscriptfunction_p.h
+++ b/src/script/bridge/qscriptfunction_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qglobal.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptengine.h"
 
 #include "PrototypeFunction.h"
@@ -136,6 +134,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/bridge/qscriptglobalobject.cpp b/src/script/bridge/qscriptglobalobject.cpp
index 032ee25159..0344de1d21 100644
--- a/src/script/bridge/qscriptglobalobject.cpp
+++ b/src/script/bridge/qscriptglobalobject.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptglobalobject_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "../api/qscriptengine.h"
 #include "../api/qscriptengine_p.h"
 
@@ -127,5 +125,3 @@ void GlobalObject::getPropertyNames(JSC::ExecState* exec, JSC::PropertyNameArray
 } // namespace QScript
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/bridge/qscriptglobalobject_p.h b/src/script/bridge/qscriptglobalobject_p.h
index 47e35b29d0..5365a210e7 100644
--- a/src/script/bridge/qscriptglobalobject_p.h
+++ b/src/script/bridge/qscriptglobalobject_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include "JSGlobalObject.h"
 
 QT_BEGIN_NAMESPACE
@@ -130,6 +128,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp
index bbc51d9c05..5edaecbb8b 100644
--- a/src/script/bridge/qscriptobject.cpp
+++ b/src/script/bridge/qscriptobject.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptobject_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 namespace JSC
@@ -248,5 +246,3 @@ bool QScriptObjectDelegate::hasInstance(QScriptObject* object, JSC::ExecState* e
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/bridge/qscriptobject_p.h b/src/script/bridge/qscriptobject_p.h
index 8023e8e1d5..a90523443a 100644
--- a/src/script/bridge/qscriptobject_p.h
+++ b/src/script/bridge/qscriptobject_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include "JSObject.h"
 
 QT_BEGIN_NAMESPACE
@@ -158,6 +156,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index 83a2d0f9ed..69ae205c79 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptqobject_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qdebug.h>
@@ -2216,5 +2214,3 @@ namespace JSC
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/bridge/qscriptqobject_p.h b/src/script/bridge/qscriptqobject_p.h
index 72e5028765..c31c73efbc 100644
--- a/src/script/bridge/qscriptqobject_p.h
+++ b/src/script/bridge/qscriptqobject_p.h
@@ -55,8 +55,6 @@
 
 #include "qscriptobject_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptengine.h"
 #include <QtCore/qpointer.h>
 
@@ -337,6 +335,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/bridge/qscriptvariant.cpp b/src/script/bridge/qscriptvariant.cpp
index 87f22d96d1..194d623d42 100644
--- a/src/script/bridge/qscriptvariant.cpp
+++ b/src/script/bridge/qscriptvariant.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptvariant_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "../api/qscriptengine.h"
 #include "../api/qscriptengine_p.h"
 
@@ -158,5 +156,3 @@ QVariantPrototype::QVariantPrototype(JSC::ExecState* exec, WTF::PassRefPtr<JSC::
 } // namespace QScript
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/bridge/qscriptvariant_p.h b/src/script/bridge/qscriptvariant_p.h
index cd888cf997..109e96a8f5 100644
--- a/src/script/bridge/qscriptvariant_p.h
+++ b/src/script/bridge/qscriptvariant_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qvariant.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptobject_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -90,6 +88,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/parser/qscript.g b/src/script/parser/qscript.g
index 7910c8a69f..ea9b73d9fb 100644
--- a/src/script/parser/qscript.g
+++ b/src/script/parser/qscript.g
@@ -110,8 +110,6 @@
 
 #include <QtCore/QtDebug>
 
-#ifndef QT_NO_SCRIPT
-
 #include <string.h>
 
 #include "qscriptengine.h"
@@ -168,8 +166,6 @@
 
 #include "qscriptgrammar_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptastfwd_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -2066,13 +2062,9 @@ PropertyNameAndValueListOpt: PropertyNameAndValueList ;
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
 ./
 /:
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif // QSCRIPTPARSER_P_H
 :/
diff --git a/src/script/parser/qscriptast.cpp b/src/script/parser/qscriptast.cpp
index f863f2682d..bf2beae009 100644
--- a/src/script/parser/qscriptast.cpp
+++ b/src/script/parser/qscriptast.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptast_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptastvisitor_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -785,5 +783,3 @@ void DebuggerStatement::accept0(Visitor *visitor)
 } } // namespace QScript::AST
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/parser/qscriptast_p.h b/src/script/parser/qscriptast_p.h
index b9d3319015..9dada81989 100644
--- a/src/script/parser/qscriptast_p.h
+++ b/src/script/parser/qscriptast_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/QString>
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptastvisitor_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -1495,8 +1493,6 @@ public:
 
 } } // namespace AST
 
-#endif // QT_NO_SCRIPT
-
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/script/parser/qscriptgrammar.cpp b/src/script/parser/qscriptgrammar.cpp
index 560bb59a3d..afbbc55bec 100644
--- a/src/script/parser/qscriptgrammar.cpp
+++ b/src/script/parser/qscriptgrammar.cpp
@@ -42,8 +42,6 @@
 
 #include "qscriptgrammar_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 const char *const QScriptGrammar::spell [] = {
@@ -971,5 +969,3 @@ const int QScriptGrammar::action_check [] = {
   -1, -1, -1, -1, -1, -1, -1, -1};
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/parser/qscriptgrammar_p.h b/src/script/parser/qscriptgrammar_p.h
index abc328cc67..89a47fd882 100644
--- a/src/script/parser/qscriptgrammar_p.h
+++ b/src/script/parser/qscriptgrammar_p.h
@@ -57,8 +57,6 @@
 
 #include <QtCore/qglobal.h>
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 class QScriptGrammar
@@ -203,6 +201,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif // QSCRIPTGRAMMAR_P_H
diff --git a/src/script/parser/qscriptlexer.cpp b/src/script/parser/qscriptlexer.cpp
index 04a3ac3940..cac8c17ba1 100644
--- a/src/script/parser/qscriptlexer.cpp
+++ b/src/script/parser/qscriptlexer.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptlexer_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptgrammar_p.h"
 #include <ctype.h>
 #include <stdlib.h>
@@ -1111,5 +1109,3 @@ void QScript::Lexer::syncProhibitAutomaticSemicolon()
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/parser/qscriptlexer_p.h b/src/script/parser/qscriptlexer_p.h
index 8ab521eab1..c9e5370a33 100644
--- a/src/script/parser/qscriptlexer_p.h
+++ b/src/script/parser/qscriptlexer_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/QString>
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 class QScriptEnginePrivate;
@@ -241,6 +239,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/parser/qscriptparser.cpp b/src/script/parser/qscriptparser.cpp
index 288344e76d..03a0fb19ae 100644
--- a/src/script/parser/qscriptparser.cpp
+++ b/src/script/parser/qscriptparser.cpp
@@ -43,8 +43,6 @@
 
 #include <QtCore/QtDebug>
 
-#ifndef QT_NO_SCRIPT
-
 #include <string.h>
 
 #include "qscriptast_p.h"
@@ -1158,5 +1156,3 @@ case 266: {
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/parser/qscriptparser_p.h b/src/script/parser/qscriptparser_p.h
index b714e18109..18efaaa36e 100644
--- a/src/script/parser/qscriptparser_p.h
+++ b/src/script/parser/qscriptparser_p.h
@@ -62,8 +62,6 @@
 
 #include "qscriptgrammar_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptastfwd_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -162,6 +160,4 @@ inline void QScriptParser::reallocateStack()
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif // QSCRIPTPARSER_P_H
diff --git a/src/script/parser/qscriptsyntaxchecker.cpp b/src/script/parser/qscriptsyntaxchecker.cpp
index ac83fe15fe..bca1c44ed8 100644
--- a/src/script/parser/qscriptsyntaxchecker.cpp
+++ b/src/script/parser/qscriptsyntaxchecker.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptsyntaxchecker_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptlexer_p.h"
 #include "qscriptparser_p.h"
 
@@ -214,5 +212,3 @@ SyntaxChecker::Result SyntaxChecker::checkSyntax(const QString &code)
 } // namespace QScript
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/parser/qscriptsyntaxchecker_p.h b/src/script/parser/qscriptsyntaxchecker_p.h
index 7391aacc9c..5b4b898195 100644
--- a/src/script/parser/qscriptsyntaxchecker_p.h
+++ b/src/script/parser/qscriptsyntaxchecker_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qstring.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include "qscriptgrammar_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -113,6 +111,4 @@ inline void SyntaxChecker::reallocateStack()
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/utils/qscriptdate.cpp b/src/script/utils/qscriptdate.cpp
index f0b617265f..4f235f61e3 100644
--- a/src/script/utils/qscriptdate.cpp
+++ b/src/script/utils/qscriptdate.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptdate_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include <QtCore/qnumeric.h>
 #include <QtCore/qstringlist.h>
 
@@ -383,5 +381,3 @@ QDateTime ToDateTime(qsreal t, Qt::TimeSpec spec)
 } // namespace QScript
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/utils/qscriptdate_p.h b/src/script/utils/qscriptdate_p.h
index 40edf1292c..8eb738ff83 100644
--- a/src/script/utils/qscriptdate_p.h
+++ b/src/script/utils/qscriptdate_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qdatetime.h>
 
-#ifndef QT_NO_SCRIPT
-
 QT_BEGIN_NAMESPACE
 
 typedef double qsreal;
@@ -69,6 +67,4 @@ namespace QScript
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SCRIPT
-
 #endif
diff --git a/src/script/visitors/qscriptxmlgenerator.cpp b/src/script/visitors/qscriptxmlgenerator.cpp
index 8a51dbf74e..c1b51b9b21 100644
--- a/src/script/visitors/qscriptxmlgenerator.cpp
+++ b/src/script/visitors/qscriptxmlgenerator.cpp
@@ -41,8 +41,6 @@
 
 #include "qscriptxmlgenerator_p.h"
 
-#ifndef QT_NO_SCRIPT
-
 #include "../parser/qscriptast_p.h"
 
 #include <QtCore/qstring.h>
@@ -1110,5 +1108,3 @@ Q_SCRIPT_EXPORT QString qt_scriptToXml(const QString &program, int lineNumber =
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_SCRIPT
diff --git a/src/script/visitors/qscriptxmlgenerator_p.h b/src/script/visitors/qscriptxmlgenerator_p.h
index a631adbb09..893225a78b 100644
--- a/src/script/visitors/qscriptxmlgenerator_p.h
+++ b/src/script/visitors/qscriptxmlgenerator_p.h
@@ -55,8 +55,6 @@
 
 #include <QtCore/qobjectdefs.h>
 
-#ifndef QT_NO_SCRIPT
-
 #include "../parser/qscriptastvisitor_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -323,8 +321,6 @@ private:
 
 } // namespace QScript
 
-#endif // QT_NO_SCRIPT
-
 QT_END_NAMESPACE
 
 #endif