Hello community, here is the log from the commit of package kdelibs4 checked in at Thu Dec 6 16:15:21 CET 2007. -------- --- KDE/kdelibs4/kdelibs4.changes 2007-12-04 16:36:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2007-12-06 12:31:33.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 6 12:31:27 CET 2007 - dmueller@suse.de + +- restore source compatibility + +------------------------------------------------------------------- New: ---- r744875.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.b17429/_old 2007-12-06 16:14:41.000000000 +0100 +++ /var/tmp/diff_new_pack.b17429/_new 2007-12-06 16:14:41.000000000 +0100 @@ -22,7 +22,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 3.96.3 -Release: 1 +Release: 2 %define rversion 3.96.3 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) Requires: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi`) @@ -32,6 +32,7 @@ Source1: _upstream Patch0: dotkde4.diff Patch1: kde3-applications.diff +Patch2: r744875.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,6 +52,7 @@ %setup -q -n kdelibs-%rversion %patch %patch1 +%patch2 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -313,6 +315,8 @@ %dir /usr/share/kde4/servicetypes %changelog +* Thu Dec 06 2007 - dmueller@suse.de +- restore source compatibility * Tue Dec 04 2007 - dmueller@suse.de - update to 3.96.3 * Wed Nov 28 2007 - dmueller@suse.de ++++++ r744875.diff ++++++ ------------------------------------------------------------------------ r744875 | dfaure | 2007-12-04 20:23:59 +0100 (Tue, 04 Dec 2007) | 3 lines Restore source compatibility CCMAIL: rodda@kde.org, release-team@kde.org, kretschmann@kde.org ------------------------------------------------------------------------ Index: kdeui/actions/kactioncollection.h =================================================================== --- kdeui/actions/kactioncollection.h (revision 744874) +++ kdeui/actions/kactioncollection.h (revision 744875) @@ -81,6 +81,15 @@ public: void clear(); /** + * Associate all actions in this collection to the given \a widget. + * Unlike addAssociatedWidget, this method only adds all current actions + * in the collection to the given widget. Any action added after this call + * will not be added to the given widget automatically. + * So this is just a shortcut for a foreach loop and a widget->addAction call. + */ + void associateWidget(QWidget* widget) const; + + /** * Associate all actions in this collection to the given \a widget, including any actions * added after this association is made. * Index: kdeui/actions/kactioncollection.cpp =================================================================== --- kdeui/actions/kactioncollection.cpp (revision 744874) +++ kdeui/actions/kactioncollection.cpp (revision 744875) @@ -506,6 +506,14 @@ const QList< KActionCollection * >& KAct return KActionCollectionPrivate::s_allCollections; } +void KActionCollection::associateWidget(QWidget* widget) const +{ + foreach (QAction* action, actions()) { + if (!widget->actions().contains(action)) + widget->addAction(action); + } +} + void KActionCollection::addAssociatedWidget(QWidget * widget) { if (!d->associatedWidgets.contains(widget)) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org