Hello community,
here is the log from the commit of package qupzilla for openSUSE:Factory
checked in at 2015-06-12 20:31:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qupzilla (Old)
and /work/SRC/openSUSE:Factory/.qupzilla.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qupzilla"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qupzilla/qupzilla-qt5.changes 2015-03-25
21:33:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qupzilla.new/qupzilla-qt5.changes
2015-06-12 20:31:38.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jun 11 19:25:47 UTC 2015 - jav...@opensuse.org
+
+- Added qupzilla-tabbar-fix.patch
+ - Fixes tabbar bug boo#934079
+
+-------------------------------------------------------------------
qupzilla.changes: same change
New:
----
qupzilla-tabbar-fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qupzilla-qt5.spec ++++++
--- /var/tmp/diff_new_pack.P8ubp4/_old 2015-06-12 20:31:39.000000000 +0200
+++ /var/tmp/diff_new_pack.P8ubp4/_new 2015-06-12 20:31:39.000000000 +0200
@@ -35,6 +35,8 @@
Patch0: qupzilla-defaults.patch
# PATCH-FIX-UPSTREAM qupzilla-sendlink-fix.patch gh#QupZilla/qupzilla#1625
Patch1: qupzilla-sendlink-fix.patch
+# PATCH-FIX-UPSTREAM qupzilla-tabbar-fix.patch boo#934079
+Patch2: qupzilla-tabbar-fix.patch
BuildRequires: fdupes
%if %{with qt5}
%if 0%{?suse_version} > 1310
@@ -125,6 +127,8 @@
%patch0 -p1
# Fix for send link bug
%patch1 -p1
+# Tabbar fix
+%patch2 -p1
# openSUSE icons
cp {%{SOURCE1},%{SOURCE2}} src/lib/data/icons/sites/
cp %{SOURCE3} src/lib/data/data/
++++++ qupzilla.spec ++++++
--- /var/tmp/diff_new_pack.P8ubp4/_old 2015-06-12 20:31:39.000000000 +0200
+++ /var/tmp/diff_new_pack.P8ubp4/_new 2015-06-12 20:31:39.000000000 +0200
@@ -35,6 +35,8 @@
Patch0: qupzilla-defaults.patch
# PATCH-FIX-UPSTREAM qupzilla-sendlink-fix.patch gh#QupZilla/qupzilla#1625
Patch1: qupzilla-sendlink-fix.patch
+# PATCH-FIX-UPSTREAM qupzilla-tabbar-fix.patch boo#934079
+Patch2: qupzilla-tabbar-fix.patch
BuildRequires: fdupes
%if %{with qt5}
%if 0%{?suse_version} > 1310
@@ -125,6 +127,8 @@
%patch0 -p1
# Fix for send link bug
%patch1 -p1
+# Tabbar fix
+%patch2 -p1
# openSUSE icons
cp {%{SOURCE1},%{SOURCE2}} src/lib/data/icons/sites/
cp %{SOURCE3} src/lib/data/data/
++++++ qupzilla-tabbar-fix.patch ++++++
c4c31ac5a103bed3f29d24dc6cceb49970f1503b
diff --git a/src/lib/tabwidget/tabbar.cpp b/src/lib/tabwidget/tabbar.cpp
index 0079014..990a55e 100644
--- a/src/lib/tabwidget/tabbar.cpp
+++ b/src/lib/tabwidget/tabbar.cpp
@@ -25,7 +25,6 @@
#include "tabbedwebview.h"
#include "mainapplication.h"
#include "pluginproxy.h"
-#include "proxystyle.h"
#include "iconprovider.h"
#include <QMenu>
@@ -150,11 +149,9 @@ void TabBar::closeAllButCurrent()
QSize TabBar::tabSizeHint(int index, bool fast) const
{
- if (!isVisible() || !mApp->proxyStyle()) {
+ if (!isVisible()) {
// Don't calculate it when tabbar is not visible
// It produces invalid size anyway
- //
- // We also need ProxyStyle to be set before calculating minimum sizes
for tabs
return QSize(-1, -1);
}
@@ -266,13 +263,12 @@ QSize TabBar::tabSizeHint(int index, bool fast) const
int TabBar::comboTabBarPixelMetric(ComboTabBar::SizeType sizeType) const
{
- if (!mApp->proxyStyle() || !isVisible()) {
+ if (!isVisible())
return -1;
- }
switch (sizeType) {
case ComboTabBar::PinnedTabWidth:
- return 16 +
mApp->proxyStyle()->pixelMetric(QStyle::PM_TabBarTabHSpace, 0, this);
+ return 16 + style()->pixelMetric(QStyle::PM_TabBarTabHSpace, 0, this);
case ComboTabBar::ActiveTabMinimumWidth:
case ComboTabBar::NormalTabMinimumWidth:
