diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:53 +0200 |
| commit | e28e91ae99b8c3859899e04cc9370534c7c7b86d (patch) | |
| tree | cca81b1e745be4f25aab78e8e917c2324594e539 /src/3rdparty/sqlite.pri | |
| parent | 5ea233ca6782eb27adf596515cb66ef3dadc1d5e (diff) | |
| parent | ebfad73b4e44fe6db8059200da105b4b87888718 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/animation/qpropertyanimation.cpp
src/gui/image/qicon.cpp
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21
Diffstat (limited to 'src/3rdparty/sqlite.pri')
| -rw-r--r-- | src/3rdparty/sqlite.pri | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index a323c97160..068764c726 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri @@ -2,7 +2,10 @@ CONFIG(release, debug|release):DEFINES *= NDEBUG DEFINES += SQLITE_ENABLE_COLUMN_METADATA SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_FTS5 SQLITE_ENABLE_RTREE SQLITE_ENABLE_JSON1 !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS qtConfig(posix_fallocate): DEFINES += HAVE_POSIX_FALLOCATE=1 -winrt: DEFINES += SQLITE_OS_WINRT +winrt { + DEFINES += SQLITE_OS_WINRT + QMAKE_CFLAGS += -Gy +} qnx: DEFINES += _QNX_SOURCE !win32:!winrt:!winphone: DEFINES += HAVE_USLEEP=1 integrity: QMAKE_CFLAGS += -include qplatformdefs.h |