Commit 42b2382b authored by Matthieu Gallien's avatar Matthieu Gallien

Merge branch 'globalMenuOnLinuxOnly' into 'release/19.12'

use global menu only on linux due to behavior difference on Windows

See merge request !44
parents ba3b822e 0ad92f7d
......@@ -21,7 +21,6 @@ import QtQuick.Layouts 1.1
import QtQuick.Window 2.2
import org.kde.elisa 1.0
import Qt.labs.settings 1.0
import Qt.labs.platform 1.0 as NativeMenu
ApplicationWindow {
id: mainWindow
......@@ -79,11 +78,6 @@ ApplicationWindow {
id: applicationMenu
}
NativeMenu.MenuBar {
NativeApplicationMenu {
}
}
SystemPalette {
id: myPalette
colorGroup: SystemPalette.Active
......
......@@ -16,6 +16,7 @@
*/
import QtQuick 2.7
import Qt.labs.platform 1.0 as NativeMenu
import org.kde.elisa 1.0
Item {
......@@ -29,6 +30,11 @@ Item {
signal raisePlayer()
NativeMenu.MenuBar {
NativeApplicationMenu {
}
}
Mpris2 {
id: mpris2Interface
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment