From 5f5204558eb141e257ca03d63805be302d4e5fd4 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 4 Nov 2014 11:17:42 +0200 Subject: [PATCH] Core: Remove Qt4 compatibility styles Change-Id: I56195042a49af05833c1ddcf40a91efb569b48b1 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/mainwindow.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index dbff065a40b..f5edf4f7056 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -161,20 +161,10 @@ MainWindow::MainWindow() : QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG)); QCoreApplication::setOrganizationName(QLatin1String(Constants::IDE_SETTINGSVARIANT_STR)); QString baseName = QApplication::style()->objectName(); - if (Utils::HostOsInfo::isAnyUnixHost() && !Utils::HostOsInfo::isMacHost()) { - if (baseName == QLatin1String("windows")) { - // Sometimes we get the standard windows 95 style as a fallback - if (QStyleFactory::keys().contains(QLatin1String("Fusion"))) { - baseName = QLatin1String("fusion"); // Qt5 - } else { // Qt4 - // e.g. if we are running on a KDE4 desktop - QByteArray desktopEnvironment = qgetenv("DESKTOP_SESSION"); - if (desktopEnvironment == "kde") - baseName = QLatin1String("plastique"); - else - baseName = QLatin1String("cleanlooks"); - } - } + // Sometimes we get the standard windows 95 style as a fallback + if (Utils::HostOsInfo::isAnyUnixHost() && !Utils::HostOsInfo::isMacHost() + && baseName == QLatin1String("windows")) { + baseName = QLatin1String("fusion"); } qApp->setStyle(new ManhattanStyle(baseName));