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>

4 files changed, 9 insertions, 10 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
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 5be57fab8f..48afa3c502 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -187,7 +187,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
@@ -341,7 +341,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
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index 631958b2d7..6ca29a8fc9 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -488,10 +488,6 @@ qt_feature("clock_monotonic" PUBLIC
     CONDITION QT_FEATURE_clock_gettime AND TEST_clock_monotonic
 )
 qt_feature_definition("clock_monotonic" "QT_NO_CLOCK_MONOTONIC" NEGATE VALUE "1")
-qt_feature("dlopen" PRIVATE
-    LABEL "dlopen()"
-    CONDITION UNIX
-)
 qt_feature("cxx11_future" PUBLIC
     LABEL "C++11 <future>"
     CONDITION TEST_cxx11_future
@@ -699,7 +695,7 @@ qt_feature_definition("textdate" "QT_NO_TEXTDATE" NEGATE VALUE "1")
 qt_feature("datestring" PUBLIC
     SECTION "Data structures"
     LABEL "QDate/QTime/QDateTime"
-    PURPOSE "Provides convertion between dates and strings."
+    PURPOSE "Provides conversion between dates and strings."
     CONDITION QT_FEATURE_textdate
 )
 qt_feature_definition("datestring" "QT_NO_DATESTRING" NEGATE VALUE "1")
diff --git a/src/corelib/global/qconfig.cpp.in b/src/corelib/global/qconfig.cpp.in
index 7a5eeb0b04..7fa21bcfed 100644
--- a/src/corelib/global/qconfig.cpp.in
+++ b/src/corelib/global/qconfig.cpp.in
@@ -18,7 +18,10 @@ static const char qt_configure_strs[] =
 @QT_CONFIG_STRS_SECOND@
 #endif
 ;
-#define QT_CONFIGURE_SETTINGS_PATH "etc/xdg"
+#define QT_CONFIGURE_SETTINGS_PATH "@QT_DEFAULT_SYS_CONF_DIR@"
+#define QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH "@QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH@"
+#define QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH@"
+#define QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH@"
 #ifdef QT_BUILD_QMAKE
 # define QT_CONFIGURE_SYSROOTIFY_PREFIX false
 #endif