63 files changed, 40 insertions, 244 deletions

diff --git a/configure b/configure
index 1d1f826..4c49267 100755
--- a/configure
+++ b/configure
@@ -563,6 +563,7 @@ MIN_DBUS_1_VERSION=0.62
 CFG_CONFIGURE_EXIT_ON_ERROR=yes
 CFG_PROFILE=no
 CFG_EXCEPTIONS=unspecified
+CFG_SCRIPT=auto # (yes|no|auto)
 CFG_SCRIPTTOOLS=auto # (yes|no|auto)
 CFG_XMLPATTERNS=auto # (yes|no|auto)
 CFG_INCREMENTAL=auto
@@ -850,7 +851,7 @@ while [ "$#" -gt 0 ]; do
         VAL=no
         ;;
     #Qt style yes options
-        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-svg|-webkit|-scripttools|-rpath|-force-pkg-config)
+        -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-svg|-webkit|-script|-scripttools|-rpath|-force-pkg-config)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         VAL=yes
         ;;
@@ -1749,6 +1750,17 @@ while [ "$#" -gt 0 ]; do
             fi
         fi
         ;;
+    script)
+        if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
+            CFG_SCRIPT="yes"
+        else
+            if [ "$VAL" = "no" ]; then
+                CFG_SCRIPT="no"
+            else
+                UNKNOWN_OPT=yes
+            fi
+        fi
+        ;;
     scripttools)
         if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
             CFG_SCRIPTTOOLS="yes"
@@ -3163,7 +3175,7 @@ Usage:  $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
         [-no-openssl] [-openssl] [-openssl-linked]
         [-no-multimedia] [-multimedia]
         [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit]
-        [-no-scripttools] [-scripttools]
+        [-no-script] [-script] [-no-scripttools] [-scripttools]
 
         [additional platform specific options (see below)]
 
@@ -3312,6 +3324,9 @@ fi
  +  -webkit ............ Build the WebKit module.
                          WebKit is built if a decent C++ compiler is used.
 
+    -no-script ......... Do not build the QtScript module.
+ +  -script ............ Build the QtScript module.
+
     -no-scripttools .... Do not build the QtScriptTools module.
  +  -scripttools ....... Build the QtScriptTools module.
 
@@ -6289,13 +6304,28 @@ else
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT"
 fi
 
-if [ "$CFG_SCRIPTTOOLS" = "auto" ]; then
+if [ "$CFG_SCRIPT" = "auto" ]; then
+    CFG_SCRIPT="yes"
+fi
+
+if [ "$CFG_SCRIPT" = "yes" ]; then
+    QT_CONFIG="$QT_CONFIG script"
+else
+    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPT"
+fi
+
+if [ "$CFG_SCRIPTTOOLS" = "yes" -a "$CFG_SCRIPT" = "no" ]; then
+    echo "QtScriptTools was requested, but it can't be built due to QtScript being disabled."
+    exit 1
+fi
+if [ "$CFG_SCRIPTTOOLS" = "auto" -a "$CFG_SCRIPT" != "no" ]; then
     CFG_SCRIPTTOOLS="yes"
+elif [ "$CFG_SCRIPT" = "no" ]; then
+    CFG_SCRIPTTOOLS="no"
 fi
 
 if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then
     QT_CONFIG="$QT_CONFIG scripttools"
-    CFG_SCRIPTTOOLS="yes"
 else
     QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS"
 fi
@@ -7164,6 +7194,7 @@ echo "Qt 3 compatibility .. $CFG_QT3SUPPORT"
 [ "$CFG_DBUS" = "yes" ]    && echo "QtDBus module ....... yes (run-time)"
 [ "$CFG_DBUS" = "linked" ] && echo "QtDBus module ....... yes (linked)"
 echo "QtConcurrent code.... $CFG_CONCURRENT"
+echo "QtScript module ..... $CFG_SCRIPT"
 echo "QtScriptTools module  $CFG_SCRIPTTOOLS"
 echo "QtXmlPatterns module  $CFG_XMLPATTERNS"
 echo "Phonon module ....... $CFG_PHONON"
diff --git a/examples/examples.pro b/examples/examples.pro
index e6cece9..c334fd5 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -22,10 +22,10 @@ SUBDIRS       = \
                 widgets \
                 uitools \
                 xml \
-                script \
                 multitouch \
                 gestures
 
+contains(QT_CONFIG, script): SUBDIRS += script
 contains(QT_CONFIG, multimedia):!static: SUBDIRS += multimedia
 contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
 contains(QT_CONFIG, webkit): SUBDIRS += webkit
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index 9408a5b..3a6c050 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -1143,13 +1143,6 @@ Requires: UNDOSTACK LISTVIEW
 Name: QUndoView
 SeeAlso: ???
 
-Feature: SCRIPT
-Description: Provides support for the QtScript module
-Section: Utilities
-Requires: TEXTDATE DATESTRING PROPERTIES
-Name: QtScript
-SeeAlso: ???
-
 Feature: ACCESSIBILITY
 Description: Provides accessibility support.
 Section: Utilities
diff --git a/src/plugins/script/script.pro b/src/plugins/script/script.pro
index dbcecea..eaae56b 100644
--- a/src/plugins/script/script.pro
+++ b/src/plugins/script/script.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-contains(QT_CONFIG, dbus):SUBDIRS += qtdbus
+contains(QT_CONFIG, script):contains(QT_CONFIG, dbus):SUBDIRS += qtdbus
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

path: root/Modules/Setup.config.in

# This file is transmogrified into Setup.config by config.status.

# The purpose of this file is to conditionally enable certain modules
# based on configure-time options.

# Threading
@USE_THREAD_MODULE@thread threadmodule.c

# The signal module
@USE_SIGNAL_MODULE@signal signalmodule.c

# The rest of the modules previously listed in this file are built
# by the setup.py script in Python 2.1.