AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Configure.json: Do not link to pthread on Android on feature testing

Browse Source 
pthread has been removed from the NDK and the cxx11_feature detection
fails.

Fixes: QTBUG-72330
Change-Id: I22a97814b7e95011ad3944327f02343348c72b91
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Cristian Adam 2020-08-12 12:46:49 +02:00
parent 95946222e6
commit 6b488d8950
3 changed files with 1009 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1005
src/corelib/.prev_configure.cmake Normal file
View File

File diff suppressed because it is too large Load Diff

4
src/corelib/configure.cmake
View File

@ -119,8 +119,9 @@ int pipes[2];
} }
") ")
# special case begin
# cxx11_future # cxx11_future
if (UNIX) if (UNIX AND NOT ANDROID)
set(cxx11_future_TEST_LIBRARIES pthread) set(cxx11_future_TEST_LIBRARIES pthread)
endif() endif()
qt_config_compile_test(cxx11_future qt_config_compile_test(cxx11_future
@ -141,6 +142,7 @@ std::future<int> f = std::async([]() { return 42; });
return 0; return 0;
} }
") ")
# special case end
# cxx11_random # cxx11_random
qt_config_compile_test(cxx11_random qt_config_compile_test(cxx11_random

2
src/corelib/configure.json
View File

@ -319,7 +319,7 @@
"std::future<int> f = std::async([]() { return 42; });", "std::future<int> f = std::async([]() { return 42; });",
"(void)f.get();" "(void)f.get();"
], ],
"qmake": "unix:LIBS += -lpthread" "qmake": "unix:!android:LIBS += -lpthread"
} }
}, },
"cxx11_random": { "cxx11_random": {