diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 01:00:14 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-30 01:00:14 +0100 |
| commit | a317bff2985b0bd70a8b7685249137df4cc17c5d (patch) | |
| tree | 2d2945305ff5edc263174d2bdb266833c5728a68 /src/corelib | |
| parent | b56e856d218976bf39d981468267337d8d6223f5 (diff) | |
| parent | d05ca484cfef805f3b442ad29e50d5f219049336 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib4df563fc7b1f7c40f425e0e71180d9517a672be
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/Qt5AndroidSupport.cmake | 6 | ||||
| -rw-r--r-- | src/corelib/thread/qthread.cpp | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/corelib/Qt5AndroidSupport.cmake b/src/corelib/Qt5AndroidSupport.cmake index 4bf826eedc..5f24fb0e8c 100644 --- a/src/corelib/Qt5AndroidSupport.cmake +++ b/src/corelib/Qt5AndroidSupport.cmake @@ -168,6 +168,9 @@ if (NOT ${PROJECT_NAME}-MultiAbiBuild) -D CMAKE_FIND_ROOT_PATH_MODE_INCLUDE=${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE} -D CMAKE_FIND_ROOT_PATH_MODE_PACKAGE=${CMAKE_FIND_ROOT_PATH_MODE_PACKAGE} -D CMAKE_SHARED_LIBRARY_SUFFIX_CXX=_${android_abi}.so + -D CMAKE_SHARED_MODULE_SUFFIX_CXX=_${android_abi}.so + -D CMAKE_SHARED_LIBRARY_SUFFIX_C=_${android_abi}.so + -D CMAKE_SHARED_MODULE_SUFFIX_C=_${android_abi}.so -D CMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_BINARY_DIR}/android-build/libs/${android_abi} -D ${PROJECT_NAME}-MultiAbiBuild=ON ) @@ -181,7 +184,10 @@ if (NOT ${PROJECT_NAME}-MultiAbiBuild) else() # For the default abi just use the regular cmake run, to have # nice IDE integration and so on + set(CMAKE_SHARED_MODULE_SUFFIX_CXX "_${ANDROID_ABI}.so") set(CMAKE_SHARED_LIBRARY_SUFFIX_CXX "_${ANDROID_ABI}.so") + set(CMAKE_SHARED_MODULE_SUFFIX_C "_${ANDROID_ABI}.so") + set(CMAKE_SHARED_LIBRARY_SUFFIX_C "_${ANDROID_ABI}.so") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/android-build/libs/${ANDROID_ABI}) endif() endforeach() diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 9fd1dd059d..880ae9e046 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -919,6 +919,16 @@ QThreadPrivate::~QThreadPrivate() delete data; } +void QThread::setStackSize(uint stackSize) +{ + Q_UNUSED(stackSize); +} + +uint QThread::stackSize() const +{ + return 0; +} + #endif // QT_CONFIG(thread) /*! |