feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.propertyEditor: fix for Mac

Browse Source 
The Cleanlooks style is broken on the Mac atm.

Task-number: QTCREATORBUG-4296
Reviewed-by: Kai Koehne
This commit is contained in:
Thomas Hartmann
2011-04-07 16:36:51 +02:00
parent 1f797e684b
commit 0ffe949e2c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
View File

@@ -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
{ {
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& );