diff options
| author | Maurice Kalinowski <maurice.kalinowski@digia.com> | 2014-07-08 14:54:25 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@digia.com> | 2014-08-02 20:10:33 +0200 |
| commit | 3ce554bef0f2f06768a1b64750f7ba60111d807c (patch) | |
| tree | f14adc52bf44a43b20db88a73eb760434d8cdc46 | |
| parent | 4354165e923fd8a467ae318ddbe01c7c6c4f5ff3 (diff) | |
Add sqlite to Windows Phone default build
sqlite 3.8.5 supports Windows Phone 8.1. Make required
adaptations and add it to the default build.
For WinRT and Windows Phone the QSqlQueryModel unit-test
fails, both with plugin compiled and using the system
sqlite. Root cause seems to be deep inside sqlite, hoping
for a fix soon. However, all other tests pass and hence we
should enable it.
Task-number: QTBUG-37770
Change-Id: I700dde4a44a8f1d74460ef6cb4a1e1d330073d66
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/3rdparty/sqlite.pri | 1 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index 0c9d179660..15f082b2ba 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri @@ -3,6 +3,7 @@ DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQ !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS contains(QT_CONFIG, posix_fallocate):DEFINES += HAVE_POSIX_FALLOCATE=1 winrt: DEFINES += SQLITE_OS_WINRT +winphone: DEFINES += SQLITE_WIN32_FILEMAPPING_API=1 qnx: DEFINES += _QNX_SOURCE INCLUDEPATH += $$PWD/sqlite SOURCES += $$PWD/sqlite/sqlite3.c diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 4ed88939a1..679362aa68 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1641,8 +1641,6 @@ void Configure::applySpecSpecifics() dictionary[ "LARGE_FILE" ] = "no"; dictionary[ "ANGLE" ] = "d3d11"; dictionary[ "DYNAMICGL" ] = "no"; - if (dictionary.value("XQMAKESPEC").startsWith("winphone")) - dictionary[ "SQL_SQLITE" ] = "no"; } else if (dictionary.value("XQMAKESPEC").startsWith("wince")) { dictionary[ "STYLE_WINDOWSXP" ] = "no"; dictionary[ "STYLE_WINDOWSVISTA" ] = "no"; |