diff --git a/src/musredit_qt5/musrStep/musrStep.pro b/src/musredit_qt5/musrStep/musrStep.pro deleted file mode 100644 index daedf7c53..000000000 --- a/src/musredit_qt5/musrStep/musrStep.pro +++ /dev/null @@ -1,75 +0,0 @@ -TEMPLATE = app -TARGET = musrStep - -# install path for musrStep via given prefix -count( PREFIX, 1 ) { - MUSRSTEP_INSTALL_PATH = $${PREFIX}/bin -} -isEmpty( MUSRSTEP_INSTALL_PATH ) { - MUSR_FIT_PATH = $$(MUSRFITPATH) - count( MUSR_FIT_PATH, 1) { - MUSRSTEP_INSTALL_PATH = $$(MUSRFITPATH) - } -} -isEmpty( MUSRSTEP_INSTALL_PATH ) { - ROOT_SYS_PATH = $$(ROOTSYS) - count( ROOT_SYS_PATH, 1) { - MUSRSTEP_INSTALL_PATH = $$(ROOTSYS)/bin - } -} -isEmpty( MUSRSTEP_INSTALL_PATH ) { - MUSRSTEP_INSTALL_PATH = /usr/local/bin -} - -exists( /usr/bin/cygwin1.dll ) { - QMAKE_CXXFLAGS += -D_WIN32GCC - QMAKE_LFLAGS_APP = -Wl,--enable-auto-import -} - -isEmpty( CC ) { - CC = gcc -} - -isEmpty( CXX ) { - CXX = g++ -} - -QMAKE_CC = $${CC} -QMAKE_CXX = $${CXX} -QMAKE_LINK = $${CXX} - -# set proper permission for Mac OSX -macx { - QMAKE_INSTALL_FILE = install -m 6755 -p -o $$(USER) -g staff -} - -# install path for the application -unix { - message( "Determined installation path: $${MUSRSTEP_INSTALL_PATH}" ) -} - -unix:target.path = $${MUSRSTEP_INSTALL_PATH} -macx:target.path = /Applications -win32:target.path = c:/musrfit/bin - -INSTALLS += target - -CONFIG += qt \ - warn_on \ - release \ - console - -QT += widgets -QT += svg - -INCLUDEPATH += "../../include" - -HEADERS = ../../include/git-revision.h \ - PMusrStep.h - -SOURCES = PMusrStep.cpp \ - musrStep.cpp - -RESOURCES = musrStep.qrc - -macx:ICON = icons/musrStep.icns diff --git a/src/musredit_qt5/musrWiz/musrWiz.pro b/src/musredit_qt5/musrWiz/musrWiz.pro deleted file mode 100644 index 8aa159832..000000000 --- a/src/musredit_qt5/musrWiz/musrWiz.pro +++ /dev/null @@ -1,66 +0,0 @@ -TEMPLATE = app -TARGET = musrWiz - -# install path for musrWiz -count( PREFIX, 1 ) { - MUSRWIZ_INSTALL_PATH = $${PREFIX}/bin -} -isEmpty( MUSRWIZ_INSTALL_PATH ) { - MUSR_FIT_PATH = $$(MUSRFITPATH) - count( MUSR_FIT_PATH, 1 ) { - MUSRWIZ_INSTALL_PATH = $$(MUSRFITPATH) - } -} -isEmpty( MUSRWIZ_INSTALL_PATH ) { - ROOT_SYS_PATH = $$(ROOTSYS) - count( ROOT_SYS_PATH, 1 ) { - MUSRWIZ_INSTALL_PATH = $$(ROOTSYS)/bin - } -} -isEmpty( MUSRWIZ_INSTALL_PATH ) { - MUSRWIZ_INSTALL_PATH = /usr/local/bin -} - -unix { - message( "Determined installation path: $${MUSRWIZ_INSTALL_PATH}" ) -} - -unix:target.path = $${MUSRWIZ_INSTALL_PATH} -macx:target.path = /Applications -win32:target.path = c:/musrfit/bin - -INSTALLS += target - -CONFIG += qt \ - warn_on \ - release - -QT += widgets -QT += xml -QT += core -QT += svg - -# set proper permission for Mac OSX -macx { - QMAKE_INSTALL_FILE = install -m 6755 -p -o $$(USER) -g staff -} - -INCLUDEPATH += "../../include" - -HEADERS = musrWiz.h \ - PTheoTemplate.h \ - PMusrfitFunc.h \ - PInstrumentDef.h \ - PAdmin.h \ - PMusrWiz.h - -SOURCES = PTheoTemplate.cpp \ - PMusrfitFunc.cpp \ - PInstrumentDef.cpp \ - PAdmin.cpp \ - PMusrWiz.cpp \ - musrWiz.cpp - -RESOURCES = musrWiz.qrc - -macx:ICON = icons/musrWiz.icns diff --git a/src/musredit_qt5/musredit.pro b/src/musredit_qt5/musredit.pro deleted file mode 100644 index 4262cdafc..000000000 --- a/src/musredit_qt5/musredit.pro +++ /dev/null @@ -1,20 +0,0 @@ -TEMPLATE = subdirs - -TARGET = musredit - -SUBDIRS = \ - musrStep \ - musrWiz \ - musredit - -# where to find the sub-projects - give the folders -musrStep.subdir = musrStep -musrWiz.subdir = musrWiz -musredit.subdir = musredit - -# what sub-project depends on others -musredit.depends = musrStep musrWiz - -# build the project sequentially as listed in SUBDIRS ! -CONFIG += ordered - diff --git a/src/musredit_qt5/musredit/musredit.pro b/src/musredit_qt5/musredit/musredit.pro deleted file mode 100644 index 48d69e0c4..000000000 --- a/src/musredit_qt5/musredit/musredit.pro +++ /dev/null @@ -1,182 +0,0 @@ -TEMPLATE = app -TARGET = musredit - -packagesExist(Qt5WebEngine) { - message("Qt5WebEngine found") - DEFINES += HAVE_QT_WEB_ENGINE - HAVE_QT_WEB_ENGINE = 1 -} -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 - } -} -isEmpty(HAVE_QT_WEB_ENGINE) { - message("Neither Qt(5)WebKit nor Qt5WebEngine found. Something is wrong, please check") -} - -QMAKE_CXXFLAGS += -std=c++11 - -# install path for musredit -count( PREFIX, 1 ) { - MUSREDIT_INSTALL_PATH = $${PREFIX}/bin -} -isEmpty( MUSREDIT_INSTALL_PATH ) { - MUSR_FIT_PATH = $$(MUSRFITPATH) - count( MUSR_FIT_PATH, 1 ) { - MUSREDIT_INSTALL_PATH = $$(MUSRFITPATH) - } -} -isEmpty( MUSREDIT_INSTALL_PATH ) { - ROOT_SYS_PATH = $$(ROOTSYS) - count( ROOT_SYS_PATH, 1 ) { - MUSREDIT_INSTALL_PATH = $$(ROOTSYS)/bin - } -} -isEmpty( MUSREDIT_INSTALL_PATH ) { - MUSREDIT_INSTALL_PATH = /usr/local/bin -} - -unix { - message( "Determined installation path: $${MUSREDIT_INSTALL_PATH}" ) -} - -unix:target.path = $${MUSREDIT_INSTALL_PATH} -macx:target.path = /Applications -win32:target.path = c:/musrfit/bin - -INSTALLS += target - -# This is only needed for SL5.1 -exists ( /opt/fontconfig-2.8.0/lib/libfontconfig.so ) { - unix:LIBS += -L/opt/fontconfig-2.8.0/lib/ -lfontconfig -} - -exists( /usr/bin/cygwin1.dll ) { - QMAKE_CXXFLAGS += -D_WIN32GCC - QMAKE_LFLAGS_APP = -Wl,--enable-auto-import -} - -isEmpty( CC ) { - CC = gcc -} - -isEmpty( CXX ) { - CXX = g++ -} - -QMAKE_CC = $${CC} -QMAKE_CXX = $${CXX} -QMAKE_LINK = $${CXX} - -# set proper permission for Mac OSX -macx { - QMAKE_INSTALL_FILE = install -m 6755 -p -o $$(USER) -g staff -} - -# install path for the XML configuration file -unix:xml.path = $$(HOME)/.musrfit/musredit -macx:xml.path = $$(HOME)/.musrfit/musredit -win32:xml.path = c:/musrfit/bin - -CONFIG += qt \ - warn_on \ - release - -QT += widgets -QT += xml -isEqual(HAVE_QT_WEB_ENGINE, 0) { - QT += webkitwidgets -} -isEqual(HAVE_QT_WEB_ENGINE, 1) { - QT += webenginewidgets -} -QT += network -QT += printsupport -QT += svg - -INCLUDEPATH += "../" -INCLUDEPATH += "../../include" - -HEADERS = musredit.h \ - ../musrfit-info.h \ - PHelp.h \ - PTextEdit.h \ - PSubTextEdit.h \ - PAdmin.h \ - PFindDialog.h \ - PReplaceDialog.h \ - PReplaceConfirmationDialog.h \ - PFitOutputHandler.h \ - PDumpOutputHandler.h \ - PPrefsDialog.h \ - PGetMusrFTOptionsDialog.h \ - PGetTitleBlockDialog.h \ - PGetParameterBlockDialog.h \ - PGetTheoryBlockDialog.h \ - PGetFunctionsBlockDialog.h \ - PGetAsymmetryRunBlockDialog.h \ - PGetSingleHistoRunBlockDialog.h \ - PGetNonMusrRunBlockDialog.h \ - PGetFourierBlockDialog.h \ - PGetPlotBlockDialog.h \ - PMsr2DataDialog.h \ - PChangeDefaultPathsDialog.h \ - PMusrEditAbout.h \ - ../../include/git-revision.h - -SOURCES = PHelp.cpp \ - PTextEdit.cpp \ - PSubTextEdit.cpp \ - PAdmin.cpp \ - PFindDialog.cpp \ - PReplaceDialog.cpp \ - PReplaceConfirmationDialog.cpp \ - PFitOutputHandler.cpp \ - PDumpOutputHandler.cpp \ - PPrefsDialog.cpp \ - PGetMusrFTOptionsDialog.cpp \ - PGetTitleBlockDialog.cpp \ - PGetParameterBlockDialog.cpp \ - PGetTheoryBlockDialog.cpp \ - PGetFunctionsBlockDialog.cpp \ - PGetAsymmetryRunBlockDialog.cpp \ - PGetSingleHistoRunBlockDialog.cpp \ - PGetNonMusrRunBlockDialog.cpp \ - PGetFourierBlockDialog.cpp \ - PGetPlotBlockDialog.cpp \ - PMsr2DataDialog.cpp \ - PChangeDefaultPathsDialog.cpp \ - PMusrEditAbout.cpp \ - main.cpp - -FORMS = forms/PFindDialog.ui \ - forms/PReplaceDialog.ui \ - forms/PReplaceConfirmationDialog.ui \ - forms/PMusrEditAbout.ui \ - forms/PPrefsDialog.ui \ - forms/PGetMusrFTOptionsDialog.ui \ - forms/PGetTitleBlockDialog.ui \ - forms/PGetParameterBlockDialog.ui \ - forms/PGetTheoryBlockDialog.ui \ - forms/PGetFunctionsBlockDialog.ui \ - forms/PGetAsymmetryRunBlockDialog.ui \ - forms/PGetSingleHistoRunBlockDialog.ui \ - forms/PGetNonMusrRunBlockDialog.ui \ - forms/PGetFourierBlockDialog.ui \ - forms/PGetPlotBlockDialog.ui \ - forms/PMsr2DataDialog.ui \ - forms/PChangeDefaultPathsDialog.ui - -RESOURCES = musredit.qrc - -macx:ICON = icons/musredit.icns - diff --git a/src/musredit_qt6/musrStep/musrStep.pro b/src/musredit_qt6/musrStep/musrStep.pro deleted file mode 100644 index daedf7c53..000000000 --- a/src/musredit_qt6/musrStep/musrStep.pro +++ /dev/null @@ -1,75 +0,0 @@ -TEMPLATE = app -TARGET = musrStep - -# install path for musrStep via given prefix -count( PREFIX, 1 ) { - MUSRSTEP_INSTALL_PATH = $${PREFIX}/bin -} -isEmpty( MUSRSTEP_INSTALL_PATH ) { - MUSR_FIT_PATH = $$(MUSRFITPATH) - count( MUSR_FIT_PATH, 1) { - MUSRSTEP_INSTALL_PATH = $$(MUSRFITPATH) - } -} -isEmpty( MUSRSTEP_INSTALL_PATH ) { - ROOT_SYS_PATH = $$(ROOTSYS) - count( ROOT_SYS_PATH, 1) { - MUSRSTEP_INSTALL_PATH = $$(ROOTSYS)/bin - } -} -isEmpty( MUSRSTEP_INSTALL_PATH ) { - MUSRSTEP_INSTALL_PATH = /usr/local/bin -} - -exists( /usr/bin/cygwin1.dll ) { - QMAKE_CXXFLAGS += -D_WIN32GCC - QMAKE_LFLAGS_APP = -Wl,--enable-auto-import -} - -isEmpty( CC ) { - CC = gcc -} - -isEmpty( CXX ) { - CXX = g++ -} - -QMAKE_CC = $${CC} -QMAKE_CXX = $${CXX} -QMAKE_LINK = $${CXX} - -# set proper permission for Mac OSX -macx { - QMAKE_INSTALL_FILE = install -m 6755 -p -o $$(USER) -g staff -} - -# install path for the application -unix { - message( "Determined installation path: $${MUSRSTEP_INSTALL_PATH}" ) -} - -unix:target.path = $${MUSRSTEP_INSTALL_PATH} -macx:target.path = /Applications -win32:target.path = c:/musrfit/bin - -INSTALLS += target - -CONFIG += qt \ - warn_on \ - release \ - console - -QT += widgets -QT += svg - -INCLUDEPATH += "../../include" - -HEADERS = ../../include/git-revision.h \ - PMusrStep.h - -SOURCES = PMusrStep.cpp \ - musrStep.cpp - -RESOURCES = musrStep.qrc - -macx:ICON = icons/musrStep.icns diff --git a/src/musredit_qt6/musrWiz/musrWiz.pro b/src/musredit_qt6/musrWiz/musrWiz.pro deleted file mode 100644 index 8aa159832..000000000 --- a/src/musredit_qt6/musrWiz/musrWiz.pro +++ /dev/null @@ -1,66 +0,0 @@ -TEMPLATE = app -TARGET = musrWiz - -# install path for musrWiz -count( PREFIX, 1 ) { - MUSRWIZ_INSTALL_PATH = $${PREFIX}/bin -} -isEmpty( MUSRWIZ_INSTALL_PATH ) { - MUSR_FIT_PATH = $$(MUSRFITPATH) - count( MUSR_FIT_PATH, 1 ) { - MUSRWIZ_INSTALL_PATH = $$(MUSRFITPATH) - } -} -isEmpty( MUSRWIZ_INSTALL_PATH ) { - ROOT_SYS_PATH = $$(ROOTSYS) - count( ROOT_SYS_PATH, 1 ) { - MUSRWIZ_INSTALL_PATH = $$(ROOTSYS)/bin - } -} -isEmpty( MUSRWIZ_INSTALL_PATH ) { - MUSRWIZ_INSTALL_PATH = /usr/local/bin -} - -unix { - message( "Determined installation path: $${MUSRWIZ_INSTALL_PATH}" ) -} - -unix:target.path = $${MUSRWIZ_INSTALL_PATH} -macx:target.path = /Applications -win32:target.path = c:/musrfit/bin - -INSTALLS += target - -CONFIG += qt \ - warn_on \ - release - -QT += widgets -QT += xml -QT += core -QT += svg - -# set proper permission for Mac OSX -macx { - QMAKE_INSTALL_FILE = install -m 6755 -p -o $$(USER) -g staff -} - -INCLUDEPATH += "../../include" - -HEADERS = musrWiz.h \ - PTheoTemplate.h \ - PMusrfitFunc.h \ - PInstrumentDef.h \ - PAdmin.h \ - PMusrWiz.h - -SOURCES = PTheoTemplate.cpp \ - PMusrfitFunc.cpp \ - PInstrumentDef.cpp \ - PAdmin.cpp \ - PMusrWiz.cpp \ - musrWiz.cpp - -RESOURCES = musrWiz.qrc - -macx:ICON = icons/musrWiz.icns diff --git a/src/musredit_qt6/musredit/musredit.pro b/src/musredit_qt6/musredit/musredit.pro deleted file mode 100644 index 48d69e0c4..000000000 --- a/src/musredit_qt6/musredit/musredit.pro +++ /dev/null @@ -1,182 +0,0 @@ -TEMPLATE = app -TARGET = musredit - -packagesExist(Qt5WebEngine) { - message("Qt5WebEngine found") - DEFINES += HAVE_QT_WEB_ENGINE - HAVE_QT_WEB_ENGINE = 1 -} -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 - } -} -isEmpty(HAVE_QT_WEB_ENGINE) { - message("Neither Qt(5)WebKit nor Qt5WebEngine found. Something is wrong, please check") -} - -QMAKE_CXXFLAGS += -std=c++11 - -# install path for musredit -count( PREFIX, 1 ) { - MUSREDIT_INSTALL_PATH = $${PREFIX}/bin -} -isEmpty( MUSREDIT_INSTALL_PATH ) { - MUSR_FIT_PATH = $$(MUSRFITPATH) - count( MUSR_FIT_PATH, 1 ) { - MUSREDIT_INSTALL_PATH = $$(MUSRFITPATH) - } -} -isEmpty( MUSREDIT_INSTALL_PATH ) { - ROOT_SYS_PATH = $$(ROOTSYS) - count( ROOT_SYS_PATH, 1 ) { - MUSREDIT_INSTALL_PATH = $$(ROOTSYS)/bin - } -} -isEmpty( MUSREDIT_INSTALL_PATH ) { - MUSREDIT_INSTALL_PATH = /usr/local/bin -} - -unix { - message( "Determined installation path: $${MUSREDIT_INSTALL_PATH}" ) -} - -unix:target.path = $${MUSREDIT_INSTALL_PATH} -macx:target.path = /Applications -win32:target.path = c:/musrfit/bin - -INSTALLS += target - -# This is only needed for SL5.1 -exists ( /opt/fontconfig-2.8.0/lib/libfontconfig.so ) { - unix:LIBS += -L/opt/fontconfig-2.8.0/lib/ -lfontconfig -} - -exists( /usr/bin/cygwin1.dll ) { - QMAKE_CXXFLAGS += -D_WIN32GCC - QMAKE_LFLAGS_APP = -Wl,--enable-auto-import -} - -isEmpty( CC ) { - CC = gcc -} - -isEmpty( CXX ) { - CXX = g++ -} - -QMAKE_CC = $${CC} -QMAKE_CXX = $${CXX} -QMAKE_LINK = $${CXX} - -# set proper permission for Mac OSX -macx { - QMAKE_INSTALL_FILE = install -m 6755 -p -o $$(USER) -g staff -} - -# install path for the XML configuration file -unix:xml.path = $$(HOME)/.musrfit/musredit -macx:xml.path = $$(HOME)/.musrfit/musredit -win32:xml.path = c:/musrfit/bin - -CONFIG += qt \ - warn_on \ - release - -QT += widgets -QT += xml -isEqual(HAVE_QT_WEB_ENGINE, 0) { - QT += webkitwidgets -} -isEqual(HAVE_QT_WEB_ENGINE, 1) { - QT += webenginewidgets -} -QT += network -QT += printsupport -QT += svg - -INCLUDEPATH += "../" -INCLUDEPATH += "../../include" - -HEADERS = musredit.h \ - ../musrfit-info.h \ - PHelp.h \ - PTextEdit.h \ - PSubTextEdit.h \ - PAdmin.h \ - PFindDialog.h \ - PReplaceDialog.h \ - PReplaceConfirmationDialog.h \ - PFitOutputHandler.h \ - PDumpOutputHandler.h \ - PPrefsDialog.h \ - PGetMusrFTOptionsDialog.h \ - PGetTitleBlockDialog.h \ - PGetParameterBlockDialog.h \ - PGetTheoryBlockDialog.h \ - PGetFunctionsBlockDialog.h \ - PGetAsymmetryRunBlockDialog.h \ - PGetSingleHistoRunBlockDialog.h \ - PGetNonMusrRunBlockDialog.h \ - PGetFourierBlockDialog.h \ - PGetPlotBlockDialog.h \ - PMsr2DataDialog.h \ - PChangeDefaultPathsDialog.h \ - PMusrEditAbout.h \ - ../../include/git-revision.h - -SOURCES = PHelp.cpp \ - PTextEdit.cpp \ - PSubTextEdit.cpp \ - PAdmin.cpp \ - PFindDialog.cpp \ - PReplaceDialog.cpp \ - PReplaceConfirmationDialog.cpp \ - PFitOutputHandler.cpp \ - PDumpOutputHandler.cpp \ - PPrefsDialog.cpp \ - PGetMusrFTOptionsDialog.cpp \ - PGetTitleBlockDialog.cpp \ - PGetParameterBlockDialog.cpp \ - PGetTheoryBlockDialog.cpp \ - PGetFunctionsBlockDialog.cpp \ - PGetAsymmetryRunBlockDialog.cpp \ - PGetSingleHistoRunBlockDialog.cpp \ - PGetNonMusrRunBlockDialog.cpp \ - PGetFourierBlockDialog.cpp \ - PGetPlotBlockDialog.cpp \ - PMsr2DataDialog.cpp \ - PChangeDefaultPathsDialog.cpp \ - PMusrEditAbout.cpp \ - main.cpp - -FORMS = forms/PFindDialog.ui \ - forms/PReplaceDialog.ui \ - forms/PReplaceConfirmationDialog.ui \ - forms/PMusrEditAbout.ui \ - forms/PPrefsDialog.ui \ - forms/PGetMusrFTOptionsDialog.ui \ - forms/PGetTitleBlockDialog.ui \ - forms/PGetParameterBlockDialog.ui \ - forms/PGetTheoryBlockDialog.ui \ - forms/PGetFunctionsBlockDialog.ui \ - forms/PGetAsymmetryRunBlockDialog.ui \ - forms/PGetSingleHistoRunBlockDialog.ui \ - forms/PGetNonMusrRunBlockDialog.ui \ - forms/PGetFourierBlockDialog.ui \ - forms/PGetPlotBlockDialog.ui \ - forms/PMsr2DataDialog.ui \ - forms/PChangeDefaultPathsDialog.ui - -RESOURCES = musredit.qrc - -macx:ICON = icons/musredit.icns -