diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-07 16:29:20 +0200 |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-07 16:29:20 +0200 |
| commit | ecabc077e81288a1c84c694433c49eba34e74775 (patch) | |
| tree | e71d26e50f4f88ac0682c7cc51bc06f4b2d68908 /src/script/bridge/qscriptglobalobject.cpp | |
| parent | 5a9d5009aba3ae22763e743e1a531d9805f545fd (diff) | |
| download | qt4-tools-ecabc077e81288a1c84c694433c49eba34e74775.tar.gz | |
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
Diffstat (limited to 'src/script/bridge/qscriptglobalobject.cpp')
| -rw-r--r-- | src/script/bridge/qscriptglobalobject.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/script/bridge/qscriptglobalobject.cpp b/src/script/bridge/qscriptglobalobject.cpp index 032ee25159..0344de1d21 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 |