diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-03-24 16:29:54 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-03-25 13:52:05 +0100 |
| commit | 8dcf7d2674bfaa18dc0dfd623c58286bf85260ff (patch) | |
| tree | f1fa545db0d0c448e6017b3c5878406a610230c7 /util/cmake/configurejson2cmake.py | |
| parent | d0b30de54299e8e6e8b1df0c138494c17c2b2642 (diff) | |
CMake: Add support for bundled SQLite library
Change-Id: I4d3f6e3bf04eb2fcf337e2c5dbc04b6e6f8ebe0b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util/cmake/configurejson2cmake.py')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 31a0dda7dc..b8e32c9cc9 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -472,7 +472,6 @@ def parseInput(ctx, sinput, data, cm_fh): "pps", "slog2", "syslog", - "sqlite", } if sinput in skip_inputs: @@ -807,7 +806,6 @@ def get_feature_mapping(): }, "simulator_and_device": {"condition": "UIKIT AND NOT QT_UIKIT_SDK"}, "pkg-config": None, - "posix_fallocate": None, # Only needed for sqlite, which we do not want to build "posix-libiconv": { "condition": "NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND TEST_iconv_needlib", "enable": "TEST_posix_iconv AND TEST_iconv_needlib", @@ -828,7 +826,7 @@ def get_feature_mapping(): "sanitize_undefined": None, "shared": {"condition": "BUILD_SHARED_LIBS"}, "silent": None, - "sql-sqlite": {"condition": "QT_FEATURE_datestring AND SQLite3_FOUND"}, + "sql-sqlite": {"condition": "QT_FEATURE_datestring"}, "static": None, "static_runtime": None, "stl": None, # Do we really need to test for this in 2018?! @@ -838,7 +836,6 @@ def get_feature_mapping(): "enable": "TEST_sun_iconv", "disable": "NOT TEST_sun_iconv", }, - "system-sqlite": None, "system-xcb": None, "tiff": {"condition": "QT_FEATURE_imageformatplugin AND TIFF_FOUND"}, "use_gold_linker": None, |