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

2 files changed, 0 insertions, 8 deletions

diff --git a/src/script/utils/qscriptdate.cpp b/src/script/utils/qscriptdate.cpp
index f0b6172..4f235f6 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 40edf12..8eb738f 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