forked from pool/musescore
acd49989c7
* Bugfix release
For details see
https://github.com/musescore/MuseScore/releases/tag/v3.5.1
- Update use-qtmake-qt5.patch
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=79
25 lines
974 B
Diff
25 lines
974 B
Diff
diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake
|
|
--- a/build/FindQt5.cmake 2020-10-07 16:33:23.000000000 +0200
|
|
+++ b/build/FindQt5.cmake 2020-10-08 00:36:33.765299122 +0200
|
|
@@ -45,7 +45,7 @@
|
|
|
|
include_directories(${QT_INCLUDES})
|
|
|
|
-find_program(QT_QMAKE_EXECUTABLE qmake)
|
|
+find_program(QT_QMAKE_EXECUTABLE qmake-qt5)
|
|
set(_qmake_vars
|
|
QT_INSTALL_ARCHDATA
|
|
QT_INSTALL_BINS
|
|
diff -ur a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt 2020-10-07 16:33:23.000000000 +0200
|
|
+++ b/CMakeLists.txt 2020-10-08 00:35:59.616698386 +0200
|
|
@@ -25,7 +25,7 @@
|
|
include(build/functions.cmake) # library of CMake functions ("fn__" namespace)
|
|
|
|
# Print Qt version or fail the build if Qt (qmake) is not in PATH.
|
|
-fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake)
|
|
+fn__require_program(QMAKE Qt --version "https://musescore.org/en/handbook/developers-handbook/compilation" qmake-qt5)
|
|
|
|
set (CI $ENV{CI})
|
|
if (CI)
|