diff --git a/.gitignore b/.gitignore index 4eb469196..e30111b0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +build_log.txt +install_log.txt .*, *~ *.swp diff --git a/CMakeLists.txt b/CMakeLists.txt index b1bde3d57..8e946ae4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ endif (APPLE) # Disable components not supported on Linux/BSD if (NOT APPLE AND NOT MINGW AND NOT MSVC) set(NIX_NOT_AVAIL "Not available on Linux/BSD") - #option(BUILD_PORTMIDI "PortMidi disabled on Linux. (It uses ALSA but it's better to use ALSA directly)" OFF) + option(BUILD_PORTMIDI "PortMidi disabled on Linux. (It uses ALSA but it's better to use ALSA directly)" OFF) endif (NOT APPLE AND NOT MINGW AND NOT MSVC) option(AEOLUS "Enable pipe organ synthesizer" OFF) @@ -109,9 +109,9 @@ option(OMR "Enable PDF import" ON) # OMR - optical mu option(OCR "Enable OCR, requires OMR" OFF) # Requires tesseract 3.0, needs work on mac/win option(SOUNDFONT3 "Ogg Vorbis compressed fonts" ON) # Enable Ogg Vorbis compressed fonts, requires Ogg & Vorbis option(HAS_AUDIOFILE "Enable audio export" ON) # Requires libsndfile -option(USE_SYSTEM_QTSINGLEAPPLICATION "Use system QtSingleApplication" OFF) -option(USE_SYSTEM_FREETYPE "Use system FreeType" OFF) # requires freetype >= 2.5.2, does not work on win -option(BUILD_LAME "Enable MP3 export" ON) # Requires libmp3lame, call CMake with -DBUILD_LAME="OFF" to disable +option(USE_SYSTEM_QTSINGLEAPPLICATION "Use system QtSingleApplication" ON) +option(USE_SYSTEM_FREETYPE "Use system FreeType" ON) # requires freetype >= 2.5.2, does not work on win +option(BUILD_LAME "Enable MP3 export" ON) # Requires libmp3lame (non-free), call CMake with -DBUILD_LAME="OFF" to disable option(DOWNLOAD_SOUNDFONT "Download the latest soundfont version as part of the build process" ON) # licence incompatibility, must never be distributed @@ -121,8 +121,8 @@ SET(JACK_LONGNAME "JACK (Jack Audio Connection Kit)") SET(JACK_MIN_VERSION "0.98.0") option(BUILD_JACK "Build with support for ${JACK_LONGNAME} audio backend. JACK >= ${JACK_MIN_VERSION} will be needed." ON) option(BUILD_PULSEAUDIO "Build with support for PulseAudio audio backend." ON) -option(BUILD_ALSA "Build with support for ALSA audio backend." ON) -option(BUILD_PORTAUDIO "Build with support for PortAudio audio backend." ON) +option(BUILD_ALSA "Build with support for ALSA audio backend." OFF) +option(BUILD_PORTAUDIO "Build with support for PortAudio audio backend." OFF) option(BUILD_PORTMIDI "Build with support for PortAudio's MIDI features." ${BUILD_PORTAUDIO}) # PortAudio required option(BUILD_WEBENGINE "Built in webengine support" ON) option(BUILD_PCH "Build using precompiled headers." ON) diff --git a/Makefile b/Makefile index 88e717746..547c569c2 100644 --- a/Makefile +++ b/Makefile @@ -32,19 +32,20 @@ LABEL=""# E.g.: LABEL="Development Build" --> "MuseScore 2" becomes "MuseScore 2 BUILD_LAME="ON" # Non-free, required for MP3 support. Override with "OFF" to disable. BUILD_PULSEAUDIO="ON" # Override with "OFF" to disable. BUILD_JACK="ON" # Override with "OFF" to disable. -BUILD_PORTAUDIO="ON" # Override with "OFF" to disable. BUILD_WEBENGINE="ON" # Override with "OFF" to disable. -USE_SYSTEM_FREETYPE="OFF" # Override with "ON" to enable. Requires freetype >= 2.5.2. +BUILD_PORTAUDIO="OFF" # Override with "OFF" to disable. +USE_SYSTEM_FREETYPE="ON" # Override with "ON" to enable. Requires freetype >= 2.5.2. COVERAGE="OFF" # Override with "ON" to enable. DOWNLOAD_SOUNDFONT="ON" # Override with "OFF" to disable latest soundfont download. +USE_PATH_WITH_EXPLICIT_QT_VERSION=ON # The path to Qt libraries include /qt5/ UPDATE_CACHE="TRUE"# Override if building a DEB or RPM, or when installing to a non-standard location. -NO_RPATH="FALSE"# Package maintainers may want to override this (e.g. Debian) +NO_RPATH="TRUE"# Package maintainers may want to override this (e.g. Debian) # # change path to include your Qt5 installation # -BINPATH = ${PATH} +BINPATH = ${PATH}:$(shell qtpaths --binaries-dir) release: if test ! -d build.release; then mkdir build.release; fi; \ @@ -63,6 +64,7 @@ release: -DBUILD_WEBENGINE="${BUILD_WEBENGINE}" \ -DUSE_SYSTEM_FREETYPE="${USE_SYSTEM_FREETYPE}" \ -DDOWNLOAD_SOUNDFONT="${DOWNLOAD_SOUNDFONT}" \ + -DUSE_PATH_WITH_EXPLICIT_QT_VERSION="${USE_PATH_WITH_EXPLICIT_QT_VERSION}" \ -DCMAKE_SKIP_RPATH="${NO_RPATH}" ..; \ make lrelease; \ make -j ${CPUS}; \ @@ -92,7 +94,8 @@ debug: -DUSE_SYSTEM_FREETYPE="${USE_SYSTEM_FREETYPE}" \ -DCOVERAGE="${COVERAGE}" \ -DDOWNLOAD_SOUNDFONT="${DOWNLOAD_SOUNDFONT}" \ - -DCMAKE_SKIP_RPATH="${NO_RPATH}" ..; \ + -DUSE_PATH_WITH_EXPLICIT_QT_VERSION="${USE_PATH_WITH_EXPLICIT_QT_VERSION}" \ + -DCMAKE_SKIP_RPATH="${NO_RPATH}" ..; \ make lrelease; \ make -j ${CPUS}; \ diff --git a/mscore/file.cpp b/mscore/file.cpp index 220bd1354..f72ff8213 100644 --- a/mscore/file.cpp +++ b/mscore/file.cpp @@ -1380,7 +1380,6 @@ QString MuseScore::getPaletteFilename(bool open, const QString& name) restoreDialogState("loadPaletteDialog", loadPaletteDialog); loadPaletteDialog->setAcceptMode(QFileDialog::AcceptOpen); } - urls.append(QUrl::fromLocalFile(mscoreGlobalShare+"/styles")); dialog = loadPaletteDialog; } else { @@ -1542,7 +1541,6 @@ QString MuseScore::getDrumsetFilename(bool open) restoreDialogState("loadDrumsetDialog", loadDrumsetDialog); loadDrumsetDialog->setAcceptMode(QFileDialog::AcceptOpen); } - urls.append(QUrl::fromLocalFile(mscoreGlobalShare+"/styles")); dialog = loadDrumsetDialog; } else { diff --git a/mscore/revision.h b/mscore/revision.h index 09277a11d..c9d855a49 100644 --- a/mscore/revision.h +++ b/mscore/revision.h @@ -1 +1 @@ -3543170 +1f7a1f8