From 899a815414e95da8d9429a4a4f4d7094e49cfc55 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Thu, 30 Jul 2015 21:32:43 +0300 Subject: Remove gtk2 style from qtbase, it will be moved to qtstyleplugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will allow us to drop gtk2 support from qtbase in future, while still providing the gtk2 style for those who want to use it. Also with moving to qtstyleplugins, the code can be simplified because we can directly link to libraries we need, instead of using QLibrary. [ChangeLog][QtWidgets] Remove QGtkStyle, it is now provided in qtstyleplugins repository. Change-Id: I6221b1a513d7fda32e080f3ca159b0b2f8a8f246 Reviewed-by: Timo Jyrinki Reviewed-by: Oswald Buddenhagen Reviewed-by: Jens Bache-Wiig Reviewed-by: Lars Knoll Reviewed-by: J-P Nurmi Reviewed-by: Lisandro Damián Nicanor Pérez Meyer --- src/widgets/styles/qgtkpainter.cpp | 76 -------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 src/widgets/styles/qgtkpainter.cpp (limited to 'src/widgets/styles/qgtkpainter.cpp') diff --git a/src/widgets/styles/qgtkpainter.cpp b/src/widgets/styles/qgtkpainter.cpp deleted file mode 100644 index e86fee079e..0000000000 --- a/src/widgets/styles/qgtkpainter.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWidgets module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/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 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qgtkpainter_p.h" - -#if !defined(QT_NO_STYLE_GTK) - -#include - -QT_BEGIN_NAMESPACE - -QGtkPainter::QGtkPainter() -{ - reset(0); -} - -QGtkPainter::~QGtkPainter() -{ -} - -void QGtkPainter::reset(QPainter *painter) -{ - m_painter = painter; - m_alpha = true; - m_hflipped = false; - m_vflipped = false; - m_usePixmapCache = true; - m_cliprect = QRect(); -} - -QString QGtkPainter::uniqueName(const QString &key, GtkStateType state, GtkShadowType shadow, - const QSize &size, GtkWidget *widget) -{ - // Note the widget arg should ideally use the widget path, though would compromise performance - QString tmp = key - % HexString(state) - % HexString(shadow) - % HexString(size.width()) - % HexString(size.height()) - % HexString(quint64(widget)); - return tmp; -} - -QT_END_NAMESPACE - -#endif //!defined(QT_NO_STYLE_GTK) -- cgit v1.2.3