Remove Cleanlooks and Plastique
We have a new style Fusion that will replace these styles. They will be moved to a separate module rather than included in platforms that do not need them. Change-Id: I51ebbcad5406e99130e5b12e62ba624d1489088c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
This commit is contained in:
parent
a0e5d6c1c0
commit
087e4bc517
2
configure
vendored
2
configure
vendored
@ -727,7 +727,7 @@ mkdir -p "$outpath/config.tests"
|
||||
rm -f "$outpath/config.tests/.qmake.cache"
|
||||
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
|
||||
|
||||
QMakeVar add styles "cde mac motif fusion plastique cleanlooks windows"
|
||||
QMakeVar add styles "mac fusion windows"
|
||||
|
||||
# QTDIR may be set and point to an old or system-wide Qt installation
|
||||
unset QTDIR
|
||||
|
4
dist/changes-5.0.0
vendored
4
dist/changes-5.0.0
vendored
@ -526,6 +526,10 @@ QtGui
|
||||
|
||||
QtWidgets
|
||||
---------
|
||||
* A new style QFusionStyle has been introduced, while QPlastiqueStyle, QCleanlooksStyle,
|
||||
QCDEStyle and QMotifStyle have been removed. The older styles will be
|
||||
made available to applications as a standalone source package.
|
||||
|
||||
* QInputContext removed as well as related getters and setters on QWidget and QApplication.
|
||||
Input contexts are now platform specific.
|
||||
|
||||
|
@ -376,17 +376,8 @@
|
||||
#endif
|
||||
|
||||
/* Styles */
|
||||
#ifndef QT_NO_STYLE_MOTIF
|
||||
# define QT_NO_STYLE_MOTIF
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_CDE
|
||||
# define QT_NO_STYLE_CDE
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
# define QT_NO_STYLE_CLEANLOOKS
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_PLASTIQUE
|
||||
# define QT_NO_STYLE_PLASTIQUE
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
# define QT_NO_STYLE_FUSION
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_STYLESHEET
|
||||
# define QT_NO_STYLE_STYLESHEET
|
||||
|
@ -209,23 +209,14 @@
|
||||
#endif
|
||||
|
||||
/* Styles */
|
||||
#ifndef QT_NO_STYLE_MOTIF
|
||||
# define QT_NO_STYLE_MOTIF
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_CDE
|
||||
# define QT_NO_STYLE_CDE
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
# define QT_NO_STYLE_CLEANLOOKS
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_PLASTIQUE
|
||||
# define QT_NO_STYLE_PLASTIQUE
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
# define QT_NO_STYLE_FUSION
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_STYLESHEET
|
||||
# define QT_NO_STYLE_STYLESHEET
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_WINDOWSXP
|
||||
# define QT_NO_STYLE_WINDOWSXP
|
||||
#ifndef QT_NO_STYLE_WINDOWSVISTA
|
||||
# define QT_NO_STYLE_WINDOWSVISTA
|
||||
#endif
|
||||
|
||||
/* Utilities */
|
||||
|
@ -396,16 +396,6 @@
|
||||
#define QT_NO_SCROLLAREA
|
||||
#endif
|
||||
|
||||
// QCleanLooksStyle
|
||||
#if !defined(QT_NO_STYLE_CLEANLOOKS) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_IMAGEFORMAT_XPM))
|
||||
#define QT_NO_STYLE_CLEANLOOKS
|
||||
#endif
|
||||
|
||||
// QPlastiqueStyle
|
||||
#if !defined(QT_NO_STYLE_PLASTIQUE) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_IMAGEFORMAT_XPM))
|
||||
#define QT_NO_STYLE_PLASTIQUE
|
||||
#endif
|
||||
|
||||
// QWindowsCEStyle
|
||||
#if !defined(QT_NO_STYLE_WINDOWSCE) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_IMAGEFORMAT_XPM))
|
||||
#define QT_NO_STYLE_WINDOWSCE
|
||||
|
@ -727,11 +727,11 @@ Requires:
|
||||
Name: QWindowsStyle
|
||||
SeeAlso: ???
|
||||
|
||||
Feature: STYLE_PLASTIQUE
|
||||
Description: Supports a widget style similar to the Plastik style available in KDE.
|
||||
Feature: STYLE_FUSION
|
||||
Description: Supports a modern platform independent widget style.
|
||||
Section: Styles
|
||||
Requires: STYLE_WINDOWS IMAGEFORMAT_XPM
|
||||
Name: QPlastiqueStyle
|
||||
Name: QFusionStyle
|
||||
SeeAlso: ???
|
||||
|
||||
Feature: STYLE_WINDOWSXP
|
||||
@ -748,13 +748,6 @@ Requires: STYLE_WINDOWSXP
|
||||
Name: QWindowsVistaStyle
|
||||
SeeAlso: ???
|
||||
|
||||
Feature: STYLE_CLEANLOOKS
|
||||
Description: Supports a Gnome CleanLooks-like look and feel.
|
||||
Section: Styles
|
||||
Requires: STYLE_WINDOWS IMAGEFORMAT_XPM
|
||||
Name: QCleanLooksStyle
|
||||
SeeAlso: ???
|
||||
|
||||
Feature: STYLE_WINDOWSCE
|
||||
Description: WindowsCE look and feel
|
||||
Section: Styles
|
||||
|
@ -130,7 +130,7 @@ QVariant QGenericUnixTheme::themeHint(ThemeHint hint) const
|
||||
return QVariant(true);
|
||||
case QPlatformTheme::StyleNames: {
|
||||
QStringList styleNames;
|
||||
styleNames << QStringLiteral("Plastique") << QStringLiteral("Windows");
|
||||
styleNames << QStringLiteral("Fusion") << QStringLiteral("Windows");
|
||||
return QVariant(styleNames);
|
||||
}
|
||||
case QPlatformTheme::KeyboardScheme:
|
||||
@ -225,7 +225,7 @@ void QKdeTheme::refresh()
|
||||
m_toolButtonStyle = Qt::ToolButtonTextBesideIcon;
|
||||
m_toolBarIconSize = 0;
|
||||
m_styleNames.clear();
|
||||
m_styleNames << QStringLiteral("Oxygen") << QStringLiteral("plastique") << QStringLiteral("windows");
|
||||
m_styleNames << QStringLiteral("Oxygen") << QStringLiteral("fusion") << QStringLiteral("windows");
|
||||
m_iconFallbackThemeName = m_iconThemeName = QStringLiteral("oxygen");
|
||||
|
||||
// Read settings file.
|
||||
|
@ -834,11 +834,9 @@ QT_CLASS_LIB(QTransform, QtGui, qtransform.h)
|
||||
QT_CLASS_LIB(QWMatrix, QtGui, qwmatrix.h)
|
||||
QT_CLASS_LIB(QKeyEventTransition, QtWidgets, qkeyeventtransition.h)
|
||||
QT_CLASS_LIB(QMouseEventTransition, QtWidgets, qmouseeventtransition.h)
|
||||
QT_CLASS_LIB(QCleanlooksStyle, QtWidgets, qcleanlooksstyle.h)
|
||||
QT_CLASS_LIB(QCommonStyle, QtWidgets, qcommonstyle.h)
|
||||
QT_CLASS_LIB(QGtkStyle, QtWidgets, qgtkstyle.h)
|
||||
QT_CLASS_LIB(QMacStyle, QtWidgets, qmacstyle_mac.h)
|
||||
QT_CLASS_LIB(QPlastiqueStyle, QtWidgets, qplastiquestyle.h)
|
||||
QT_CLASS_LIB(QProxyStyle, QtWidgets, qproxystyle.h)
|
||||
QT_CLASS_LIB(QStyle, QtWidgets, qstyle.h)
|
||||
QT_CLASS_LIB(QStyleFactory, QtWidgets, qstylefactory.h)
|
||||
|
@ -1212,7 +1212,7 @@ void QApplication::setStyle(QStyle *style)
|
||||
Requests a QStyle object for \a style from the QStyleFactory.
|
||||
|
||||
The string must be one of the QStyleFactory::keys(), typically one of
|
||||
"windows", "cleanlooks", "plastique", "windowsxp", or "macintosh". Style
|
||||
"windows", "fusion", "windowsxp", or "macintosh". Style
|
||||
names are case insensitive.
|
||||
|
||||
Returns 0 if an unknown \a style is passed, otherwise the QStyle object
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,111 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the QtGui module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QCLEANLOOKSSTYLE_H
|
||||
#define QCLEANLOOKSSTYLE_H
|
||||
|
||||
#include <QtWidgets/qwindowsstyle.h>
|
||||
|
||||
QT_BEGIN_HEADER
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
#if !defined(QT_NO_STYLE_CLEANLOOKS)
|
||||
|
||||
class QCleanlooksStylePrivate;
|
||||
class Q_WIDGETS_EXPORT QCleanlooksStyle : public QWindowsStyle
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_DECLARE_PRIVATE(QCleanlooksStyle)
|
||||
|
||||
public:
|
||||
QCleanlooksStyle();
|
||||
~QCleanlooksStyle();
|
||||
|
||||
QPalette standardPalette () const;
|
||||
void drawPrimitive(PrimitiveElement elem,
|
||||
const QStyleOption *option,
|
||||
QPainter *painter, const QWidget *widget = 0) const;
|
||||
void drawControl(ControlElement ce, const QStyleOption *option, QPainter *painter,
|
||||
const QWidget *widget) const;
|
||||
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
|
||||
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
|
||||
QPainter *painter, const QWidget *widget) const;
|
||||
QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const;
|
||||
QSize sizeFromContents(ContentsType type, const QStyleOption *option,
|
||||
const QSize &size, const QWidget *widget) const;
|
||||
SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt,
|
||||
const QPoint &pt, const QWidget *w = 0) const;
|
||||
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
|
||||
SubControl sc, const QWidget *widget) const;
|
||||
QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
|
||||
const QStyleOption *opt) const;
|
||||
int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0,
|
||||
QStyleHintReturn *returnData = 0) const;
|
||||
QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const;
|
||||
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
|
||||
const QWidget *widget = 0) const;
|
||||
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
|
||||
const QWidget *widget = 0) const;
|
||||
void drawItemPixmap(QPainter *painter, const QRect &rect,
|
||||
int alignment, const QPixmap &pixmap) const;
|
||||
void drawItemText(QPainter *painter, const QRect &rect,
|
||||
int flags, const QPalette &pal, bool enabled,
|
||||
const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const;
|
||||
void polish(QWidget *widget);
|
||||
void polish(QApplication *app);
|
||||
void polish(QPalette &pal);
|
||||
void unpolish(QWidget *widget);
|
||||
void unpolish(QApplication *app);
|
||||
|
||||
protected:
|
||||
QCleanlooksStyle(QCleanlooksStylePrivate &dd);
|
||||
|
||||
};
|
||||
|
||||
#endif // QT_NO_STYLE_CLEANLOOKS
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
QT_END_HEADER
|
||||
|
||||
#endif // QCLEANLOOKSSTYLE_H
|
@ -1,79 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the QtGui module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QCLEANLOOKSSTYLE_P_H
|
||||
#define QCLEANLOOKSSTYLE_P_H
|
||||
|
||||
//
|
||||
// W A R N I N G
|
||||
// -------------
|
||||
//
|
||||
// This file is not part of the Qt API. It exists for the convenience
|
||||
// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header
|
||||
// file may change from version to version without notice, or even be removed.
|
||||
//
|
||||
// We mean it.
|
||||
//
|
||||
|
||||
#include "qwindowsstyle.h"
|
||||
#include "qwindowsstyle_p.h"
|
||||
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QCleanlooksStylePrivate : public QWindowsStylePrivate
|
||||
{
|
||||
Q_DECLARE_PUBLIC(QCleanlooksStyle)
|
||||
public:
|
||||
QCleanlooksStylePrivate()
|
||||
: QWindowsStylePrivate() {
|
||||
}
|
||||
|
||||
~QCleanlooksStylePrivate() {
|
||||
}
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QT_NO_STYLE_CLEANLOOKS
|
||||
|
||||
#endif //QCLEANLOOKSSTYLE_P_H
|
@ -350,7 +350,7 @@ QFusionStylePrivate::QFusionStylePrivate()
|
||||
The Fusion style provides a custom look and feel that is not
|
||||
tied to a particular platform.
|
||||
//{Fusion Style Widget Gallery}
|
||||
\sa QWindowsXPStyle, QMacStyle, QCommonStyle, QPlastiqueStyle
|
||||
\sa QWindowsStyle, QWindowsVistaStyle, QMacStyle, QCommonStyle
|
||||
*/
|
||||
|
||||
/*!
|
||||
@ -3024,7 +3024,7 @@ QSize QFusionStyle::sizeFromContents(ContentsType type, const QStyleOption *opti
|
||||
newSize += QSize(2, 2);
|
||||
break;
|
||||
case CT_SpinBox:
|
||||
newSize += QSize(0, -2);
|
||||
newSize += QSize(0, -3);
|
||||
break;
|
||||
case CT_ComboBox:
|
||||
newSize += QSize(2, 4);
|
||||
@ -3478,7 +3478,7 @@ int QFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, const QW
|
||||
return 0;
|
||||
|
||||
case SH_Table_GridLineColor:
|
||||
return option->palette.background().color().darker(120).rgb();
|
||||
return option ? option->palette.background().color().darker(120).rgb() : 0;
|
||||
|
||||
case SH_MessageBox_TextInteractionFlags:
|
||||
return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse;
|
||||
|
@ -277,8 +277,7 @@ static GdkColor fromQColor(const QColor &color)
|
||||
Note: The style requires GTK+ version 2.10 or later.
|
||||
The Qt3-based "Qt" GTK+ theme engine will not work with QGtkStyle.
|
||||
|
||||
\sa {Cleanlooks Style Widget Gallery}, QWindowsXPStyle, QMacStyle, QWindowsStyle,
|
||||
QPlastiqueStyle, QCleanlooksStyle
|
||||
\sa QWindowsXPStyle, QMacStyle, QWindowsStyle, QFusionStyle
|
||||
*/
|
||||
|
||||
/*!
|
||||
|
@ -81,7 +81,7 @@
|
||||
documentation.
|
||||
|
||||
\image qmacstyle.png
|
||||
\sa QWindowsXPStyle, QWindowsStyle, QPlastiqueStyle
|
||||
\sa QWindowsXPStyle, QWindowsStyle, QFusionStyle
|
||||
*/
|
||||
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,116 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the QtGui module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QPLASTIQUESTYLE_H
|
||||
#define QPLASTIQUESTYLE_H
|
||||
|
||||
#include <QtWidgets/qwindowsstyle.h>
|
||||
|
||||
QT_BEGIN_HEADER
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
#if !defined(QT_NO_STYLE_PLASTIQUE)
|
||||
|
||||
class QPlastiqueStylePrivate;
|
||||
class Q_WIDGETS_EXPORT QPlastiqueStyle : public QWindowsStyle
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_DECLARE_PRIVATE(QPlastiqueStyle)
|
||||
public:
|
||||
QPlastiqueStyle();
|
||||
~QPlastiqueStyle();
|
||||
|
||||
void drawPrimitive(PrimitiveElement element, const QStyleOption *option,
|
||||
QPainter *painter, const QWidget *widget = 0) const;
|
||||
void drawControl(ControlElement element, const QStyleOption *option,
|
||||
QPainter *painter, const QWidget *widget) const;
|
||||
void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
|
||||
QPainter *painter, const QWidget *widget) const;
|
||||
QSize sizeFromContents(ContentsType type, const QStyleOption *option,
|
||||
const QSize &size, const QWidget *widget) const;
|
||||
|
||||
QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const;
|
||||
QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
|
||||
SubControl sc, const QWidget *widget) const;
|
||||
|
||||
int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0,
|
||||
QStyleHintReturn *returnData = 0) const;
|
||||
SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option,
|
||||
const QPoint &pos, const QWidget *widget = 0) const;
|
||||
|
||||
int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
|
||||
|
||||
QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
|
||||
const QWidget *widget = 0) const;
|
||||
|
||||
void polish(QWidget *widget);
|
||||
void polish(QApplication *app);
|
||||
void polish(QPalette &pal);
|
||||
void unpolish(QWidget *widget);
|
||||
void unpolish(QApplication *app);
|
||||
|
||||
QPalette standardPalette() const;
|
||||
|
||||
QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0,
|
||||
const QWidget *widget = 0) const;
|
||||
int layoutSpacing(QSizePolicy::ControlType control1,
|
||||
QSizePolicy::ControlType control2,
|
||||
Qt::Orientation orientation,
|
||||
const QStyleOption *option = 0,
|
||||
const QWidget *widget = 0) const;
|
||||
|
||||
protected:
|
||||
bool eventFilter(QObject *watched, QEvent *event);
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(QPlastiqueStyle)
|
||||
void *reserved;
|
||||
};
|
||||
|
||||
#endif // QT_NO_STYLE_PLASTIQUE
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
QT_END_HEADER
|
||||
|
||||
#endif // QPLASTIQUESTYLE_H
|
@ -46,12 +46,6 @@
|
||||
|
||||
#include "qapplication.h"
|
||||
#include "qwindowsstyle.h"
|
||||
#ifndef QT_NO_STYLE_PLASTIQUE
|
||||
#include "qplastiquestyle.h"
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
#include "qcleanlooksstyle.h"
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
#include "qfusionstyle.h"
|
||||
#endif
|
||||
@ -96,9 +90,9 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
|
||||
plugin (see QStylePlugin).
|
||||
|
||||
The valid keys can be retrieved using the keys()
|
||||
function. Typically they include "windows",
|
||||
"plastique" and "cleanlooks". Depending on the platform,
|
||||
"windowsxp", "windowsvista" and "macintosh" may be available.
|
||||
function. Typically they include "windows" and "fusion".
|
||||
Depending on the platform, "windowsxp", "windowsvista", "gtk"
|
||||
and "macintosh" may be available.
|
||||
Note that keys are case insensitive.
|
||||
|
||||
\sa QStyle
|
||||
@ -144,21 +138,11 @@ QStyle *QStyleFactory::create(const QString& key)
|
||||
ret = new QWindowsVistaStyle;
|
||||
else
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_PLASTIQUE
|
||||
if (style == QLatin1String("plastique"))
|
||||
ret = new QPlastiqueStyle;
|
||||
else
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
if (style == QLatin1String("fusion"))
|
||||
ret = new QFusionStyle;
|
||||
else
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
if (style == QLatin1String("cleanlooks"))
|
||||
ret = new QCleanlooksStyle;
|
||||
else
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_GTK
|
||||
if (style == QLatin1String("gtk") || style == QLatin1String("gtk+"))
|
||||
ret = new QGtkStyle;
|
||||
@ -222,10 +206,6 @@ QStringList QStyleFactory::keys()
|
||||
(QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)))
|
||||
list << QLatin1String("WindowsVista");
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_PLASTIQUE
|
||||
if (!list.contains(QLatin1String("Plastique")))
|
||||
list << QLatin1String("Plastique");
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_GTK
|
||||
if (!list.contains(QLatin1String("GTK+")))
|
||||
list << QLatin1String("GTK+");
|
||||
@ -234,10 +214,6 @@ QStringList QStyleFactory::keys()
|
||||
if (!list.contains(QLatin1String("Fusion")))
|
||||
list << QLatin1String("Fusion");
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
if (!list.contains(QLatin1String("Cleanlooks")))
|
||||
list << QLatin1String("Cleanlooks");
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_MAC
|
||||
QString mstyle = QLatin1String("Macintosh");
|
||||
# ifdef Q_WS_MAC
|
||||
|
@ -54,7 +54,7 @@
|
||||
#include <qlineedit.h>
|
||||
#include <qwindowsstyle.h>
|
||||
#include <qcombobox.h>
|
||||
#include <qplastiquestyle.h>
|
||||
#include <qwindowsstyle.h>
|
||||
#include "private/qcssparser_p.h"
|
||||
#include "private/qmath_p.h"
|
||||
#include <qabstractscrollarea.h>
|
||||
|
@ -335,11 +335,12 @@ StyleSheet QStyleSheetStyle::getDefaultStyleSheet() const
|
||||
}
|
||||
|
||||
/*QComboBox[style="QPlastiqueStyle"][readOnly="true"],
|
||||
QComboBox[style="QFusionStyle"][readOnly="true"],
|
||||
QComboBox[style="QCleanlooksStyle"][readOnly="true"]
|
||||
{
|
||||
-qt-background-role: button;
|
||||
}*/
|
||||
if (baseStyle()->inherits("QPlastiqueStyle") || baseStyle()->inherits("QCleanlooksStyle"))
|
||||
if (baseStyle()->inherits("QPlastiqueStyle") || baseStyle()->inherits("QCleanlooksStyle") || baseStyle()->inherits("QFusionStyle"))
|
||||
{
|
||||
SET_ELEMENT_NAME(QLatin1String("QComboBox"));
|
||||
ADD_ATTRIBUTE_SELECTOR(QLatin1String("readOnly"), QLatin1String("true"), AttributeSelector::MatchEqual);
|
||||
|
@ -204,7 +204,7 @@ bool QWindowsStyle::eventFilter(QObject *o, QEvent *e)
|
||||
This style is Qt's default GUI style on Windows.
|
||||
|
||||
\image qwindowsstyle.png
|
||||
\sa QWindowsXPStyle, QMacStyle, QPlastiqueStyle
|
||||
\sa QWindowsVistaStyle, QMacStyle, QFusionStyle
|
||||
*/
|
||||
|
||||
/*!
|
||||
|
@ -154,7 +154,7 @@ bool QWindowsVistaStylePrivate::useVista()
|
||||
\warning This style is only available on the Windows Vista platform
|
||||
because it makes use of Windows Vista's style engine.
|
||||
|
||||
\sa QMacStyle, QWindowsXPStyle, QPlastiqueStyle, QCleanlooksStyle
|
||||
\sa QMacStyle, QWindowsXPStyle, QFusionStyle
|
||||
*/
|
||||
|
||||
/*!
|
||||
|
@ -1170,7 +1170,7 @@ void QWindowsXPStylePrivate::drawBackgroundThruNativeBuffer(XPThemeData &themeDa
|
||||
sizeFromContents(), are documented here.
|
||||
|
||||
\image qwindowsxpstyle.png
|
||||
\sa QMacStyle, QWindowsStyle, QPlastiqueStyle
|
||||
\sa QMacStyle, QWindowsStyle, QFusionStyle
|
||||
*/
|
||||
|
||||
/*!
|
||||
|
@ -37,7 +37,7 @@ wince* {
|
||||
}
|
||||
|
||||
contains( styles, all ) {
|
||||
styles = mac windows windowsxp windowsvista
|
||||
styles = fusion mac windows windowsxp windowsvista
|
||||
}
|
||||
|
||||
!macx-*|ios:styles -= mac
|
||||
@ -65,6 +65,14 @@ contains( styles, mac ) {
|
||||
DEFINES += QT_NO_STYLE_MAC
|
||||
}
|
||||
|
||||
contains( styles, windows ) {
|
||||
HEADERS += styles/qwindowsstyle.h
|
||||
SOURCES += styles/qwindowsstyle.cpp
|
||||
DEFINES += QT_STYLE_WINDOWS
|
||||
} else {
|
||||
DEFINES += QT_NO_STYLE_WINDOWS
|
||||
}
|
||||
|
||||
contains( styles, windowsvista ) {
|
||||
HEADERS += styles/qwindowsvistastyle.h
|
||||
HEADERS += styles/qwindowsvistastyle_p.h
|
||||
@ -72,7 +80,7 @@ contains( styles, windowsvista ) {
|
||||
!contains( styles, windowsxp ) {
|
||||
message( windowsvista requires windowsxp )
|
||||
styles += windowsxp
|
||||
DEFINES+= QT_STYLE_WINDOWSXP
|
||||
DEFINES += QT_STYLE_WINDOWSXP
|
||||
}
|
||||
} else {
|
||||
DEFINES += QT_NO_STYLE_WINDOWSVISTA
|
||||
@ -83,25 +91,13 @@ contains( styles, windowsxp ) {
|
||||
SOURCES += styles/qwindowsxpstyle.cpp
|
||||
!contains( styles, windows ) {
|
||||
message( windowsxp requires windows )
|
||||
styles += windows
|
||||
DEFINES+= QT_STYLE_WINDOWS
|
||||
styles += windows
|
||||
DEFINES += QT_STYLE_WINDOWS
|
||||
}
|
||||
} else {
|
||||
DEFINES += QT_NO_STYLE_WINDOWSXP
|
||||
}
|
||||
|
||||
contains( styles, plastique ) {
|
||||
HEADERS += styles/qplastiquestyle.h
|
||||
SOURCES += styles/qplastiquestyle.cpp
|
||||
!contains( styles, windows ) {
|
||||
message( plastique requires windows )
|
||||
styles += windows
|
||||
DEFINES+= QT_STYLE_WINDOWS
|
||||
}
|
||||
} else {
|
||||
DEFINES += QT_NO_STYLE_PLASTIQUE
|
||||
}
|
||||
|
||||
contains( styles, gtk ) {
|
||||
HEADERS += styles/qgtkstyle.h
|
||||
HEADERS += styles/qgtkpainter_p.h
|
||||
@ -109,45 +105,17 @@ contains( styles, gtk ) {
|
||||
SOURCES += styles/qgtkstyle.cpp
|
||||
SOURCES += styles/qgtkpainter.cpp
|
||||
SOURCES += styles/qgtkstyle_p.cpp
|
||||
!contains( styles, cleanlooks ) {
|
||||
styles += cleanlooks
|
||||
DEFINES+= QT_STYLE_CLEANLOOKS
|
||||
}
|
||||
} else {
|
||||
DEFINES += QT_NO_STYLE_GTK
|
||||
}
|
||||
|
||||
contains( styles, cleanlooks ) {
|
||||
HEADERS += styles/qcleanlooksstyle.h
|
||||
HEADERS += styles/qcleanlooksstyle_p.h
|
||||
SOURCES += styles/qcleanlooksstyle.cpp
|
||||
!contains( styles, windows ) {
|
||||
styles += windows
|
||||
DEFINES+= QT_STYLE_WINDOWS
|
||||
}
|
||||
} else {
|
||||
DEFINES += QT_NO_STYLE_CLEANLOOKS
|
||||
}
|
||||
|
||||
contains( styles, fusion ) {
|
||||
HEADERS += styles/qfusionstyle.h
|
||||
HEADERS += styles/qfusionstyle_p.h
|
||||
SOURCES += styles/qfusionstyle.cpp
|
||||
!contains( styles, windows ) {
|
||||
styles += windows
|
||||
DEFINES+= QT_STYLE_WINDOWS
|
||||
}
|
||||
} else {
|
||||
DEFINES += QT_NO_STYLE_FUSION
|
||||
}
|
||||
|
||||
contains( styles, windows ) {
|
||||
HEADERS += styles/qwindowsstyle.h
|
||||
SOURCES += styles/qwindowsstyle.cpp
|
||||
} else {
|
||||
DEFINES += QT_NO_STYLE_WINDOWS
|
||||
}
|
||||
|
||||
contains( styles, windowsce ) {
|
||||
HEADERS += styles/qwindowscestyle.h
|
||||
SOURCES += styles/qwindowscestyle.cpp
|
||||
|
@ -623,17 +623,6 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
|
||||
for items in the menu bar are only shown when the \uicontrol{Alt} key is
|
||||
pressed.
|
||||
|
||||
\table
|
||||
|
||||
\row \li \inlineimage plastique-menubar.png A menu bar shown in the
|
||||
Plastique widget style.
|
||||
|
||||
\li The \l{QPlastiqueStyle}{Plastique widget style}, like most
|
||||
other styles, handles the \uicontrol{Help} menu in the same way as it
|
||||
handles any other menu.
|
||||
|
||||
\endtable
|
||||
|
||||
\section1 QMenuBar on Mac OS X
|
||||
|
||||
QMenuBar on Mac OS X is a wrapper for using the system-wide menu bar.
|
||||
|
@ -164,8 +164,8 @@ QDBusInterface *tst_QtAtSpi::getInterface(const QString &path, const QString &in
|
||||
void tst_QtAtSpi::initTestCase()
|
||||
{
|
||||
// Oxygen style creates many extra items, it's simply unusable here
|
||||
qDebug() << "Using plastique style...";
|
||||
qApp->setStyle("plastique");
|
||||
qDebug() << "Using fusion style...";
|
||||
qApp->setStyle("fusion");
|
||||
qApp->setApplicationName("tst_QtAtSpi app");
|
||||
dbus = DBusConnection();
|
||||
|
||||
|
@ -53,9 +53,6 @@
|
||||
#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC)
|
||||
#include <QMacStyle>
|
||||
#endif
|
||||
#if !defined(QT_NO_STYLE_CLEANLOOKS)
|
||||
#include <QCleanlooksStyle>
|
||||
#endif
|
||||
|
||||
#define CONVENIENCE_FUNC_SYMS(func) \
|
||||
{ \
|
||||
|
@ -50,8 +50,7 @@
|
||||
#include <QToolButton>
|
||||
#include <QVBoxLayout>
|
||||
#include <QWizard>
|
||||
#include <QStyle>
|
||||
#include <QPlastiqueStyle>
|
||||
#include <QWindowsStyle>
|
||||
#include <QTreeWidget>
|
||||
|
||||
static QImage grabWidget(QWidget *window)
|
||||
@ -104,7 +103,6 @@ private slots:
|
||||
void sideWidget();
|
||||
|
||||
// task-specific tests below me:
|
||||
void task161660_buttonSpacing();
|
||||
void task177716_disableCommitButton();
|
||||
void task183550_stretchFactor();
|
||||
void task161658_alignments();
|
||||
@ -2400,23 +2398,6 @@ void tst_QWizard::sideWidget()
|
||||
QVERIFY(wizard.sideWidget() == 0);
|
||||
}
|
||||
|
||||
void tst_QWizard::task161660_buttonSpacing()
|
||||
{
|
||||
#ifndef QT_NO_STYLE_PLASTIQUE
|
||||
QString origStyle = QApplication::style()->objectName();
|
||||
QApplication::setStyle(new QPlastiqueStyle);
|
||||
QWizard wizard;
|
||||
wizard.addPage(new QWizardPage);
|
||||
wizard.show();
|
||||
const QAbstractButton *finishButton = wizard.button(QWizard::FinishButton);
|
||||
const QAbstractButton *cancelButton = wizard.button(QWizard::CancelButton);
|
||||
const int spacing = cancelButton->geometry().left() - finishButton->geometry().right() - 1;
|
||||
QCOMPARE(spacing, wizard.style()->layoutSpacing(
|
||||
QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Horizontal));
|
||||
QApplication::setStyle(origStyle);
|
||||
#endif
|
||||
}
|
||||
|
||||
class task177716_CommitPage : public QWizardPage
|
||||
{
|
||||
Q_OBJECT
|
||||
|
@ -47,7 +47,7 @@
|
||||
#include <qgraphicsscene.h>
|
||||
#include <qgraphicsview.h>
|
||||
#include <qapplication.h>
|
||||
#include <qplastiquestyle.h>
|
||||
#include <qwindowsstyle.h>
|
||||
|
||||
class tst_QGraphicsLinearLayout : public QObject {
|
||||
Q_OBJECT
|
||||
@ -152,11 +152,7 @@ void tst_QGraphicsLinearLayout::initTestCase()
|
||||
{
|
||||
// since the style will influence the results, we have to ensure
|
||||
// that the tests are run using the same style on all platforms
|
||||
#if defined (Q_OS_WINCE)
|
||||
QApplication::setStyle(new QWindowsStyle);
|
||||
#else
|
||||
QApplication::setStyle(new QPlastiqueStyle);
|
||||
#endif
|
||||
}
|
||||
|
||||
// This will be called after the last test function is executed.
|
||||
|
@ -434,8 +434,8 @@ void tst_QGraphicsProxyWidget::setWidget()
|
||||
#endif
|
||||
widget->setPalette(QPalette(Qt::magenta));
|
||||
widget->setLayoutDirection(Qt::RightToLeft);
|
||||
QCleanlooksStyle cleanlooksStyle;
|
||||
widget->setStyle(&cleanlooksStyle);
|
||||
QFusionStyle fusionStyle;
|
||||
widget->setStyle(&fusionStyle);
|
||||
widget->setFont(QFont("Times"));
|
||||
widget->setVisible(true);
|
||||
QApplication::setActiveWindow(widget);
|
||||
|
@ -55,9 +55,6 @@
|
||||
#if !defined(QT_NO_STYLE_WINDOWS)
|
||||
#include <QtWidgets/QWindowsStyle>
|
||||
#endif
|
||||
#if !defined(QT_NO_STYLE_PLASTIQUE)
|
||||
#include <QtWidgets/QPlastiqueStyle>
|
||||
#endif
|
||||
#include <QtGui/QPainterPath>
|
||||
#include <QtWidgets/QRubberBand>
|
||||
#include <QtWidgets/QScrollBar>
|
||||
@ -2770,16 +2767,10 @@ void tst_QGraphicsView::scrollBarRanges()
|
||||
view.setFrameStyle(useStyledPanel ? QFrame::StyledPanel : QFrame::NoFrame);
|
||||
|
||||
if (useMotif) {
|
||||
#if !defined(QT_NO_STYLE_WINDOWS)
|
||||
view.setStyle(new FauxMotifStyle);
|
||||
#else
|
||||
QSKIP("No Windows style compiled.");
|
||||
#endif
|
||||
} else {
|
||||
#if defined(Q_OS_WINCE)
|
||||
#if !defined(QT_NO_STYLE_WINDOWS)
|
||||
view.setStyle(new QWindowsStyle);
|
||||
#elif !defined(QT_NO_STYLE_PLASTIQUE)
|
||||
view.setStyle(new QPlastiqueStyle);
|
||||
#endif
|
||||
}
|
||||
view.setStyleSheet(" "); // enables style propagation ;-)
|
||||
@ -3291,9 +3282,7 @@ void tst_QGraphicsView::scrollAfterResize_data()
|
||||
QTest::addColumn<QTransform>("x2");
|
||||
QTest::addColumn<QTransform>("x3");
|
||||
|
||||
#if !defined(QT_NO_STYLE_PLASTIQUE)
|
||||
QPlastiqueStyle style;
|
||||
#elif !defined(QT_NO_STYLE_WINDOWS)
|
||||
#if !defined(QT_NO_STYLE_WINDOWS)
|
||||
QWindowsStyle style;
|
||||
#else
|
||||
QCommonStyle style;
|
||||
@ -3322,9 +3311,7 @@ void tst_QGraphicsView::scrollAfterResize()
|
||||
QFETCH(QTransform, x2);
|
||||
QFETCH(QTransform, x3);
|
||||
|
||||
#if !defined(QT_NO_STYLE_PLASTIQUE)
|
||||
QPlastiqueStyle style;
|
||||
#elif !defined(QT_NO_STYLE_WINDOWS)
|
||||
#if !defined(QT_NO_STYLE_WINDOWS)
|
||||
QWindowsStyle style;
|
||||
#else
|
||||
QCommonStyle style;
|
||||
|
@ -47,11 +47,13 @@
|
||||
#include <qgraphicsview.h>
|
||||
#include <qstyleoption.h>
|
||||
#include <qgraphicslinearlayout.h>
|
||||
#include <qcleanlooksstyle.h>
|
||||
#include <qlineedit.h>
|
||||
#include <qboxlayout.h>
|
||||
#include <qaction.h>
|
||||
#include <qwidgetaction.h>
|
||||
#ifndef Q_NO_STYLE_FUSION
|
||||
#include <qfusionstyle.h>
|
||||
#endif
|
||||
|
||||
#include "../../../qtest-config.h"
|
||||
|
||||
@ -1397,21 +1399,22 @@ void tst_QGraphicsWidget::setStyle_data()
|
||||
{
|
||||
QTest::addColumn<QString>("style");
|
||||
QTest::newRow("null") << "";
|
||||
QTest::newRow("cleanlooks") << "QCleanlooksStyle";
|
||||
QTest::newRow("fusion") << "QFusionStyle";
|
||||
}
|
||||
|
||||
// void setStyle(QStyle* style) public
|
||||
void tst_QGraphicsWidget::setStyle()
|
||||
{
|
||||
#ifndef Q_NO_STYLE_FUSION
|
||||
SubQGraphicsWidget widget;
|
||||
QCleanlooksStyle cleanlooksStyle;
|
||||
QFusionStyle fusionStyle;
|
||||
|
||||
int oldEventCounts = widget.eventCount;
|
||||
|
||||
QFETCH(QString, style);
|
||||
if (style == "QCleanlooksStyle") {
|
||||
widget.setStyle(&cleanlooksStyle);
|
||||
QCOMPARE(widget.style(), static_cast<QStyle*>(&cleanlooksStyle));
|
||||
if (style == "QFusionStyle") {
|
||||
widget.setStyle(&fusionStyle);
|
||||
QCOMPARE(widget.style(), static_cast<QStyle*>(&fusionStyle));
|
||||
} else {
|
||||
widget.setStyle(0);
|
||||
QVERIFY(widget.style() != (QStyle *)0);
|
||||
@ -1421,6 +1424,7 @@ void tst_QGraphicsWidget::setStyle()
|
||||
|
||||
// cleanup
|
||||
widget.setStyle(0);
|
||||
#endif
|
||||
}
|
||||
|
||||
void tst_QGraphicsWidget::setTabOrder_data()
|
||||
|
@ -55,6 +55,11 @@
|
||||
#include <QtWidgets/QScrollBar>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
|
||||
#if !defined(QT_NO_STYLE_WINDOWS)
|
||||
#include <qwindowsstyle.h>
|
||||
#endif // QT_NO_STYLE_WINDOWS
|
||||
|
||||
#if defined(Q_OS_WIN) || defined(Q_OS_WINCE)
|
||||
# include <windows.h>
|
||||
# include <QtGui/QGuiApplication>
|
||||
@ -2190,6 +2195,11 @@ void tst_QListView::taskQTBUG_21804_hiddenItemsAndScrollingWithKeys()
|
||||
|
||||
// create listview
|
||||
QListView lv;
|
||||
#if !defined(QT_NO_STYLE_WINDOWS)
|
||||
// The test fails on Fusion style
|
||||
// See https://bugreports.qt-project.org/browse/QTBUG-27675
|
||||
lv.setStyle(new QWindowsStyle());
|
||||
#endif
|
||||
lv.setFlow(static_cast<QListView::Flow>(flow));
|
||||
lv.setSpacing(spacing);
|
||||
lv.setModel(&model);
|
||||
|
@ -50,7 +50,6 @@
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QLineEdit>
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QtWidgets/QPlastiqueStyle>
|
||||
#include <QtWidgets/QWindowsStyle>
|
||||
#include <QStyleFactory>
|
||||
|
||||
@ -403,7 +402,7 @@ void tst_QFormLayout::setFormStyle()
|
||||
QFormLayout layout;
|
||||
widget.setLayout(&layout);
|
||||
|
||||
#ifndef QT_NO_STYLE_PLASTIQUE
|
||||
#if 0 // QT_NO_STYLE_PLASTIQUE
|
||||
widget.setStyle(new QPlastiqueStyle());
|
||||
|
||||
QVERIFY(layout.labelAlignment() == Qt::AlignRight);
|
||||
|
@ -55,7 +55,6 @@
|
||||
#include <qtoolbutton.h>
|
||||
#include <qtoolbar.h>
|
||||
|
||||
#include <qplastiquestyle.h>
|
||||
#include <qwindowsstyle.h>
|
||||
#include <qcommonstyle.h>
|
||||
#include <qproxystyle.h>
|
||||
@ -72,7 +71,9 @@
|
||||
#include <qmdiarea.h>
|
||||
#include <qscrollarea.h>
|
||||
|
||||
#include <QCleanlooksStyle>
|
||||
#ifndef Q_NO_STYLE_FUSION
|
||||
#include <qfusionstyle.h>
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#include <QMacStyle>
|
||||
@ -116,27 +117,24 @@ private:
|
||||
private slots:
|
||||
void drawItemPixmap();
|
||||
void initTestCase();
|
||||
void cleanup();
|
||||
void cleanupTestCase();
|
||||
void init();
|
||||
void cleanup();
|
||||
#ifndef QT_NO_STYLE_PLASTIQUE
|
||||
void testPlastiqueStyle();
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
void testFusionStyle();
|
||||
#endif
|
||||
void testWindowsStyle();
|
||||
#ifndef QT_NO_STYLE_WINDOWSXP
|
||||
void testWindowsXPStyle();
|
||||
#endif
|
||||
void testWindowsVistaStyle();
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
void testCleanlooksStyle();
|
||||
#endif
|
||||
void testMacStyle();
|
||||
void testWindowsCEStyle();
|
||||
void testWindowsMobileStyle();
|
||||
void testStyleFactory();
|
||||
void testProxyStyle();
|
||||
void pixelMetric();
|
||||
#if !defined(QT_NO_STYLE_PLASTIQUE) && !defined(QT_NO_STYLE_WINDOWS)
|
||||
#if !defined(QT_NO_STYLE_WINDOWS)
|
||||
void progressBarChangeStyle();
|
||||
#endif
|
||||
void defaultFont();
|
||||
@ -187,11 +185,8 @@ void tst_QStyle::cleanupTestCase()
|
||||
void tst_QStyle::testStyleFactory()
|
||||
{
|
||||
QStringList keys = QStyleFactory::keys();
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
QVERIFY(keys.contains("Cleanlooks"));
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_PLASTIQUE
|
||||
QVERIFY(keys.contains("Plastique"));
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
QVERIFY(keys.contains("Fusion"));
|
||||
#endif
|
||||
#ifndef QT_NO_STYLE_WINDOWS
|
||||
QVERIFY(keys.contains("Windows"));
|
||||
@ -366,21 +361,12 @@ bool tst_QStyle::testScrollBarSubControls(QStyle* style)
|
||||
return true;
|
||||
}
|
||||
|
||||
#ifndef QT_NO_STYLE_PLASTIQUE
|
||||
void tst_QStyle::testPlastiqueStyle()
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
void tst_QStyle::testFusionStyle()
|
||||
{
|
||||
QPlastiqueStyle pstyle;
|
||||
QVERIFY(testAllFunctions(&pstyle));
|
||||
lineUpLayoutTest(&pstyle);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
void tst_QStyle::testCleanlooksStyle()
|
||||
{
|
||||
QCleanlooksStyle cstyle;
|
||||
QVERIFY(testAllFunctions(&cstyle));
|
||||
lineUpLayoutTest(&cstyle);
|
||||
QFusionStyle fstyle;
|
||||
QVERIFY(testAllFunctions(&fstyle));
|
||||
lineUpLayoutTest(&fstyle);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -653,14 +639,14 @@ void tst_QStyle::pixelMetric()
|
||||
delete style;
|
||||
}
|
||||
|
||||
#if !defined(QT_NO_STYLE_PLASTIQUE) && !defined(QT_NO_STYLE_WINDOWS)
|
||||
#if !defined(QT_NO_STYLE_WINDOWS)
|
||||
void tst_QStyle::progressBarChangeStyle()
|
||||
{
|
||||
//test a crashing situation (task 143530)
|
||||
//where changing the styles and deleting a progressbar would crash
|
||||
|
||||
QWindowsStyle style1;
|
||||
QPlastiqueStyle style2;
|
||||
QFusionStyle style2;
|
||||
|
||||
QProgressBar *progress=new QProgressBar;
|
||||
progress->setStyle(&style1);
|
||||
|
@ -44,7 +44,7 @@
|
||||
#include <QtTest/QtTest>
|
||||
#include <QtDebug>
|
||||
#include <QMetaObject>
|
||||
#include <QPlastiqueStyle>
|
||||
#include <QFusionStyle>
|
||||
|
||||
#include <private/qstylesheetstyle_p.h>
|
||||
|
||||
@ -1589,7 +1589,7 @@ class ChangeEventWidget : public QWidget
|
||||
static bool recurse = false;
|
||||
if (!recurse) {
|
||||
recurse = true;
|
||||
QStyle *style = new QPlastiqueStyle;
|
||||
QStyle *style = new QFusionStyle
|
||||
style->setParent(this);
|
||||
setStyle(style);
|
||||
recurse = false;
|
||||
|
@ -72,8 +72,8 @@
|
||||
#include <qstringlist.h>
|
||||
#include <qvalidator.h>
|
||||
#include <qcompleter.h>
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
#include <qcleanlooksstyle.h>
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
#include <qfusionstyle.h>
|
||||
#endif
|
||||
#include <qabstractitemview.h>
|
||||
#include <qstyleditemdelegate.h>
|
||||
@ -133,7 +133,7 @@ private slots:
|
||||
void itemListPosition();
|
||||
void separatorItem_data();
|
||||
void separatorItem();
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
void task190351_layout();
|
||||
void task191329_size();
|
||||
#endif
|
||||
@ -1942,12 +1942,12 @@ void tst_QComboBox::separatorItem()
|
||||
}
|
||||
}
|
||||
|
||||
// This test requires the Cleanlooks style
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
// This test requires the Fusionstyle
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
void tst_QComboBox::task190351_layout()
|
||||
{
|
||||
const QString oldStyle = QApplication::style()->objectName();
|
||||
QApplication::setStyle(new QCleanlooksStyle);
|
||||
QApplication::setStyle(new QFusionStyle);
|
||||
|
||||
QComboBox listCombo;
|
||||
QListWidget *list = new QListWidget();
|
||||
@ -2007,12 +2007,12 @@ void tst_QComboBox::task166349_setEditableOnReturn()
|
||||
QCOMPARE(QLatin1String("two1"), comboBox.itemText(comboBox.count() - 1));
|
||||
}
|
||||
|
||||
// This test requires the Cleanlooks style.
|
||||
#ifndef QT_NO_STYLE_CLEANLOOKS
|
||||
// This test requires the Fusion style.
|
||||
#ifndef QT_NO_STYLE_FUSION
|
||||
void tst_QComboBox::task191329_size()
|
||||
{
|
||||
const QString oldStyle = QApplication::style()->objectName();
|
||||
QApplication::setStyle(new QCleanlooksStyle);
|
||||
QApplication::setStyle(new QFusionStyle);
|
||||
|
||||
QComboBox tableCombo;
|
||||
int rows;
|
||||
|
@ -299,10 +299,8 @@ void tst_QProgressBar::task245201_testChangeStyleAndDelete_data()
|
||||
QTest::addColumn<QString>("style1_str");
|
||||
QTest::addColumn<QString>("style2_str");
|
||||
|
||||
QTest::newRow("plastique-windows") << QString::fromLatin1("plastique") << QString::fromLatin1("windows");
|
||||
QTest::newRow("mlotif-windows") << QString::fromLatin1("motif") << QString::fromLatin1("windows");
|
||||
QTest::newRow("cleanlooks-cde") << QString::fromLatin1("cleanlooks") << QString::fromLatin1("cde");
|
||||
QTest::newRow("gtk-plastique") << QString::fromLatin1("gtk") << QString::fromLatin1("plastique");
|
||||
QTest::newRow("fusion-windows") << QString::fromLatin1("fusion") << QString::fromLatin1("windows");
|
||||
QTest::newRow("gtk-fusion") << QString::fromLatin1("gtk") << QString::fromLatin1("fusion");
|
||||
}
|
||||
|
||||
void tst_QProgressBar::task245201_testChangeStyleAndDelete()
|
||||
|
@ -564,17 +564,14 @@ void tst_QPushButton::sizeHint_data()
|
||||
#if !defined(QT_NO_STYLE_WINDOWS)
|
||||
QTest::newRow("windows") << QString::fromLatin1("windows");
|
||||
#endif
|
||||
#if !defined(QT_NO_STYLE_CLEANLOOKS)
|
||||
QTest::newRow("cleanlooks") << QString::fromLatin1("cleanlooks");
|
||||
#endif
|
||||
#if !defined(QT_NO_STYLE_GTK)
|
||||
QTest::newRow("gtk") << QString::fromLatin1("gtk");
|
||||
#endif
|
||||
#if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC)
|
||||
QTest::newRow("mac") << QString::fromLatin1("mac");
|
||||
#endif
|
||||
#if !defined(QT_NO_STYLE_PLASTIQUE)
|
||||
QTest::newRow("plastique") << QString::fromLatin1("plastique");
|
||||
#if !defined(QT_NO_STYLE_FUSION)
|
||||
QTest::newRow("fusion") << QString::fromLatin1("fusion");
|
||||
#endif
|
||||
#if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSXP)
|
||||
QTest::newRow("windowsxp") << QString::fromLatin1("windowsxp");
|
||||
|
@ -307,8 +307,6 @@ Configure::Configure(int& argc, char** argv)
|
||||
dictionary[ "STYLE_WINDOWS" ] = "yes";
|
||||
dictionary[ "STYLE_WINDOWSXP" ] = "auto";
|
||||
dictionary[ "STYLE_WINDOWSVISTA" ] = "auto";
|
||||
dictionary[ "STYLE_PLASTIQUE" ] = "yes";
|
||||
dictionary[ "STYLE_CLEANLOOKS" ]= "yes";
|
||||
dictionary[ "STYLE_FUSION" ] = "yes";
|
||||
dictionary[ "STYLE_WINDOWSCE" ] = "no";
|
||||
dictionary[ "STYLE_WINDOWSMOBILE" ] = "no";
|
||||
@ -639,16 +637,6 @@ void Configure::parseCmdLine()
|
||||
else if (configCmdLine.at(i) == "-no-style-windowsvista")
|
||||
dictionary[ "STYLE_WINDOWSVISTA" ] = "no";
|
||||
|
||||
else if (configCmdLine.at(i) == "-qt-style-plastique")
|
||||
dictionary[ "STYLE_PLASTIQUE" ] = "yes";
|
||||
else if (configCmdLine.at(i) == "-no-style-plastique")
|
||||
dictionary[ "STYLE_PLASTIQUE" ] = "no";
|
||||
|
||||
else if (configCmdLine.at(i) == "-qt-style-cleanlooks")
|
||||
dictionary[ "STYLE_CLEANLOOKS" ] = "yes";
|
||||
else if (configCmdLine.at(i) == "-no-style-cleanlooks")
|
||||
dictionary[ "STYLE_CLEANLOOKS" ] = "no";
|
||||
|
||||
else if (configCmdLine.at(i) == "-qt-style-fusion")
|
||||
dictionary[ "STYLE_FUSION" ] = "yes";
|
||||
else if (configCmdLine.at(i) == "-no-style-fusion")
|
||||
@ -1485,8 +1473,6 @@ void Configure::applySpecSpecifics()
|
||||
if (dictionary[ "XQMAKESPEC" ].startsWith("wince")) {
|
||||
dictionary[ "STYLE_WINDOWSXP" ] = "no";
|
||||
dictionary[ "STYLE_WINDOWSVISTA" ] = "no";
|
||||
dictionary[ "STYLE_PLASTIQUE" ] = "no";
|
||||
dictionary[ "STYLE_CLEANLOOKS" ] = "no";
|
||||
dictionary[ "STYLE_FUSION" ] = "no";
|
||||
dictionary[ "STYLE_WINDOWSCE" ] = "yes";
|
||||
dictionary[ "STYLE_WINDOWSMOBILE" ] = "yes";
|
||||
@ -1797,8 +1783,6 @@ bool Configure::displayHelp()
|
||||
desc("STYLE_WINDOWS", "yes", "", " windows", ' ');
|
||||
desc("STYLE_WINDOWSXP", "auto", "", " windowsxp", ' ');
|
||||
desc("STYLE_WINDOWSVISTA", "auto", "", " windowsvista", ' ');
|
||||
desc("STYLE_PLASTIQUE", "yes", "", " plastique", ' ');
|
||||
desc("STYLE_CLEANLOOKS", "yes", "", " cleanlooks", ' ');
|
||||
desc("STYLE_FUSION", "yes", "", " fusion", ' ');
|
||||
desc("STYLE_WINDOWSCE", "yes", "", " windowsce", ' ');
|
||||
desc("STYLE_WINDOWSMOBILE" , "yes", "", " windowsmobile\n", ' ');
|
||||
@ -2375,12 +2359,6 @@ void Configure::generateOutputVars()
|
||||
if (dictionary[ "STYLE_WINDOWS" ] == "yes")
|
||||
qmakeStyles += "windows";
|
||||
|
||||
if (dictionary[ "STYLE_PLASTIQUE" ] == "yes")
|
||||
qmakeStyles += "plastique";
|
||||
|
||||
if (dictionary[ "STYLE_CLEANLOOKS" ] == "yes")
|
||||
qmakeStyles += "cleanlooks";
|
||||
|
||||
if (dictionary[ "STYLE_FUSION" ] == "yes")
|
||||
qmakeStyles += "fusion";
|
||||
|
||||
@ -3162,8 +3140,6 @@ void Configure::generateConfigfiles()
|
||||
|
||||
QStringList qconfigList;
|
||||
if (dictionary["STYLE_WINDOWS"] != "yes") qconfigList += "QT_NO_STYLE_WINDOWS";
|
||||
if (dictionary["STYLE_PLASTIQUE"] != "yes") qconfigList += "QT_NO_STYLE_PLASTIQUE";
|
||||
if (dictionary["STYLE_CLEANLOOKS"] != "yes") qconfigList += "QT_NO_STYLE_CLEANLOOKS";
|
||||
if (dictionary["STYLE_FUSION"] != "yes") qconfigList += "QT_NO_STYLE_FUSION";
|
||||
if (dictionary["STYLE_WINDOWSXP"] != "yes" && dictionary["STYLE_WINDOWSVISTA"] != "yes")
|
||||
qconfigList += "QT_NO_STYLE_WINDOWSXP";
|
||||
@ -3366,8 +3342,6 @@ void Configure::displayConfig()
|
||||
sout << " Windows................." << dictionary[ "STYLE_WINDOWS" ] << endl;
|
||||
sout << " Windows XP.............." << dictionary[ "STYLE_WINDOWSXP" ] << endl;
|
||||
sout << " Windows Vista..........." << dictionary[ "STYLE_WINDOWSVISTA" ] << endl;
|
||||
sout << " Plastique..............." << dictionary[ "STYLE_PLASTIQUE" ] << endl;
|
||||
sout << " Cleanlooks.............." << dictionary[ "STYLE_CLEANLOOKS" ] << endl;
|
||||
sout << " Fusion.................." << dictionary[ "STYLE_FUSION" ] << endl;
|
||||
sout << " Windows CE.............." << dictionary[ "STYLE_WINDOWSCE" ] << endl;
|
||||
sout << " Windows Mobile.........." << dictionary[ "STYLE_WINDOWSMOBILE" ] << endl << endl;
|
||||
|
Loading…
x
Reference in New Issue
Block a user