haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-06 06:58:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

MuseScore: add application icon

Browse Source 
* disable Fusion style for Haiku
* disable ASLR for build
This commit is contained in:
Gerasim Troeglazov
2020-01-07 14:06:26 +10:00
parent a354293d69
commit f65e77f187
2 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
media-sound/musescore/patches/musescore-3.3.4.patchset
View File

@@ -1,4 +1,4 @@
From 98e0b44f5b2348bf808e1258480b30278745bf7f Mon Sep 17 00:00:00 2001
From 455108e41eba42ee6ce2efaf21bf3113eeeb4c74 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 17 Sep 2019 19:09:55 +0200
Subject: Import still relevant part of Haiku patches.
@@ -49,10 +49,10 @@ index 1b85ed9..6710878 100644
if (APPLE)
--
2.24.0
2.24.1
From facf2821a4cd181412237e357df253a216912fb8 Mon Sep 17 00:00:00 2001
From 2f60f112b794565e392ba2d05aacdcb9f4916271 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 31 Dec 2019 17:39:34 +0100
Subject: Specializes template routines.
@@ -124,10 +124,10 @@ index 913498c..ed6b892 100644
public:
virtual void visit(QString key, IntPreference*) = 0;
--
2.24.0
2.24.1
From 2ac0ba08a1211abaf53d8ac4abb1a0345b0d07e5 Mon Sep 17 00:00:00 2001
From 91dd54e1acd841387367a9795103b3de68ae1829 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 31 Dec 2019 17:42:04 +0100
Subject: fix warnings: replace QString::null, with QString()
@@ -257,5 +257,30 @@ index 41fdd40..d32b1b2 100644
}
--
2.24.0
2.24.1
From 87421462327190651ce298453cae9f425defaca4 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 7 Jan 2020 13:31:47 +1000
Subject: Don't set Fusion style for Haiku
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
index 4ded5a9..ef7e788 100644
--- a/mscore/musescore.cpp
+++ b/mscore/musescore.cpp
@@ -7181,8 +7181,9 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
void MuseScore::updateUiStyleAndTheme()
{
// set UI Theme
+#ifndef __HAIKU__
QApplication::setStyle(QStyleFactory::create("Fusion"));
-
+#endif
QString wd = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)).arg(QCoreApplication::applicationName());
// set UI Color Palette
QPalette p(QApplication::palette());
--
2.24.1