Merge stable-1.2 into master

2020-05-12 11:14:25 +02:00
parent 04239bafc3 317be01012
commit 187f7f58c7
12 changed files with 37 additions and 32 deletions
--- a/include/PianoRoll.h
+++ b/include/PianoRoll.h
@@ -283,6 +283,7 @@ private:

 	QList<int> m_markedSemiTones;
 	QMenu * m_semiToneMarkerMenu; // when you right click on the key area
+	int m_pianoKeySelected;

 	PianoRoll();
 	PianoRoll( const PianoRoll & );