aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2012-10-23 09:23:55 +0200
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2012-10-23 09:50:27 +0200
commit63cacc4534eff5ee52fdf626b2c4e4ab60ad204f (patch)
treed53323c2cd15174b63a28609d6e34e6171f312ba
parent86e544ce4c01097cad4a69c7d6fab27357f69385 (diff)
QmlDesigner: Compile with Qt 5 after removal of old styles.
Change-Id: I869da5a9af76fce01f411e608f95ecbd7ddda71a Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index adcfcbfffa5..99c35b2c3fe 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -44,9 +44,12 @@
#include <QDebug>
#include <QApplication>
#include <QGraphicsOpacityEffect>
-#include <QCleanlooksStyle>
-#include <QPlastiqueStyle>
-
+#if QT_VERSION >= 0x050000
+# include <QFusionStyle>
+#else
+# include <QCleanlooksStyle>
+# include <QPlastiqueStyle>
+#endif
#include <QTextEdit>
@@ -61,11 +64,13 @@ class CleanLooksSingleton
private:
static CleanLooksSingleton *m_instance;
-#ifdef Q_OS_MAC
+#if QT_VERSION >= 0x050000
+ QFusionStyle m_style;
+#elif defined(Q_OS_MAC)
QPlastiqueStyle m_style;
#else
QCleanlooksStyle m_style;
-#endif //Q_OS_MAC
+#endif
CleanLooksSingleton() {}
CleanLooksSingleton( const CleanLooksSingleton& );