diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 15:33:16 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 14:54:07 +0000 |
| commit | f500062e165975e112ea644da1d6a3d4c413be2a (patch) | |
| tree | d7e92bcb689d53ab1046130250327974058ee7b4 /src/qml | |
| parent | f1f395b37da163bce2dc3b5fc4e298bb4f56a3e7 (diff) | |
Post Merge Fixes
Change-Id: I13bc3aef318d8b497b01c61fcca7760abd96339a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/qml/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/qml/configure.cmake | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index 92cb639ab1..21119f1827 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -231,6 +231,7 @@ qt_add_module(Qml qml/qqmlmetaobject.cpp qml/qqmlmetaobject_p.h qml/qqmlmetatype.cpp qml/qqmlmetatype_p.h qml/qqmlmetatypedata.cpp qml/qqmlmetatypedata_p.h + qml/qqmlmoduleregistration.cpp qml/qqmlmoduleregistration.h qml/qqmlnetworkaccessmanagerfactory.cpp qml/qqmlnetworkaccessmanagerfactory.h qml/qqmlnotifier.cpp qml/qqmlnotifier_p.h qml/qqmlobjectcreator.cpp qml/qqmlobjectcreator_p.h diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 3d476ad6f6..de6b0623f1 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -231,6 +231,7 @@ qt_add_module(Qml qml/qqmlmetaobject.cpp qml/qqmlmetaobject_p.h qml/qqmlmetatype.cpp qml/qqmlmetatype_p.h qml/qqmlmetatypedata.cpp qml/qqmlmetatypedata_p.h + qml/qqmlmoduleregistration.cpp qml/qqmlmoduleregistration.h qml/qqmlnetworkaccessmanagerfactory.cpp qml/qqmlnetworkaccessmanagerfactory.h qml/qqmlnotifier.cpp qml/qqmlnotifier_p.h qml/qqmlobjectcreator.cpp qml/qqmlobjectcreator_p.h diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake index d26aabee28..067eb52218 100644 --- a/src/qml/configure.cmake +++ b/src/qml/configure.cmake @@ -13,6 +13,7 @@ # cxx14_make_unique qt_config_compile_test(cxx14_make_unique LABEL "C++14 make_unique()" + CODE " #include <memory> @@ -29,6 +30,7 @@ std::unique_ptr<int> ptr = std::make_unique<int>(); # pointer_32bit qt_config_compile_test(pointer_32bit LABEL "32bit pointers" + CODE " @@ -45,6 +47,7 @@ static_assert(sizeof(void *) == 4, \"fail\"); # pointer_64bit qt_config_compile_test(pointer_64bit LABEL "64bit pointers" + CODE " @@ -61,6 +64,7 @@ static_assert(sizeof(void *) == 8, \"fail\"); # arm_thumb qt_config_compile_test(arm_thumb LABEL "THUMB mode on ARM" + CODE " @@ -86,6 +90,7 @@ int main(int argc, char **argv) # arm_fp qt_config_compile_test(arm_fp LABEL "Sufficiently recent FPU on ARM" + CODE " |