diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-17 13:58:48 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-17 13:58:48 (GMT) |
| commit | ff6f17c92ad1bfa898bc89a5ccb65361d443c591 (patch) | |
| tree | f0ac9ead3755b886975dada5c977e969600526fd /configure | |
| parent | cd1b5d933575fb801ad3014f3d7fd7c268a362d1 (diff) | |
| parent | 1970e2d46656db8178636e06c82287f536b626c7 (diff) | |
| download | Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.zip Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.gz Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -2407,7 +2407,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then # symlink the mkspecs directory mkdir -p "$outpath/mkspecs" - rm -f "$outpath"/mkspecs/* + rm -rf "$outpath"/mkspecs/* ln -s "$relpath"/mkspecs/* "$outpath/mkspecs" rm -f "$outpath/mkspecs/default" @@ -3677,8 +3677,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). @@ -7886,9 +7886,6 @@ QT_LIBINFIX = $QT_LIBINFIX QT_NAMESPACE = $QT_NAMESPACE QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC -#modules -for(mod,\$\$list(\$\$files(\$\$[QMAKE_MKSPECS]/modules/qt_*.pri))):include(\$\$mod) - EOF if [ "$CFG_RPATH" = "yes" ]; then echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp" |