From 8485914b89109e0b661e0a7ee9cb9a7da8da036d Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 22 Jan 2019 14:04:02 +0100 Subject: [PATCH 1/2] make msr-file comment consistent with the docu (for ifll and ifgk). --- src/include/PTheory.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/PTheory.h b/src/include/PTheory.h index 085f20d7..01c8c233 100644 --- a/src/include/PTheory.h +++ b/src/include/PTheory.h @@ -193,10 +193,10 @@ static PTheoDataBase fgTheoDataBase[THEORY_MAX] = { "internFld", "if", "(fraction phase frequency Trate Lrate)", "(fraction phase frequency Trate Lrate tshift)"}, {THEORY_INTERNAL_FIELD_KORNILOV, THEORY_PARAM_INTERNAL_FIELD_KORNILOV, false, - "internFldGK", "ifgk", "(fraction frequency Trate Lrate beta)", "(fraction frequency Trate Lrate beta tshift)"}, + "internFldGK", "ifgk", "(fraction frequency sigma lambda beta)", "(fraction frequency sigma lambda beta tshift)"}, {THEORY_INTERNAL_FIELD_LARKIN, THEORY_PARAM_INTERNAL_FIELD_LARKIN, false, - "internFldLL", "ifll", "(fraction frequency Trate Lrate beta)", "(fraction frequency Trate Lrate beta tshift)"}, + "internFldLL", "ifll", "(fraction frequency sigma lambda beta)", "(fraction frequency sigma lambda beta tshift)"}, {THEORY_BESSEL, THEORY_PARAM_BESSEL, false, "bessel", "b", "(phase frequency)", "(phase frequency tshift)"}, From 98057629e6a4ef74ac65d02be30ca4b0963eefdd Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 22 Jan 2019 14:51:52 +0100 Subject: [PATCH 2/2] adopted musredit.pro such that the deprecated automake get things compiled. --- src/musredit_qt5/musredit/musredit.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/musredit_qt5/musredit/musredit.pro b/src/musredit_qt5/musredit/musredit.pro index 8c6be817..48d69e0c 100644 --- a/src/musredit_qt5/musredit/musredit.pro +++ b/src/musredit_qt5/musredit/musredit.pro @@ -9,11 +9,13 @@ packagesExist(Qt5WebEngine) { isEmpty( HAVE_QT_WEB_ENGINE ) { packagesExist(QtWebKit) { message("QtWebKit found") + DEFINES += HAVE_QT_WEB_KIT HAVE_QT_WEB_ENGINE = 0 } # Mac calls it Qt5WebKit, hence packagesExist(Qt5WebKit) { message("Qt5WebKit found") + DEFINES += HAVE_QT_WEB_KIT HAVE_QT_WEB_ENGINE = 0 } }