diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9eb30e6fc..0647eca10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,7 +102,7 @@ jobs: name: "MacOS" , os: macos-latest , QT_INST_DIR: /Users/runner, Qt_TOOL_PATH: "/Users/runner/Qt/Tools/QtInstallerFramework/4.6" - , extraCmakeConfig: "-DCMAKE_OSX_ARCHITECTURES=\"arm64;x86_64\"" + , extraCmakeConfig: "-DCMAKE_OSX_ARCHITECTURES=\"arm64;x86_64\" -DFRAMEWORKS=ON" } - { name: "Windows-x64" diff --git a/cmake/ff7tkMacros.cmake b/cmake/ff7tkMacros.cmake index 181a2db54..817a6ad59 100644 --- a/cmake/ff7tkMacros.cmake +++ b/cmake/ff7tkMacros.cmake @@ -65,6 +65,8 @@ macro(MAKE_LIBRARY LIB_TARGET HEADER_INSTALL_DIR) list(APPEND ALIASHEADERS ${CMAKE_CURRENT_BINARY_DIR}/${HEADER}) endforeach() + list(APPEND ${LIB_TARGET}_HEADERS ${ALIASHEADERS}) + if(APPLE) if(${BUILD_FRAMEWORKS}) target_include_directories(${LIB_TARGET} PUBLIC $/Headers>) @@ -128,10 +130,6 @@ macro(MAKE_LIBRARY LIB_TARGET HEADER_INSTALL_DIR) PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_INSTALL_DIR} COMPONENT ff7tk_headers ) - install (FILES ${ALIASHEADERS} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_INSTALL_DIR} - COMPONENT ff7tk_headers - ) if(UNIX) if(NOT APPLE) diff --git a/src/widgets/data/CharEditor.cpp b/src/widgets/data/CharEditor.cpp index 5c72dd70e..ac20eb839 100644 --- a/src/widgets/data/CharEditor.cpp +++ b/src/widgets/data/CharEditor.cpp @@ -1513,7 +1513,7 @@ void CharEditor::setTimesused2(int timesused) if (timesused == data.timesused2) return; data.timesused2 = quint16(std::clamp(timesused, 0, quint16Max)); - Q_EMIT times3UsedChanged(data.timesused2); + Q_EMIT times2UsedChanged(data.timesused2); /* Remove for 2.0 */Q_EMIT timesused2_changed(data.timesused2); }