whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Cleanlooks as a dependency of QGtkStyle 

Since we no longer do the sanity checking against
gtk-qt-theme at startup, there
is no longer any need to inherit from cleanlooks.

Cleanlooks should no longer be needed as it has been
completely replaced by Gtk style and this dependency
is not required at this point.

Change-Id: I05b59278cd3ff915df49a7ad2d04494258db0d42
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
bb10
Jens Bache-Wiig 2012-10-01 17:41:34 +02:00 committed by The Qt Project
parent 98ad8460a8
commit 4dac6fc70a
5 changed files with 693 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/widgets/styles/qgtkpainter_p.h
View File

@ -56,7 +56,6 @@
#include <QtCore/qglobal.h>
#if !defined(QT_NO_STYLE_GTK)
#include <QtWidgets/QCleanlooksStyle>
#include <QtGui/QPainter>
#include <QtGui/QPalette>
#include <QtGui/QFont>

777
src/widgets/styles/qgtkstyle.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/widgets/styles/qgtkstyle.h
View File

@ -42,7 +42,7 @@
#ifndef QGTKSTYLE_H
#define QGTKSTYLE_H
#include <QtWidgets/QCleanlooksStyle>
#include <QtWidgets/QWindowsStyle>
#include <QtGui/QPalette>
#include <QtGui/QFont>
#include <QtWidgets/QFileDialog>
@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
class QPainterPath;
class QGtkStylePrivate;
class Q_WIDGETS_EXPORT QGtkStyle : public QCleanlooksStyle
class Q_WIDGETS_EXPORT QGtkStyle : public QWindowsStyle
{
Q_OBJECT
Q_DECLARE_PRIVATE(QGtkStyle)

2
src/widgets/styles/qgtkstyle_p.cpp
View File

@ -285,7 +285,7 @@ QList<QGtkStylePrivate *> QGtkStylePrivate::instances;
QGtkStylePrivate::WidgetMap *QGtkStylePrivate::widgetMap = 0;
QGtkStylePrivate::QGtkStylePrivate()
: QCleanlooksStylePrivate()
: QWindowsStylePrivate()
, filter(this)
{
instances.append(this);

4
src/widgets/styles/qgtkstyle_p.h
View File

@ -63,7 +63,7 @@
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QGtkStyle>
#include <private/qcleanlooksstyle_p.h>
#include <private/qwindowsstyle_p.h>
#undef signals // Collides with GTK symbols
#include <gtk/gtk.h>
@ -313,7 +313,7 @@ typedef char* (*Ptr_gnome_icon_lookup_sync) (
GnomeIconLookupFlags flags,
GnomeIconLookupResultFlags *result);
class QGtkStylePrivate : public QCleanlooksStylePrivate
class QGtkStylePrivate : public QWindowsStylePrivate
{
Q_DECLARE_PUBLIC(QGtkStyle)
public: