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

11 files changed, 0 insertions, 48 deletions

diff --git a/src/script/parser/qscript.g b/src/script/parser/qscript.g
index 7910c8a..ea9b73d 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 f863f26..bf2beae 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 b9d3319..9dada81 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 560bb59..afbbc55 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 abc328c..89a47fd 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 04a3ac3..cac8c17 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 8ab521e..c9e5370 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 288344e..03a0fb1 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 b714e18..18efaaa 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 ac83fe1..bca1c44 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 7391aac..5b4b898 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