From 485382048808b5be14d11eb9d71904a49d813e80 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Wed, 31 Aug 2022 18:38:48 -0400 Subject: [PATCH 1/3] Update Qt build --- .github/workflows/build-qi-qmp-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-qi-qmp-windows.yml b/.github/workflows/build-qi-qmp-windows.yml index 08532d8..1bc1c27 100644 --- a/.github/workflows/build-qi-qmp-windows.yml +++ b/.github/workflows/build-qi-qmp-windows.yml @@ -44,13 +44,13 @@ jobs: { "shared": { "qt_install_name": "qt-Production-6.3.1-win32-msvc-x64-shared-release.7z", - "qt_install_url": "https://mega.nz/file/h7ZgWSRa", + "qt_install_url": "https://mega.nz/file/QyoQxRiA", "qt_install_url_key": "${{ secrets.qt_shared_dec_key }}", "artifact_output_var": "qt_shared_artifact_name" }, "static": { "qt_install_name": "qt-Production-6.3.1-win32-msvc-x64-static-release.7z", - "qt_install_url": "https://mega.nz/file/h2RWCKhS", + "qt_install_url": "https://mega.nz/file/QupBFJrC", "qt_install_url_key": "${{ secrets.qt_static_dec_key }}", "artifact_output_var": "qt_static_artifact_name" } From e9d679088c28106d979115b2ac04e18fb757aef7 Mon Sep 17 00:00:00 2001 From: Christian Heimlich Date: Thu, 1 Sep 2022 15:56:16 -0400 Subject: [PATCH 2/3] Fix left over references to Qx instead of QI-QMP --- CMakeLists.txt | 2 +- README.md | 2 +- cmake/file_templates/doc_mainpage.md.in | 8 ++++---- doc/DoxygenLayout.xml | 2 +- doc/header.html | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5860fc3..1ffebee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.21.1) set(TRUE_CMAKE_MINIMUM_REQUIRED ${CMAKE_MINIMUM_REQUIRED_VERSION}) # Configuration options -option(QI_QMP_DOCS_TARGET "Build Qx documentation" OFF) +option(QI_QMP_DOCS_TARGET "Build QI-QMP documentation" OFF) # Project # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS diff --git a/README.md b/README.md index 0271b19..0bcb757 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Finally, the [Minimal Example](https://oblivioncth.github.io/QI-QMP/index.html#a ## Pre-built Releases/Artifacts -Releases and some workflows currently provide builds of Qx in the following configurations: +Releases and some workflows currently provide builds of QI-QMP in the following configurations: 1) - Windows (windows-latest) - MSVC (latest) diff --git a/cmake/file_templates/doc_mainpage.md.in b/cmake/file_templates/doc_mainpage.md.in index 9303ca1..72e4fc9 100644 --- a/cmake/file_templates/doc_mainpage.md.in +++ b/cmake/file_templates/doc_mainpage.md.in @@ -111,7 +111,7 @@ The CMake project is designed to be used with multi-configuration generators suc If QI-QMP is configured as a sub-project, its install components are automatically removed from the `all` component, as to not pollute the install directory of the top-level project. #### Documentation: -In order for the `qx_docs` target to be generated the CMake cache variable **QX_DOCS_TARGET** must be set to *ON* when CMake is invoked: +In order for the `qi_qmp_docs` target to be generated the CMake cache variable **QI_QMP_DOCS_TARGET** must be set to *ON* when CMake is invoked: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cmake.exe (...) -D QI_QMP_DOCS_TARGET=ON ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -120,7 +120,7 @@ The QI_QMP documentation supports two optional, but highly recommended features: - Linking to Qt documentation - Generating a Qt Compressed Help (.qch) file for use in Qt Creator -In order to enable these features, the CMake variables **QT_DOCS_DIR** and **QT_HELP_GEN_PATH** respectively must be available. Qx tries to set them automatically according to the following defaults, but these can be overridden by passing definitions for the variables to CMake on the command line via @c -D. +In order to enable these features, the CMake variables **QT_DOCS_DIR** and **QT_HELP_GEN_PATH** respectively must be available. QI-QMP tries to set them automatically according to the following defaults, but these can be overridden by passing definitions for the variables to CMake on the command line via @c -D. # Optional documentation defaults # Here refers to the install directory of a given Qt build @@ -214,8 +214,8 @@ endfunction() Then in your CMake project: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -include(FetchQx) -fetch_qx() # Get QI-QMP +include(FetchQI-QMP) +fetch_qi_qmp() # Get QI-QMP add_executable(SomeExe ... diff --git a/doc/DoxygenLayout.xml b/doc/DoxygenLayout.xml index 7f21454..e84782a 100644 --- a/doc/DoxygenLayout.xml +++ b/doc/DoxygenLayout.xml @@ -5,7 +5,7 @@ - + diff --git a/doc/header.html b/doc/header.html index 01cf60c..d2f81b4 100644 --- a/doc/header.html +++ b/doc/header.html @@ -33,7 +33,7 @@ - +