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/src.pro | |
| parent | 5a9d5009aba3ae22763e743e1a531d9805f545fd (diff) | |
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/src.pro')
| -rw-r--r-- | src/src.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/src.pro b/src/src.pro index 54ed6da98a..8af75c7e60 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 |