summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengine.h
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-07 14:29:20 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-07 14:29:20 (GMT)
commitecabc077e81288a1c84c694433c49eba34e74775 (patch)
treee71d26e50f4f88ac0682c7cc51bc06f4b2d68908 /src/script/api/qscriptengine.h
parent5a9d5009aba3ae22763e743e1a531d9805f545fd (diff)
downloadQt-ecabc077e81288a1c84c694433c49eba34e74775.zip
Qt-ecabc077e81288a1c84c694433c49eba34e74775.tar.gz
Qt-ecabc077e81288a1c84c694433c49eba34e74775.tar.bz2
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/api/qscriptengine.h')
-rw-r--r--src/script/api/qscriptengine.h3
1 files changed, 0 insertions, 3 deletions
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