diff options
| author | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2021-04-14 12:06:19 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2021-04-15 09:48:06 +0900 |
| commit | fe02abd88d6a0f24e3d083e6cd42c17244cb3a45 (patch) | |
| tree | b8e54656684c0e1f5b94f78062110e0e3a09424a /src/qml/.prev_configure.cmake | |
| parent | 7770bce8dea2121c72cb448d823ba348299c5fec (diff) | |
Fix build without features.itemmodel
Change-Id: I12073e43b34d7c72b441aaf081e4210a3161b4e8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/qml/.prev_configure.cmake')
| -rw-r--r-- | src/qml/.prev_configure.cmake | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/src/qml/.prev_configure.cmake b/src/qml/.prev_configure.cmake index 3cf4826bbb..07dafd5d6f 100644 --- a/src/qml/.prev_configure.cmake +++ b/src/qml/.prev_configure.cmake @@ -14,12 +14,10 @@ qt_config_compile_test(cxx14_make_unique LABEL "C++14 make_unique()" CODE -" -#include <memory> +"#include <memory> -int main(int argc, char **argv) +int main(void) { - (void)argc; (void)argv; /* BEGIN TEST: */ std::unique_ptr<int> ptr = std::make_unique<int>(); /* END TEST: */ @@ -31,12 +29,8 @@ std::unique_ptr<int> ptr = std::make_unique<int>(); qt_config_compile_test(pointer_32bit LABEL "32bit pointers" CODE -" - - -int main(int argc, char **argv) +"int main(void) { - (void)argc; (void)argv; /* BEGIN TEST: */ static_assert(sizeof(void *) == 4, \"fail\"); /* END TEST: */ @@ -48,12 +42,8 @@ static_assert(sizeof(void *) == 4, \"fail\"); qt_config_compile_test(pointer_64bit LABEL "64bit pointers" CODE -" - - -int main(int argc, char **argv) +"int main(void) { - (void)argc; (void)argv; /* BEGIN TEST: */ static_assert(sizeof(void *) == 8, \"fail\"); /* END TEST: */ @@ -65,12 +55,8 @@ static_assert(sizeof(void *) == 8, \"fail\"); qt_config_compile_test(arm_thumb LABEL "THUMB mode on ARM" CODE -" - - -int main(int argc, char **argv) +"int main(void) { - (void)argc; (void)argv; /* BEGIN TEST: */ #if defined(thumb2) || defined(__thumb2__) # define THUMB_OK @@ -91,12 +77,8 @@ int main(int argc, char **argv) qt_config_compile_test(arm_fp LABEL "Sufficiently recent FPU on ARM" CODE -" - - -int main(int argc, char **argv) +"int main(void) { - (void)argc; (void)argv; /* BEGIN TEST: */ // if !defined(__ARM_FP) we might be on MSVC or we might have a device // without an FPU. @@ -187,6 +169,12 @@ qt_feature("qml-itemmodel" PRIVATE PURPOSE "Provides the item model for item views in QML" CONDITION QT_FEATURE_itemmodel ) +qt_feature("qml-xmllistmodel" PRIVATE + SECTION "QML" + LABEL "QML XmlListModel" + PURPOSE "Enable XmlListModel in QML" + CONDITION QT_FEATURE_qml_itemmodel AND QT_FEATURE_future +) qt_feature("qml-python" PRIVATE LABEL "python" CONDITION tests.qml-python OR FIXME |