Commit 3fd16aaa authored by Benno Eigenmann's avatar Benno Eigenmann

MainToolBar blank on Ubunto 15.04

parent b1b85485
...@@ -143,6 +143,10 @@ MainWindow::MainWindow(QSplashScreen* splashScreen) ...@@ -143,6 +143,10 @@ MainWindow::MainWindow(QSplashScreen* splashScreen)
connect(this, &MainWindow::initStatusChanged, splashScreen, &QSplashScreen::showMessage); connect(this, &MainWindow::initStatusChanged, splashScreen, &QSplashScreen::showMessage);
} }
// Qt 4/5 on Ubuntu does place the native menubar correctly so on Linux we revert back to in-window menu bar.
#ifdef Q_OS_LINUX
menuBar()->setNativeMenuBar(false);
#endif
// Setup user interface // Setup user interface
loadSettings(); loadSettings();
emit initStatusChanged(tr("Setting up user interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141)); emit initStatusChanged(tr("Setting up user interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
...@@ -160,13 +164,6 @@ MainWindow::MainWindow(QSplashScreen* splashScreen) ...@@ -160,13 +164,6 @@ MainWindow::MainWindow(QSplashScreen* splashScreen)
// Setup corners // Setup corners
setCorner(Qt::BottomRightCorner, Qt::BottomDockWidgetArea); setCorner(Qt::BottomRightCorner, Qt::BottomDockWidgetArea);
// Qt 4 on Ubuntu does place the native menubar correctly so on Linux we revert back to in-window menu bar.
// TODO: Check that this is still necessary on Qt5 on Ubuntu
#ifdef Q_OS_LINUX
menuBar()->setNativeMenuBar(false);
#endif
// On Mobile devices, we don't want any main menus at all. // On Mobile devices, we don't want any main menus at all.
#ifdef __mobile__ #ifdef __mobile__
menuBar()->setNativeMenuBar(false); menuBar()->setNativeMenuBar(false);
......
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