Commit 6b86542a authored by Jens Bache-Wiig's avatar Jens Bache-Wiig
Browse files

Fixes: Dont override windowsstyle on windows

Task:     Reported on #qt
RevBy:    dt
Details:
This code was only intended for X11, hence we
ifdef it for now. Obviously windows users might
want to use windows style.
parent 3d3d01c4
...@@ -186,6 +186,7 @@ MainWindow::MainWindow() : ...@@ -186,6 +186,7 @@ MainWindow::MainWindow() :
QCoreApplication::setOrganizationName(QLatin1String("Nokia")); QCoreApplication::setOrganizationName(QLatin1String("Nokia"));
QSettings::setDefaultFormat(QSettings::IniFormat); QSettings::setDefaultFormat(QSettings::IniFormat);
QString baseName = qApp->style()->objectName(); QString baseName = qApp->style()->objectName();
#ifdef Q_WS_X11
if (baseName == "windows") { if (baseName == "windows") {
// Sometimes we get the standard windows 95 style as a fallback // Sometimes we get the standard windows 95 style as a fallback
// e.g. if we are running on a KDE4 desktop // e.g. if we are running on a KDE4 desktop
...@@ -195,6 +196,7 @@ MainWindow::MainWindow() : ...@@ -195,6 +196,7 @@ MainWindow::MainWindow() :
else else
baseName = "cleanlooks"; baseName = "cleanlooks";
} }
#endif
qApp->setStyle(new ManhattanStyle(baseName)); qApp->setStyle(new ManhattanStyle(baseName));
statusBar()->setProperty("p_styled", true); statusBar()->setProperty("p_styled", true);
} }
......
Supports Markdown
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