Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ic5a232260a6c8ee71f9ff91e820f54c36ab6b15a

mkspecs/features/cmake_functions.prf

@@ -29,7 +29,7 @@ defineReplace(cmakeTargetPath) {
     SYSR = $$[QT_SYSROOT]
     !isEmpty(SYSR): path = $$relative_path($$1, $$[QT_SYSROOT])
     else: path = $$1
-    return(/$$path)
+    return($$clean_path(/$$path))
 }
 
 defineReplace(cmakeTargetPaths) {
@@ -63,3 +63,8 @@ defineReplace(cmakeProcessLibs) {
     }
     return ($$join(out, ";"))
 }
+
+defineReplace(cmakeRelativePath) {
+    path = $$relative_path($$1, $$2)
+    return($$replace(path, ([^/])$, \\1/))
+}

mkspecs/features/create_cmake.prf

@@ -11,11 +11,6 @@
 
 load(cmake_functions)
 
-defineReplace(cmakeRelativePath) {
-    path = $$relative_path($$1, $$2)
-    return($$replace(path, ([^/])$, \\1/))
-}
-
 CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE})
 
 CMAKE_MODULE_DEPS = $$cmakeModuleList($$sort_depends(QT.$${MODULE}.depends, QT.))

mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

@@ -4,6 +4,9 @@ if (CMAKE_VERSION VERSION_LESS 2.8.3)
 endif()
 
 !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
+!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+!!ELSE
 get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
 # Use original install prefix when loaded through a
 # cross-prefix symbolic link such as /lib -> /usr/lib.
@@ -17,6 +20,7 @@ endif()
 unset(_realOrig)
 unset(_realCurr)
 unset(_IMPORT_PREFIX)
+!!ENDIF
 !!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
 !!ELSE
@@ -49,7 +53,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
     set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
 !!ELSE
-    set(imported_location \"IMPORTED_LOCATION_${Configuration}\" \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
+    set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
 !!ENDIF
     _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
     set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES

src/corelib/global/qnamespace.qdoc

@@ -1207,12 +1207,8 @@
 
 /*! \typedef Qt::HANDLE
 
-    Platform-specific handle type for system objects. This is
-    equivalent to \c{void *} on Mac OS X and embedded Linux,
-    and to \c{unsigned long} on X11. On Windows it is the
-    DWORD returned by the Win32 function getCurrentThreadId().
-
-    \warning Using this type is not portable.
+    A handle type for system objects, defined as \c{void *}
+    on all platforms.
 */
 
 /*!

src/network/access/qhttpnetworkconnectionchannel.cpp

@@ -1116,6 +1116,9 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
                 errorCode = QNetworkReply::RemoteHostClosedError;
             }
         } else if (state == QHttpNetworkConnectionChannel::ReadingState) {
+            if (!reply)
+                break;
+
             if (!reply->d_func()->expectContent()) {
                 // No content expected, this is a valid way to have the connection closed by the server
                 return;