diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-06-02 10:26:21 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-06-02 10:28:10 (GMT) |
| commit | f352f8e1bb1c34da9447f645eb923e322407d973 (patch) | |
| tree | 295c5816890220efd1788dd022ddb9c42fa5e172 | |
| parent | 6e7c48df05189e4066c9e455a4b47cfd5d47a7e7 (diff) | |
| download | Qt-f352f8e1bb1c34da9447f645eb923e322407d973.zip Qt-f352f8e1bb1c34da9447f645eb923e322407d973.tar.gz Qt-f352f8e1bb1c34da9447f645eb923e322407d973.tar.bz2 | |
Made -qt-sql-sqlite and -system-sqlite options default for confifure.exe
In addition removed those options from confqt.bat and confsbsv2.bat
| -rwxr-xr-x | configure.exe | bin | 868352 -> 1187840 bytes | |||
| -rw-r--r-- | confqt.bat | 2 | ||||
| -rw-r--r-- | confsbsv2.bat | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 4 |
4 files changed, 5 insertions, 3 deletions
diff --git a/configure.exe b/configure.exe Binary files differindex 15a4d66..9b6621f 100755 --- a/configure.exe +++ b/configure.exe @@ -1 +1 @@ -configure -platform win32-mwc -xplatform symbian-abld -qt-sql-sqlite -system-sqlite -nokia-developer %* +configure -platform win32-mwc -xplatform symbian-abld -nokia-developer %* diff --git a/confsbsv2.bat b/confsbsv2.bat index f3a8424..a9194d4 100644 --- a/confsbsv2.bat +++ b/confsbsv2.bat @@ -1 +1 @@ -configure -platform win32-mwc -xplatform symbian-sbsv2 -qt-sql-sqlite -system-sqlite -nokia-developer %* +configure -platform win32-mwc -xplatform symbian-sbsv2 -nokia-developer %* diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 9b44fb5..4ac93f6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1428,7 +1428,9 @@ void Configure::applySpecSpecifics() dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_INSTALL_PREFIX" ]; dictionary[ "QT_INSTALL_PREFIX" ] = ""; dictionary[ "QT_INSTALL_PLUGINS" ] = "\\resource\\qt\\plugins"; - dictionary[ "ARM_FPU_TYPE" ] = "softvfp"; + dictionary[ "ARM_FPU_TYPE" ] = "softvfp"; + dictionary[ "SQL_SQLITE" ] = "yes"; + dictionary[ "SQL_SQLITE_LIB" ] = "system"; } else if(dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong. //TODO |