forked from qt-creator/qt-creator
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.
This commit is contained in:
@@ -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() :
|
|||||||
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);
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 194 B After Width: | Height: | Size: 194 B |
Reference in New Issue
Block a user