Commit 0ffe949e authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

QmlDesigner.propertyEditor: fix for Mac

The Cleanlooks style is broken on the Mac atm.

Task-number: QTCREATORBUG-4296
Reviewed-by: Kai Koehne
parent 1f797e68
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
#include <QApplication> #include <QApplication>
#include <QGraphicsOpacityEffect> #include <QGraphicsOpacityEffect>
#include <QCleanlooksStyle> #include <QCleanlooksStyle>
#include <QPlastiqueStyle>
#include <QTextEdit> #include <QTextEdit>
...@@ -57,11 +59,16 @@ class CleanLooksSingleton ...@@ -57,11 +59,16 @@ class CleanLooksSingleton
{ {
public: public:
static CleanLooksSingleton* instance(); static CleanLooksSingleton* instance();
QCleanlooksStyle* style() {return &m_style; }; QStyle* style() {return &m_style; };
private: private:
static CleanLooksSingleton *m_instance; static CleanLooksSingleton *m_instance;
#ifdef Q_OS_MAC
QPlastiqueStyle m_style;
#else
QCleanlooksStyle m_style; QCleanlooksStyle m_style;
#endif //Q_OS_MAC
CleanLooksSingleton() {} CleanLooksSingleton() {}
CleanLooksSingleton( const CleanLooksSingleton& ); CleanLooksSingleton( const CleanLooksSingleton& );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment