diff options
63 files changed, 40 insertions, 244 deletions
@@ -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 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 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 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 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 diff --git a/src/script/visitors/qscriptxmlgenerator.cpp b/src/script/visitors/qscriptxmlgenerator.cpp index 8a51dbf..c1b51b9 100644 --- a/src/script/visitors/qscriptxmlgenerator.cpp +++ b/src/script/visitors/qscriptxmlgenerator.cpp @@ -41,8 +41,6 @@ #include "qscriptxmlgenerator_p.h" -#ifndef QT_NO_SCRIPT - #include "../parser/qscriptast_p.h" #include <QtCore/qstring.h> @@ -1110,5 +1108,3 @@ Q_SCRIPT_EXPORT QString qt_scriptToXml(const QString &program, int lineNumber = } QT_END_NAMESPACE - -#endif // QT_NO_SCRIPT diff --git a/src/script/visitors/qscriptxmlgenerator_p.h b/src/script/visitors/qscriptxmlgenerator_p.h index a631adb..893225a 100644 --- a/src/script/visitors/qscriptxmlgenerator_p.h +++ b/src/script/visitors/qscriptxmlgenerator_p.h @@ -55,8 +55,6 @@ #include <QtCore/qobjectdefs.h> -#ifndef QT_NO_SCRIPT - #include "../parser/qscriptastvisitor_p.h" QT_BEGIN_NAMESPACE @@ -323,8 +321,6 @@ private: } // namespace QScript -#endif // QT_NO_SCRIPT - QT_END_NAMESPACE #endif diff --git a/src/src.pro b/src/src.pro index 54ed6da..8af75c7 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,9 +4,9 @@ TEMPLATE = subdirs unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain wince*:{ - SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib + SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_testlib } else { - SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib + SRC_SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_testlib !vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus !cross_compile { @@ -28,6 +28,7 @@ contains(QT_CONFIG, webkit) { #exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore SRC_SUBDIRS += src_webkit } +contains(QT_CONFIG, script): SRC_SUBDIRS += src_script contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools SRC_SUBDIRS += src_plugins |