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

29 files changed, 0 insertions, 109 deletions

diff --git a/src/script/api/qscriptable.cpp b/src/script/api/qscriptable.cpp
index 8b11ff0..cbe29c5 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 1015a00..f358ad1 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 3aa3942..4bf63e2 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 5a5363e..b011323 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 dec53e8..14a7060 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 e94e90e..9328962 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 03d9c71..ad27fbf 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 852ed6b..bce7687 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 c8094da..cd6a92c 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 663e758..21884be 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 5001cc8..4e28d62 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 c0c5090..7d46684 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 36f0f44..fa6e8dd 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 da443c0..e21ca13 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 77c4561..20b2616 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 c4f9329..3d96725 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 7b3c30d..32e9b52 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 1a99c4b..9d1f798 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 45d8659..843b0dd 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 1be154c..58c12d7 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 41d36f4..3061dc5 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 9aa2724..ad290cc 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 049c115..73e9295 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 fda1f47..892e367 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 47f51b9..b24c67a 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 15a11e3..691d31c 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 1d4c115..3359cba 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 5d2c43b..0f3fc62 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 2242c68..8ab710d 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