rpms/yakuake/devel yakuake-2.9.4-qt4.5.patch, NONE, 1.1 yakuake.spec, 1.12, 1.13
Johan Cwiklinski
trasher at fedoraproject.org
Fri Apr 17 22:03:31 UTC 2009
Author: trasher
Update of /cvs/extras/rpms/yakuake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28453
Modified Files:
yakuake.spec
Added Files:
yakuake-2.9.4-qt4.5.patch
Log Message:
Fix QT 4.5 bug (bz #494993)
yakuake-2.9.4-qt4.5.patch:
--- NEW FILE yakuake-2.9.4-qt4.5.patch ---
--- trunk/extragear/utils/yakuake/app/mainwindow.cpp 2009/04/07 00:27:24 950384
+++ trunk/extragear/utils/yakuake/app/mainwindow.cpp 2009/04/11 18:32:17 952380
@@ -473,31 +473,55 @@
void MainWindow::updateWindowWidthMenu()
{
- QAction* action;
+ QAction* action = 0;
- m_windowWidthMenu->clear();
-
- for (int i = 10; i <= 100; i += 10)
+ if (m_windowWidthMenu->isEmpty())
+ {
+ for (int i = 10; i <= 100; i += 10)
+ {
+ action = m_windowWidthMenu->addAction(QString::number(i) + '%');
+ action->setCheckable(true);
+ action->setData(i);
+ action->setChecked(i == Settings::width());
+ }
+ }
+ else
{
- action = m_windowWidthMenu->addAction(QString::number(i) + '%');
- action->setCheckable(true);
- action->setData(i);
- action->setChecked(i == Settings::width());
+ QListIterator<QAction*> i(m_windowWidthMenu->actions());
+
+ while (i.hasNext())
+ {
+ action = i.next();
+
+ action->setChecked(action->data().toInt() == Settings::width());
+ }
}
}
void MainWindow::updateWindowHeightMenu()
{
- QAction* action;
+ QAction* action = 0;
- m_windowHeightMenu->clear();
-
- for (int i = 10; i <= 100; i += 10)
+ if (m_windowHeightMenu->isEmpty())
+ {
+ for (int i = 10; i <= 100; i += 10)
+ {
+ action = m_windowHeightMenu->addAction(QString::number(i) + '%');
+ action->setCheckable(true);
+ action->setData(i);
+ action->setChecked(i == Settings::height());
+ }
+ }
+ else
{
- action = m_windowHeightMenu->addAction(QString::number(i) + '%');
- action->setCheckable(true);
- action->setData(i);
- action->setChecked(i == Settings::height());
+ QListIterator<QAction*> i(m_windowHeightMenu->actions());
+
+ while (i.hasNext())
+ {
+ action = i.next();
+
+ action->setChecked(action->data().toInt() == Settings::height());
+ }
}
}
Index: yakuake.spec
===================================================================
RCS file: /cvs/extras/rpms/yakuake/devel/yakuake.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yakuake.spec 25 Feb 2009 18:04:27 -0000 1.12
+++ yakuake.spec 17 Apr 2009 22:03:00 -0000 1.13
@@ -1,6 +1,6 @@
Name: yakuake
Version: 2.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Terminal emulator
Group: User Interface/Desktops
@@ -9,6 +9,8 @@
Source0: http://download.berlios.de/yakuake/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: yakuake-2.9.4-qt4.5.patch
+
Requires: kdebase
BuildRequires: desktop-file-utils
@@ -23,6 +25,7 @@
%prep
%setup -q
+%patch0 -p4
%build
@@ -75,6 +78,9 @@
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svgz
%changelog
+* Sat Apr 17 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 2.9.4-3
+- Fix crash with QT 4.5
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the scm-commits
mailing list