From 0ffe949e2c24489efe733ae34ee06b0dd22a45ba Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 7 Apr 2011 16:36:51 +0200 Subject: [PATCH] QmlDesigner.propertyEditor: fix for Mac The Cleanlooks style is broken on the Mac atm. Task-number: QTCREATORBUG-4296 Reviewed-by: Kai Koehne --- .../components/propertyeditor/basicwidgets.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp index 1fbd624408c..927dbbf23b6 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp @@ -48,6 +48,8 @@ #include #include #include +#include + #include @@ -57,11 +59,16 @@ class CleanLooksSingleton { public: static CleanLooksSingleton* instance(); - QCleanlooksStyle* style() {return &m_style; }; + QStyle* style() {return &m_style; }; private: static CleanLooksSingleton *m_instance; + +#ifdef Q_OS_MAC + QPlastiqueStyle m_style; +#else QCleanlooksStyle m_style; +#endif //Q_OS_MAC CleanLooksSingleton() {} CleanLooksSingleton( const CleanLooksSingleton& );