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

QmlDesigner: Compile with Qt 5 after removal of old styles.

Browse Source 
Change-Id: I869da5a9af76fce01f411e608f95ecbd7ddda71a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Friedemann Kleint
2012-10-23 09:23:55 +02:00
parent 86e544ce4c
commit 63cacc4534
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,9 +44,12 @@
#include <QDebug> #include <QDebug>
#include <QApplication> #include <QApplication>
#include <QGraphicsOpacityEffect> #include <QGraphicsOpacityEffect>
#include <QCleanlooksStyle> #if QT_VERSION >= 0x050000
#include <QPlastiqueStyle> # include <QFusionStyle>
#else
# include <QCleanlooksStyle>
# include <QPlastiqueStyle>
#endif
#include <QTextEdit> #include <QTextEdit>
@@ -61,11 +64,13 @@ class CleanLooksSingleton
private: private:
static CleanLooksSingleton *m_instance; static CleanLooksSingleton *m_instance;
#ifdef Q_OS_MAC #if QT_VERSION >= 0x050000
QFusionStyle m_style;
#elif defined(Q_OS_MAC)
QPlastiqueStyle m_style; QPlastiqueStyle m_style;
#else #else
QCleanlooksStyle m_style; QCleanlooksStyle m_style;
#endif //Q_OS_MAC #endif
CleanLooksSingleton() {} CleanLooksSingleton() {}
CleanLooksSingleton( const CleanLooksSingleton& ); CleanLooksSingleton( const CleanLooksSingleton& );