diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-29 06:26:37 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-29 06:26:37 (GMT) |
| commit | 7d8fc7c68a85aa356e0ea8956f81c0d56216e320 (patch) | |
| tree | 5b284a63dff5e2ad10b290a9867ce4468576a050 /configure | |
| parent | 5a9235d7d7a8d9fbe40efb573b5cf91236d11d6f (diff) | |
| download | Qt-7d8fc7c68a85aa356e0ea8956f81c0d56216e320.zip Qt-7d8fc7c68a85aa356e0ea8956f81c0d56216e320.tar.gz Qt-7d8fc7c68a85aa356e0ea8956f81c0d56216e320.tar.bz2 | |
auto-detect declarative
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 21 |
1 files changed, 17 insertions, 4 deletions
@@ -672,7 +672,7 @@ CFG_PHONON=auto CFG_PHONON_BACKEND=yes CFG_MULTIMEDIA=yes CFG_SVG=yes -CFG_DECLARATIVE=yes +CFG_DECLARATIVE=auto CFG_WEBKIT=auto # (yes|no|auto) CFG_JAVASCRIPTCORE_JIT=auto @@ -1846,7 +1846,7 @@ while [ "$#" -gt 0 ]; do fi ;; declarative) - if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then + if [ "$VAL" = "yes" ]; then CFG_DECLARATIVE="yes" else if [ "$VAL" = "no" ]; then @@ -3402,8 +3402,8 @@ fi -no-scripttools .... Do not build the QtScriptTools module. + -scripttools ....... Build the QtScriptTools module. - -no-declarative .....Do not build the declarative module. - + -declarative ....... Build the declarative module. + + -no-declarative .....Do not build the declarative module. + -declarative ....... Build the declarative module. -platform target ... The operating system and compiler you are building on ($PLATFORM). @@ -5781,6 +5781,19 @@ if [ "$CFG_ALSA" = "auto" ]; then fi fi +if [ -f "$relpath/src/declarative/declarative.pro" ]; then + if [ "$CFG_DECLARATIVE" = "auto" ]; then + CFG_DECLARATIVE=yes + fi +else + if [ "$CFG_DECLARATIVE" = "auto" ] || [ "$CFG_DECLARATIVE" = "no" ]; then + CFG_DECLARATIVE=no + else + echo "Error: Unable to locate the qt-declarative package. Refer to the documentation on how to build the package." + exit 1 + fi +fi + if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/javascriptcore-jit "javascriptcore-jit" $L_FLAGS $I_FLAGS $l_FLAGS |