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

14 files changed, 0 insertions, 56 deletions

diff --git a/src/script/bridge/qscriptactivationobject.cpp b/src/script/bridge/qscriptactivationobject.cpp
index 0e3b37a..ee2fb88 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 4e277dc..91c9a9c 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 f805f65..2c28ca0 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 1092047..53c18a6 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 1c8ea91..ac8ca83 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 6967274..1fe1398 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 032ee25..0344de1 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 47e35b2..5365a21 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 bbc51d9..5edaecb 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 8023e8e..a905234 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 83a2d0f..69ae205 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 72e5028..c31c73e 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 87f22d9..194d623 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 cd888cf..109e96a 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