summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-06-02 10:26:21 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-06-02 10:28:10 (GMT)
commitf352f8e1bb1c34da9447f645eb923e322407d973 (patch)
tree295c5816890220efd1788dd022ddb9c42fa5e172 /tools/configure
parent6e7c48df05189e4066c9e455a4b47cfd5d47a7e7 (diff)
downloadQt-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
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp4
1 files changed, 3 insertions, 1 deletions
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