diff options
Diffstat (limited to 'util/cmake')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 5 | ||||
| -rw-r--r-- | util/cmake/helper.py | 1 | ||||
| -rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
3 files changed, 4 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, diff --git a/util/cmake/helper.py b/util/cmake/helper.py index 00adc940f1..1879233bb6 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -472,6 +472,7 @@ _library_map = [ LibraryMapping("speechd", "SpeechDispatcher", "SpeechDispatcher::SpeechDispatcher"), LibraryMapping("sqlite2", None, None), # No more sqlite2 support in Qt6! LibraryMapping("sqlite3", "SQLite3", "SQLite::SQLite3"), + LibraryMapping("sqlite", "SQLite3", "SQLite::SQLite3"), LibraryMapping("sun_iconv", None, None), LibraryMapping("tslib", "Tslib", "PkgConfig::Tslib"), LibraryMapping("udev", "Libudev", "PkgConfig::Libudev"), diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 8f46b04c74..618e43c356 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -1550,6 +1550,7 @@ def map_condition(condition: str) -> str: r"DEFINES___contains___QT_NO_TRANSLATION", r"(NOT QT_FEATURE_translation)", condition ) condition = re.sub(r"styles___contains___fusion", r"QT_FEATURE_style_fusion", condition) + condition = re.sub(r"CONFIG___contains___largefile", r"QT_FEATURE_largefile", condition) condition = condition.replace("cross_compile", "CMAKE_CROSSCOMPILING") @@ -1571,6 +1572,7 @@ def map_condition(condition: str) -> str: and not feature_name.startswith("system_tiff") and not feature_name.startswith("system_assimp") and not feature_name.startswith("system_doubleconversion") + and not feature_name.startswith("system_sqlite") ): part = "ON" elif feature == "dlopen": |