From: Toby Smithe Subject: Manual PDFs etc are not found in this checkout. This patch adds a build option to disable manual file installation. --- mscore/CMakeLists.txt | 2 ++ mscore/manual/CMakeLists.txt | 2 ++ mscore/mscore/mscore.cpp | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) --- a/mscore/CMakeLists.txt +++ b/mscore/CMakeLists.txt @@ -38,6 +38,8 @@ set(BUILD_AWL_PLUGIN FALSE) +set(INSTALL_MANUAL_FILES FALSE) # not found in this checkout + if (MINGW) set(GCC_VISIBILITY FALSE) # we use gcc 3.6 set(STATIC_SCRIPT_BINDINGS TRUE) --- a/mscore/manual/CMakeLists.txt +++ b/mscore/manual/CMakeLists.txt @@ -18,6 +18,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #============================================================================= +if(INSTALL_MANUAL_FILES) install(FILES MuseScore-da.pdf MuseScore-de.pdf @@ -38,3 +39,4 @@ MuseScore-zh_CN.pdf DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}man ) +endif(INSTALL_MANUAL_FILES) --- a/mscore/mscore/mscore.cpp +++ b/mscore/mscore/mscore.cpp @@ -841,8 +841,8 @@ QMenu* menuHelp = mb->addMenu(tr("&Help")); menuHelp->setObjectName("Help"); - menuHelp->addAction(getAction("local-help")); - menuHelp->addAction(tr("Online Handbook"), this, SLOT(helpBrowser1())); + // menuHelp->addAction(getAction("local-help")); + menuHelp->addAction(tr("Online Handbook"), this, SLOT(helpBrowser1()), Qt::Key_F1); menuHelp->addSeparator(); menuHelp->addAction(tr("&About"), this, SLOT(about())); menuHelp->addAction(tr("About&Qt"), this, SLOT(aboutQt()));