diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:55:55 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 19:01:19 +0000 |
| commit | 190e9dcdcf1a2debfbf624af4cb2154172908a64 (patch) | |
| tree | 3feb15de63b05cda8339d784c46f929ad4000357 /src/corelib/.prev_CMakeLists.txt | |
| parent | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (diff) | |
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 <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/.prev_CMakeLists.txt')
| -rw-r--r-- | src/corelib/.prev_CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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 |