From 190e9dcdcf1a2debfbf624af4cb2154172908a64 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 11 Oct 2019 16:55:55 +0200 Subject: Regenerate files after dev -> wip/cmake merge Note the following bigger things that had to be done: Handle GSS library / feature with a new custom find module. Implement rudimentary support for relocatability (does not currently handle extprefix). Change-Id: Ic6cd27dda7ebca9829f51cb42ea76fff6d1767ef Reviewed-by: Simon Hausmann --- src/corelib/.prev_CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/.prev_CMakeLists.txt') diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index 7cab049b62..70a8a5c8a3 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -173,7 +173,7 @@ add_qt_module(Core thread/qrunnable.cpp thread/qrunnable.h thread/qthread.cpp thread/qthread.h thread/qthreadstorage.h - thread/qwaitcondition.h + thread/qwaitcondition.h thread/qwaitcondition_p.h time/qcalendar.cpp time/qcalendar.h time/qcalendarbackend_p.h time/qcalendarmath_p.h @@ -257,7 +257,7 @@ if(ANDROID) jar/QtAndroid.jar ) set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES - plugins/platforms/android/libqtforandroid.so + plugins/platforms/libplugins_platforms_qtforandroid.so ) set_property(TARGET Core APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.INTERNET android.permission.WRITE_EXTERNAL_STORAGE -- cgit v1.2.3