From fb72a54ad2d9c5f10177c2b484247e2c3683a4cb Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Fri, 30 Jul 2010 12:28:42 +0200
Subject: [PATCH] QML Observer: Don't use the custom style on mac
Makes it look ugly
---
src/tools/qml/qmlobserver/qmlruntime.cpp | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/tools/qml/qmlobserver/qmlruntime.cpp b/src/tools/qml/qmlobserver/qmlruntime.cpp
index 52cbcd9d030..af65ceeac7a 100644
--- a/src/tools/qml/qmlobserver/qmlruntime.cpp
+++ b/src/tools/qml/qmlobserver/qmlruntime.cpp
@@ -587,21 +587,23 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
canvas = new QmlViewer::QDeclarativeDesignView(this);
addToolBar(Qt::TopToolBarArea, canvas->toolbar());
-
- QFile file(":/toolbarstyle.css");
- file.open(QFile::ReadOnly);
- QString toolbarStylesheet = QLatin1String(file.readAll());
-
canvas->toolbar()->setFloatable(false);
canvas->toolbar()->setMovable(false);
- canvas->toolbar()->setStyleSheet(toolbarStylesheet);
m_centralWidget = new QWidget(this);
QVBoxLayout *layout = new QVBoxLayout(m_centralWidget);
layout->setMargin(0);
layout->setSpacing(0);
layout->addWidget(canvas->crumblePathWidget());
+
+#ifndef Q_WS_MAC
+ QFile file(":/toolbarstyle.css");
+ file.open(QFile::ReadOnly);
+ QString toolbarStylesheet = QLatin1String(file.readAll());
+ canvas->toolbar()->setStyleSheet(toolbarStylesheet);
canvas->crumblePathWidget()->setStyleSheet("QWidget { border-bottom: 1px solid black; }");
+#endif
+
layout->addWidget(canvas);
m_centralWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
--
GitLab