Merge branch '1.23' into master

Change-Id: I1640aa670bd12be70b794286deda4d420bb491df

9 files changed, 44 insertions, 17 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b76f8d0aa..6aab0b6b6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -869,8 +869,6 @@ jobs:
       shell: bash
     - name: Update PATH
       run: echo "./release/install-root/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-    - name: Install required packages
-      run: choco install -y pkgconfiglite --download-checksum=6004df17818f5a6dbf19cb335cc92702
     - name: Install OpenWatcom
       uses: ./.github/actions/download-ow
     - name: Install DigitalMars
diff --git a/changelogs/changes-1.23.2.md b/changelogs/changes-1.23.2.md
new file mode 100644
index 000000000..56e8a7862
--- /dev/null
+++ b/changelogs/changes-1.23.2.md
@@ -0,0 +1,10 @@
+# Qt Support
+* Set _ENABLE_EXTENDED_ALIGNED_STORAGE for MSVC
+
+# Documentation
+* Fix installation with cmake
+
+# Contributors
+* Christian Kandeler
+* Ivan Komissarov
+* Marius Gripsgard
diff --git a/cmake/QbsBuildConfig.cmake b/cmake/QbsBuildConfig.cmake
index a29f550f2..cc2db2fb3 100644
--- a/cmake/QbsBuildConfig.cmake
+++ b/cmake/QbsBuildConfig.cmake
@@ -24,6 +24,7 @@ set(QBS_PLUGINS_INSTALL_BASE "${QBS_LIBDIR_NAME}" CACHE STRING "Relative install
 set(QBS_RESOURCES_INSTALL_BASE "." CACHE STRING "Relative install location for Qbs resources.")
 set(QBS_HEADERS_INSTALL_DIR "include/qbs" CACHE STRING "Relative install location for Qbs headers.")
 set(QBS_DOC_INSTALL_DIR "${QBS_RESOURCES_INSTALL_BASE}/share/doc/qbs" CACHE STRING "Relative install location for Qbs documentation.")
+set(QBS_DOC_HTML_DIR_NAME "html" CACHE STRING "The name of the dir with HTML files, appended to QBS_DOC_INSTALL_DIR.")
 
 set(QBS_PLUGINS_INSTALL_DIR "${QBS_PLUGINS_INSTALL_BASE}/qbs/plugins")
 set(QBS_RESOURCES_INSTALL_DIR "${QBS_RESOURCES_INSTALL_BASE}/share")
diff --git a/cmake/QbsDocumentation.cmake b/cmake/QbsDocumentation.cmake
index a1ce44057..c8c1635e7 100644
--- a/cmake/QbsDocumentation.cmake
+++ b/cmake/QbsDocumentation.cmake
@@ -1,6 +1,7 @@
 # Options:
 option(QBS_INSTALL_HTML_DOCS "Whether to install Qbs HTML Documentation" OFF)
 option(QBS_INSTALL_QCH_DOCS "Whether to install Qbs QCH Documentation" OFF)
+option(QBS_INSTALL_MAN_PAGE "Whether to install Qbs man page" OFF)
 
 # Get information on directories from qmake
 # as this is not yet exported by cmake.
@@ -69,6 +70,11 @@ function(_qbs_setup_doc_targets)
             BuildQbsDocumentation ALL COMMENT "Build Qbs documentation")
         add_dependencies(BuildQbsDocumentation qbs_html_docs qbs_qch_docs)
     endif()
+    if (NOT TARGET qbs_docs)
+        add_custom_target(
+            qbs_docs ALL COMMENT "Build Qbs documentation")
+        add_dependencies(qbs_docs BuildQbsDocumentation)
+    endif()
 endfunction()
 
 function(_find_python_module module)
@@ -119,8 +125,6 @@ function(_qbs_setup_qdoc_targets _qdocconf_file _retval)
 
     get_filename_component(_target "${_qdocconf_file}" NAME_WE)
 
-    #  message(${_target})
-    #  set(_html_outputdir "${_arg_HTML_DIR}/${_target}${_arg_POSTFIX}")
     set(_html_outputdir "${_arg_HTML_DIR}")
     file(MAKE_DIRECTORY "${_html_outputdir}")
 
@@ -183,6 +187,13 @@ function(_qbs_setup_qdoc_targets _qdocconf_file _retval)
     add_custom_target(${_html_target} DEPENDS "${_fixed_html_artifact}")
     add_dependencies(qbs_html_docs "${_html_target}")
 
+    # artifacts might be required for QCH-only installation, so we build them
+    # always, and skip HTML docs installation here
+    if (QBS_INSTALL_HTML_DOCS)
+        install(DIRECTORY "${_html_outputdir}" DESTINATION "${_arg_INSTALL_DIR}"
+            COMPONENT qbs_docs)
+    endif()
+
     set("${_retval}" "${_html_outputdir}" PARENT_SCOPE)
 endfunction()
 
@@ -228,9 +239,7 @@ function(_qbs_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir)
     add_dependencies(qbs_qch_docs "${_qch_target}")
 
     install(FILES "${_qch_outputdir}/${_target}.qch" DESTINATION "${_arg_INSTALL_DIR}"
-        COMPONENT qbs_qch_docs)
-    install(DIRECTORY "${_qch_outputdir}/html" DESTINATION "${_arg_INSTALL_DIR}"
-        COMPONENT qbs_html_docs)
+        COMPONENT qbs_docs)
 endfunction()
 
 # Helper functions:
@@ -285,10 +294,11 @@ function(add_qbs_documentation qdocconf_file)
     set(SRCDIR "${Qbs_SOURCE_DIR}/doc")
 
     set(_qch_params)
+    # if QBS_INSTALL_QCH_DOCS is No, qch generation will be skipped entirely
     if (QBS_INSTALL_QCH_DOCS)
         set(_qch_params QCH QCH_DIR "${CMAKE_CURRENT_BINARY_DIR}")
     endif()
-    set(_qdoc_params HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/html")
+    set(_qdoc_params HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/${QBS_DOC_HTML_DIR_NAME}")
     list(APPEND _qdoc_params INSTALL_DIR "${QBS_DOC_INSTALL_DIR}")
 
     # Set up environment for qdoc:
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 5b8ac7636..04ff12470 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -26,3 +26,5 @@ add_qbs_documentation(
         ${_DOC_IMAGES_SOURCES}
         ${_DOC_TARGETS_SOURCES}
     )
+
+add_subdirectory(man)
diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
new file mode 100644
index 000000000..00d003d7f
--- /dev/null
+++ b/doc/man/CMakeLists.txt
@@ -0,0 +1,3 @@
+if (QBS_INSTALL_MAN_PAGE)
+    install(FILES qbs.1 DESTINATION ${QBS_RESOURCES_INSTALL_DIR}/man/man1 COMPONENT qbs_docs)
+endif()
diff --git a/doc/reference/jsextensions/jsextension-host.qdoc b/doc/reference/jsextensions/jsextension-host.qdoc
index 1dda85d17..c011e90eb 100644
--- a/doc/reference/jsextensions/jsextension-host.qdoc
+++ b/doc/reference/jsextensions/jsextension-host.qdoc
@@ -70,7 +70,7 @@
 
     \section2 platform
     \code
-    Host.platform(): string[]
+    Host.platform(): string
     \endcode
     Returns the host operating system platform.
 
@@ -111,21 +111,21 @@
 
     \section2 osVersionMajor
     \code
-    Host.osVersionMajor(): string[]
+    Host.osVersionMajor(): number
     \endcode
     Returns the host operating system major version.
     \funsince 1.22
 
     \section2 osVersionMinor
     \code
-    Host.osVersionMinor(): string[]
+    Host.osVersionMinor(): number
     \endcode
     Returns the host operating system minor version.
     \funsince 1.22
 
     \section2 osVersionPatch
     \code
-    Host.osVersionPatch(): string[]
+    Host.osVersionPatch(): number
     \endcode
     Returns the host operating system patch level.
     \funsince 1.22
diff --git a/scripts/install-ow.sh b/scripts/install-ow.sh
index 6b123fab8..c8db30b8f 100755
--- a/scripts/install-ow.sh
+++ b/scripts/install-ow.sh
@@ -38,6 +38,7 @@
 ##
 #############################################################################
 set -eu
+set -o pipefail
 
 function show_help() {
     cat <<EOF
@@ -114,15 +115,15 @@ DOWNLOAD_DIR=`mktemp -d 2>/dev/null || mktemp -d -t 'ow-tmp'`
 VERSION_MAJOR=`echo $VERSION | cut -d. -f1`
 VERSION_MINOR=`echo $VERSION | cut -d. -f2`
 
-OW_URL="https://github.com/open-watcom/open-watcom-v${VERSION_MAJOR}/releases/download/Current-build/ow-snapshot.tar.gz"
-OW_TARGZ="${DOWNLOAD_DIR}/ow.tar.gz"
+OW_URL="https://github.com/open-watcom/open-watcom-v${VERSION_MAJOR}/releases/download/Current-build/ow-snapshot.tar.xz"
+OW_TAR="${DOWNLOAD_DIR}/ow.tar.xz"
 
 echo "Downloading compiler from ${OW_URL}..." >&2
-curl --progress-bar -L -o ${OW_TARGZ} ${OW_URL} >&2
+curl --progress-bar -L -o ${OW_TAR} ${OW_URL} >&2
 
 echo "Unpacking compiler to ${INSTALL_DIR}..." >&2
-7z x "${OW_TARGZ}" -so | 7z x -aoa -si -ttar -o"${INSTALL_DIR}" >/dev/null 2>&1
+7z x "${OW_TAR}" -so | 7z x -aoa -si -ttar -o"${INSTALL_DIR}" >/dev/null 2>&1
 
 echo "${INSTALL_DIR}/${BIN_DIR}"
 
-rm -f ${OW_TARGZ}
+rm -f ${OW_TAR}
diff --git a/share/qbs/module-providers/Qt/templates/core.qbs b/share/qbs/module-providers/Qt/templates/core.qbs
index 137119915..b980588ff 100644
--- a/share/qbs/module-providers/Qt/templates/core.qbs
+++ b/share/qbs/module-providers/Qt/templates/core.qbs
@@ -149,6 +149,8 @@ Module {
             if (Utilities.versionCompare(version, "5.6.0") < 0)
                 defines.push("main=qtmn");
         }
+        if (qbs.toolchain.contains("msvc"))
+            defines.push("_ENABLE_EXTENDED_ALIGNED_STORAGE");
         return defines;
     }
     cpp.driverFlags: {