From 6b86542ae48b1e0449ffa94e496d85e28b365f3c Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Wed, 14 Jan 2009 17:04:23 +0100
Subject: [PATCH] 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.
---
src/plugins/coreplugin/mainwindow.cpp | 2 ++
.../projectexplorer/images/filtericon.png | Bin 194 -> 194 bytes
2 files changed, 2 insertions(+)
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index f4633fcd735..9dc93c0133d 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -186,6 +186,7 @@ MainWindow::MainWindow() :
QCoreApplication::setOrganizationName(QLatin1String("Nokia"));
QSettings::setDefaultFormat(QSettings::IniFormat);
QString baseName = qApp->style()->objectName();
+#ifdef Q_WS_X11
if (baseName == "windows") {
// Sometimes we get the standard windows 95 style as a fallback
// e.g. if we are running on a KDE4 desktop
@@ -195,6 +196,7 @@ MainWindow::MainWindow() :
else
baseName = "cleanlooks";
}
+#endif
qApp->setStyle(new ManhattanStyle(baseName));
statusBar()->setProperty("p_styled", true);
}
diff --git a/src/plugins/projectexplorer/images/filtericon.png b/src/plugins/projectexplorer/images/filtericon.png
index 7e46d2267581c60330a6b948a86d47ed8f9711a0..0915b5e5f6167dfb71799f637ac2ba67f3be7deb 100644
GIT binary patch
delta 33
ocmX@ac!+U=Ip=={AY8C_`Q(WXa$GkV*?ARs&hFryGBG0x0PiIYcK`qY
delta 33
ncmX@ac!+U=IVS@M{B+)3KhZ&s>jpOqzpl>ZrH`jh%!mR2s{;#I
--
GitLab