Commit e629a91f authored by Thomas Hartmann's avatar Thomas Hartmann Committed by Eike Ziller

Remove dependencies on Plastique and Cleanlooks

We want to move these styles out of the library so
we should not depend on them in creator.

This patch reverts 63cacc45,
since it does not rely on ifdefs.

See also 5d0f7d23 in master.

Change-Id: I8a3762f9bc31c679067ebb0a6b5540bc18e8b836
Reviewed-by: default avatarJens Bache-Wiig <jens.bache-wiig@digia.com>
parent 63cacc45
......@@ -188,12 +188,16 @@ MainWindow::MainWindow() :
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
if (baseName == QLatin1String("windows")) {
// Sometimes we get the standard windows 95 style as a fallback
// e.g. if we are running on a KDE4 desktop
QByteArray desktopEnvironment = qgetenv("DESKTOP_SESSION");
if (desktopEnvironment == "kde")
baseName = QLatin1String("plastique");
else
baseName = QLatin1String("cleanlooks");
if (QStyleFactory::keys().contains("Fusion"))
baseName = QLatin1String("fusion"); // Qt5
else { // Qt4
// e.g. if we are running on a KDE4 desktop
QByteArray desktopEnvironment = qgetenv("DESKTOP_SESSION");
if (desktopEnvironment == "kde")
baseName = QLatin1String("plastique");
else
baseName = QLatin1String("cleanlooks");
}
}
#endif
qApp->setStyle(new ManhattanStyle(baseName));
......
......@@ -44,53 +44,43 @@
#include <QDebug>
#include <QApplication>
#include <QGraphicsOpacityEffect>
#if QT_VERSION >= 0x050000
# include <QFusionStyle>
#else
# include <QCleanlooksStyle>
# include <QPlastiqueStyle>
#endif
#include <QWindowsStyle>
#include <QTextEdit>
QT_BEGIN_NAMESPACE
class CleanLooksSingleton
class WindowsStyleSingleton
{
public:
static CleanLooksSingleton* instance();
static WindowsStyleSingleton* instance();
QStyle* style() {return &m_style; };
private:
static CleanLooksSingleton *m_instance;
static WindowsStyleSingleton *m_instance;
#if QT_VERSION >= 0x050000
QFusionStyle m_style;
#elif defined(Q_OS_MAC)
QPlastiqueStyle m_style;
#else
QCleanlooksStyle m_style;
#endif
QWindowsStyle m_style;
CleanLooksSingleton() {}
CleanLooksSingleton( const CleanLooksSingleton& );
WindowsStyleSingleton() {}
WindowsStyleSingleton( const WindowsStyleSingleton& );
class CleanLooksWatcher {
public: ~CleanLooksWatcher() {
if( CleanLooksSingleton::m_instance != 0 )
delete CleanLooksSingleton::m_instance;
class WindowsWatcher {
public: ~WindowsWatcher() {
if ( WindowsStyleSingleton::m_instance != 0 )
delete WindowsStyleSingleton::m_instance;
}
};
friend class CleanLooksWatcher;
friend class WindowsWatcher;
};
CleanLooksSingleton* CleanLooksSingleton::m_instance = 0;
WindowsStyleSingleton* WindowsStyleSingleton::m_instance = 0;
CleanLooksSingleton* CleanLooksSingleton::instance()
WindowsStyleSingleton* WindowsStyleSingleton::instance()
{
static CleanLooksWatcher w;
static WindowsWatcher w;
if( m_instance == 0 )
m_instance = new CleanLooksSingleton();
m_instance = new WindowsStyleSingleton();
return m_instance;
}
......@@ -175,7 +165,7 @@ public:
filter->setDuiTarget(this);
m_mouseOver = false;
q->installEventFilter(filter);
q->setStyle(CleanLooksSingleton::instance()->style());
q->setStyle(WindowsStyleSingleton::instance()->style());
Q_ASSERT(q);
}
virtual ~QWidgetDeclarativeUI() {
......
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