Commit 63cacc45 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

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



Change-Id: I869da5a9af76fce01f411e608f95ecbd7ddda71a
Reviewed-by: default avatarMorten Johan Sørvig <morten.sorvig@digia.com>
parent 86e544ce
...@@ -44,9 +44,12 @@ ...@@ -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 ...@@ -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& );
......
Supports Markdown
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