diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-17 13:19:32 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-17 13:19:32 (GMT) |
| commit | 92daafcd4677af16d47e51ac8e0f00c554007fa0 (patch) | |
| tree | f123644ed2ad5d27f65d10553081c5481d04cbc8 | |
| parent | dff782eeff62e80789763943996767695eeec3df (diff) | |
| parent | 1dc8dceed8ff4f063f0dff58be644f17d1c44898 (diff) | |
| download | Qt-92daafcd4677af16d47e51ac8e0f00c554007fa0.zip Qt-92daafcd4677af16d47e51ac8e0f00c554007fa0.tar.gz Qt-92daafcd4677af16d47e51ac8e0f00c554007fa0.tar.bz2 | |
Merge branch 'qtscript-jsc-backend-configure' of git@scm.dev.nokia.troll.no:qt/qt-webkit into qtscript-jsc-backend
| -rw-r--r-- | configure.exe | bin | 856064 -> 856064 bytes | |||
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex b3b1c87..846aa31 100644 --- a/configure.exe +++ b/configure.exe diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 62192b6..dcfaa8e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -241,8 +241,8 @@ Configure::Configure( int& argc, char** argv ) dictionary[ "CE_CRT" ] = "no"; dictionary[ "CETEST" ] = "auto"; dictionary[ "CE_SIGNATURE" ] = "no"; - dictionary[ "SCRIPT" ] = "yes"; - dictionary[ "SCRIPTTOOLS" ] = "yes"; + dictionary[ "SCRIPT" ] = "auto"; + dictionary[ "SCRIPTTOOLS" ] = "auto"; dictionary[ "XMLPATTERNS" ] = "auto"; dictionary[ "PHONON" ] = "auto"; dictionary[ "PHONON_BACKEND" ] = "yes"; |