1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From: Joachim Schmitz <jojo@schmitz-digital.de>
Origin: https://gitweb.gentoo.org/repo/gentoo.git/tree/media-sound/musescore/files
Description: changes needed for MuseScore to build with Qt 5.12 (Alpha)
One needed for MSVC only (and only since Alpha, not with the previous
preview), the other needed for MSVC and MinGW.
Neither seems to cause issues with Qt 5.9 (like AppVeyor and Travis CI
prove)
Forwarded: not-needed
Justification: for 2.x only, which upstream no longer supports
--- a/mscore/editstringdata.cpp
+++ b/mscore/editstringdata.cpp
@@ -52,7 +52,7 @@ EditStringData::EditStringData(QWidget *
strg = (*_strings)[numOfStrings - i - 1];
_stringsLoc.append(strg);
QTableWidgetItem *newCheck = new QTableWidgetItem();
- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
+ newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
stringList->setItem(i, 0, newCheck);
QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
@@ -168,7 +168,7 @@ void EditStringData::newStringClicked()
_stringsLoc.insert(i, strg);
stringList->insertRow(i);
QTableWidgetItem *newCheck = new QTableWidgetItem();
- newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
+ newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
stringList->setItem(i, 0, newCheck);
QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
--- a/mscore/prefsdialog.ui
+++ b/mscore/prefsdialog.ui
@@ -4214,7 +4214,6 @@ Adjusting latency can help synchronize y
</item>
</layout>
</widget>
- <pixmapfunction>getPixmap</pixmapfunction>
<customwidgets>
<customwidget>
<class>Awl::ColorLabel</class>
|
