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

Remove dependencies on Plastique and Cleanlooks

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

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

See also 5d0f7d2304 in master.

Change-Id: I8a3762f9bc31c679067ebb0a6b5540bc18e8b836
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
This commit is contained in:
Thomas Hartmann
2012-10-23 10:43:01 +02:00
committed by Eike Ziller
parent 63cacc4534
commit e629a91fb3
2 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -188,6 +188,9 @@ MainWindow::MainWindow() :
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
if (baseName == QLatin1String("windows")) { if (baseName == QLatin1String("windows")) {
// Sometimes we get the standard windows 95 style as a fallback // Sometimes we get the standard windows 95 style as a fallback
if (QStyleFactory::keys().contains("Fusion"))
baseName = QLatin1String("fusion"); // Qt5
else { // Qt4
// e.g. if we are running on a KDE4 desktop // e.g. if we are running on a KDE4 desktop
QByteArray desktopEnvironment = qgetenv("DESKTOP_SESSION"); QByteArray desktopEnvironment = qgetenv("DESKTOP_SESSION");
if (desktopEnvironment == "kde") if (desktopEnvironment == "kde")
@@ -195,6 +198,7 @@ MainWindow::MainWindow() :
else else
baseName = QLatin1String("cleanlooks"); baseName = QLatin1String("cleanlooks");
} }
}
#endif #endif
qApp->setStyle(new ManhattanStyle(baseName)); qApp->setStyle(new ManhattanStyle(baseName));

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

@@ -44,53 +44,43 @@
#include <QDebug> #include <QDebug>
#include <QApplication> #include <QApplication>
#include <QGraphicsOpacityEffect> #include <QGraphicsOpacityEffect>
#if QT_VERSION >= 0x050000 #include <QWindowsStyle>
# include <QFusionStyle>
#else
# include <QCleanlooksStyle>
# include <QPlastiqueStyle>
#endif
#include <QTextEdit> #include <QTextEdit>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class CleanLooksSingleton class WindowsStyleSingleton
{ {
public: public:
static CleanLooksSingleton* instance(); static WindowsStyleSingleton* instance();
QStyle* style() {return &m_style; }; QStyle* style() {return &m_style; };
private: private:
static CleanLooksSingleton *m_instance; static WindowsStyleSingleton *m_instance;
#if QT_VERSION >= 0x050000 QWindowsStyle m_style;
QFusionStyle m_style;
#elif defined(Q_OS_MAC)
QPlastiqueStyle m_style;
#else
QCleanlooksStyle m_style;
#endif
CleanLooksSingleton() {} WindowsStyleSingleton() {}
CleanLooksSingleton( const CleanLooksSingleton& ); WindowsStyleSingleton( const WindowsStyleSingleton& );
class CleanLooksWatcher { class WindowsWatcher {
public: ~CleanLooksWatcher() { public: ~WindowsWatcher() {
if( CleanLooksSingleton::m_instance != 0 ) if ( WindowsStyleSingleton::m_instance != 0 )
delete CleanLooksSingleton::m_instance; 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 ) if( m_instance == 0 )
m_instance = new CleanLooksSingleton(); m_instance = new WindowsStyleSingleton();
return m_instance; return m_instance;
} }
@@ -175,7 +165,7 @@ public:
filter->setDuiTarget(this); filter->setDuiTarget(this);
m_mouseOver = false; m_mouseOver = false;
q->installEventFilter(filter); q->installEventFilter(filter);
q->setStyle(CleanLooksSingleton::instance()->style()); q->setStyle(WindowsStyleSingleton::instance()->style());
Q_ASSERT(q); Q_ASSERT(q);
} }
virtual ~QWidgetDeclarativeUI() { virtual ~QWidgetDeclarativeUI() {