Hello community,
here is the log from the commit of package kdelibs4
checked in at Fri Jan 11 11:58:08 CET 2008.
--------
--- KDE/kdelibs4/kdelibs4.changes 2008-01-03 16:11:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2008-01-05 18:23:26.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Jan 5 18:21:13 CET 2008 - stbinner@suse.de
+
+- update to 4.0 release
+
+-------------------------------------------------------------------
Old:
----
kdelibs-3.97.2.tar.bz2
New:
----
4_0_BRANCH.diff
common-symlink-fix.diff
kdelibs-4.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.kk7744/_old 2008-01-11 11:57:29.000000000 +0100
+++ /var/tmp/diff_new_pack.kk7744/_new 2008-01-11 11:57:29.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs4 (Version 3.97.2)
+# spec file for package kdelibs4 (Version 4.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,11 +12,11 @@
Name: kdelibs4
BuildRequires: alsa-devel aspell-devel cmake cups-devel giflib-devel hicolor-icon-theme
BuildRequires: libattr-devel libpng-devel libqt4-devel libtiff-devel libxslt-devel unzip
-BuildRequires: avahi-compat-mDNSResponder-devel libsoprano-devel pcre-devel shared-mime-info
+BuildRequires: libsoprano-devel pcre-devel shared-mime-info
BuildRequires: kde4-filesystem strigi strigi-devel update-desktop-files
BuildRequires: OpenEXR-devel enchant-devel fam-devel
%if %suse_version > 1020
-BuildRequires: fdupes libjasper-devel
+BuildRequires: avahi-compat-mDNSResponder-devel fdupes libjasper-devel
%else
BuildRequires: libjasper
%endif
@@ -24,9 +24,9 @@
Group: System/GUI/KDE
Summary: KDE Base Libraries
Url: http://www.kde.org
-Version: 3.97.2
+Version: 4.0
Release: 1
-%define rversion 3.97.2
+%define rversion 4.0.0
Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`)
Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`)
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`)
@@ -36,9 +36,11 @@
Requires: dbus-1-x11 shared-mime-info
Source0: kdelibs-%rversion.tar.bz2
Source1: _upstream
-Patch0: dotkde4.diff
+Patch0: 4_0_BRANCH.diff
Patch1: kde3-applications.diff
Patch2: default-useragent.diff
+Patch3: common-symlink-fix.diff
+Patch4: dotkde4.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -59,6 +61,9 @@
%patch
%patch1
%patch2
+# disabled because it causes stale symlinks
+# %patch3
+%patch4
#
# define KDE version exactly
#
@@ -77,6 +82,7 @@
-DMIME_INSTALL_DIR=/nogo \
-DTEMPLATES_INSTALL_DIR=%{_kde_share_dir}/templates \
-DHTML_INSTALL_DIR=%{_kde_html_dir} \
+ -DCMAKE_SKIP_RPATH=ON \
-DLIB_SUFFIX=$(echo %_lib | cut -b4-) ..
%make_jobs
@@ -272,7 +278,10 @@
Requires: kdelibs4-doc = %version
Requires: libkde4 = %version libkdecore4-devel = %version
Requires: libqt4-devel libxslt-devel libattr-devel aspell-devel libtiff-devel pcre-devel
-Requires: giflib-devel alsa-devel cups-devel avahi-compat-mDNSResponder-devel
+Requires: giflib-devel alsa-devel cups-devel
+%if %suse_version > 1020
+Requires: avahi-compat-mDNSResponder-devel
+%endif
Requires: libjpeg-devel libidn-devel
Requires: libxml2-devel update-desktop-files strigi-devel
Requires: fam-devel enchant-devel OpenEXR-devel enchant-devel
@@ -327,6 +336,8 @@
%dir /usr/share/kde4/servicetypes
%changelog
+* Sat Jan 05 2008 - stbinner@suse.de
+- update to 4.0 release
* Wed Jan 02 2008 - stbinner@suse.de
- update to 3.97.2
* Sun Dec 16 2007 - dmueller@suse.de
++++++ 4_0_BRANCH.diff ++++++
package: kdelibs-4.0.0.tar.bz2
kdemod: kdelibs
current HEAD: 758929
svn di between /tags/KDE/4.0.0 and /branches/KDE//branches/KDE/4.0
--- khtml/rendering/render_form.cpp (revision 758956)
+++ khtml/rendering/render_form.cpp (revision 758956)
@@ -498,7 +498,7 @@
Sonnet::Dialog *spellDialog = new Sonnet::Dialog(new Sonnet::BackgroundChecker(this), 0);
connect(spellDialog, SIGNAL(replace( const QString&, int,const QString&)), this, SLOT(spellCheckerCorrected( const QString&, int,const QString&)));
connect(spellDialog, SIGNAL(misspelling( const QString&, int)), this, SLOT(spellCheckerMisspelling(const QString &,int)));
- connect(spellDialog, SIGNAL(done(const QString&)), this, SLOT(spellCheckerDone(const QString&)));
+ connect(spellDialog, SIGNAL(done(const QString&)), this, SLOT(slotSpellCheckDone(const QString&)));
connect(spellDialog, SIGNAL(cancel()), this, SLOT(spellCheckerFinished()));
connect(spellDialog, SIGNAL(stop()), this, SLOT(spellCheckerFinished()));
spellDialog->setBuffer(text());
--- khtml/css/quirks.css (revision 758956)
+++ khtml/css/quirks.css (revision 758956)
@@ -16,7 +16,7 @@
margin-left: 3px;
}
-input:not([type="image"]), textarea, button, select {
+input:not([type="image"]):not([type="radio"]):not([type="checkbox"]):not([type="file"]), textarea, button, select:not([size="0"]):not([size="1"]), select[multiple] {
box-sizing: border-box;
}
--- khtml/xml/dom2_eventsimpl.cpp (revision 758956)
+++ khtml/xml/dom2_eventsimpl.cpp (revision 758956)
@@ -562,7 +562,7 @@
//Here, we need to map Qt's internal info to browser-style info.
m_detail = key->count();
- m_keyVal = key->key();
+ m_keyVal = 0; // Set below unless virtual...
m_virtKeyVal = virtKeyToQtKey()->toLeft(key->key());
// m_keyVal should contain the unicode value
--- khtml/xml/dom_elementimpl.cpp (revision 758956)
+++ khtml/xml/dom_elementimpl.cpp (revision 758956)
@@ -518,6 +518,9 @@
if (!id) return;
attributes(false)->removeNamedItem(id, false, name.implementation(), exceptioncode);
+ // it's allowed to remove attributes that don't exist.
+ if ( exceptioncode == DOMException::NOT_FOUND_ERR )
+ exceptioncode = 0;
}
AttrImpl* ElementImpl::getAttributeNode( const DOMString &name )
--- kate/syntax/data/doxygen.xml (revision 758956)
+++ kate/syntax/data/doxygen.xml (revision 758956)
@@ -26,7 +26,7 @@
* Boston, MA 02110-1301, USA. *
**********************************************************************
-->
-<language name="Doxygen" version="1.28" kateversion="2.4" section="Markup" extensions="*.dox;*.doxygen" mimetype="text/x-doxygen" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
+<language name="Doxygen" version="1.29" kateversion="2.4" section="Markup" extensions="*.dox;*.doxygen" mimetype="text/x-doxygen" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL">
<highlighting>
<!-- note: all tags may begin with a \ or @ char
so if you add/change tags you have to do it twice -->
@@ -309,7 +309,7 @@
<DetectIdentifier />
<StringDetect attribute="HTML Comment" context="SL_htmlcomment" String="<!--" />
<Detect2Chars attribute="Comment" context="#stay" char="<" char1="<" />
- <RegExpr attribute="HTML Tag" context="SL_htmltag" String="<\s*\/?\s*[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+ <RegExpr attribute="HTML Tag" context="SL_htmltag" String="<\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
</context>
<context attribute="Comment" lineEndContext="#stay" name="BlockComment">
<DetectSpaces />
@@ -326,7 +326,7 @@
<DetectIdentifier />
<RegExpr attribute="Tags" context="#stay" String="\\(<|>)" />
<Detect2Chars attribute="Comment" context="#stay" char="<" char1="<" />
- <RegExpr attribute="HTML Tag" context="ML_htmltag" String="<\s*\/?\s*[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+ <RegExpr attribute="HTML Tag" context="ML_htmltag" String="<\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
<StringDetect attribute="HTML Comment" context="ML_htmlcomment" String="<!--" />
</context>
@@ -363,7 +363,7 @@
<Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" lookAhead="true"/>
<StringDetect attribute="HTML Comment" context="ML_htmlcomment" String="<!--" />
<Detect2Chars attribute="Comment" context="#stay" char="<" char1="<" />
- <RegExpr attribute="HTML Tag" context="ML_htmltag" String="<\s*\/?\s*[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+ <RegExpr attribute="HTML Tag" context="ML_htmltag" String="<\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
<RegExpr attribute="Description" context="#stay" String="." />
</context>
<context attribute="Comment" lineEndContext="#pop" name="ML_TagWordString">
@@ -429,7 +429,7 @@
<DetectSpaces />
<StringDetect attribute="HTML Comment" context="SL_htmlcomment" String="<!--" />
<Detect2Chars attribute="Comment" context="#stay" char="<" char1="<" />
- <RegExpr attribute="HTML Tag" context="SL_htmltag" String="<\s*\/?\s*[a-zA-Z_:][a-zA-Z0-9._:-]*" />
+ <RegExpr attribute="HTML Tag" context="SL_htmltag" String="<\/?[a-zA-Z_:][a-zA-Z0-9._:-]*" />
<RegExpr attribute="Description" context="#stay" String="." />
</context>
<context attribute="Comment" lineEndContext="#pop" name="SL_TagWordString">
--- kjsembed/kjsembed/qobject_binding.cpp (revision 758956)
+++ kjsembed/kjsembed/qobject_binding.cpp (revision 758956)
@@ -28,6 +28,7 @@
#include
#include
#include
+#include <QWidget>
#include "slotproxy.h"
#include "eventproxy.h"
@@ -669,7 +670,12 @@
case QVariant::UserType: {
int tp = QMetaType::type( metaMember.typeName() );
switch( tp ) {
- case QMetaType::QWidgetStar:
+ case QMetaType::QWidgetStar: {
+ QVariant v(tp, param[0]);
+ QWidget* widget = v.value< QWidget* >();
+ if( widget )
+ return KJSEmbed::createQObject(exec, widget, KJSEmbed::ObjectBinding::QObjOwned);
+ } // fall through
case QMetaType::QObjectStar: {
QVariant v(tp, param[0]);
QObject* obj = v.value< QObject* >();
--- kfile/kfilewidget.cpp (revision 758956)
+++ kfile/kfilewidget.cpp (revision 758956)
@@ -392,7 +392,7 @@
// the Location label/edit
d->locationLabel = new QLabel(i18n("&Location:"), this);
d->locationEdit = new KUrlComboBox(KUrlComboBox::Files, true, this);
- connect( d->locationEdit, SIGNAL( textChanged( const QString& ) ),
+ connect( d->locationEdit, SIGNAL( editTextChanged( const QString& ) ),
SLOT( _k_slotLocationChanged( const QString& )) );
d->updateLocationWhatsThis();
@@ -989,10 +989,10 @@
// setCurrentItem() will cause textChanged() being emitted,
// so slotLocationChanged() will be called. Make sure we don't clear
// the KDirOperator's view-selection in there
- QObject::disconnect( locationEdit, SIGNAL( textChanged( const QString& ) ),
+ QObject::disconnect( locationEdit, SIGNAL( editTextChanged( const QString& ) ),
q, SLOT( _k_slotLocationChanged( const QString& ) ) );
locationEdit->setCurrentIndex( 0 );
- QObject::connect( locationEdit, SIGNAL( textChanged( const QString& ) ),
+ QObject::connect( locationEdit, SIGNAL( editTextChanged ( const QString& ) ),
q, SLOT( _k_slotLocationChanged( const QString& )) );
locationEdit->setEditText( text );
--- kfile/kdiroperator.cpp (revision 758956)
+++ kfile/kdiroperator.cpp (revision 758956)
@@ -1563,12 +1563,12 @@
KToggleAction *shortAction = new KToggleAction(i18n("Short View"), this);
d->actionCollection->addAction("short view", shortAction);
shortAction->setIcon(KIcon(QLatin1String("view-list-icons")));
- connect(shortAction, SIGNAL(activated()), SLOT(_k_slotSimpleView()));
+ connect(shortAction, SIGNAL(triggered()), SLOT(_k_slotSimpleView()));
KToggleAction *detailedAction = new KToggleAction(i18n("Detailed View"), this);
d->actionCollection->addAction("detailed view", detailedAction);
detailedAction->setIcon(KIcon(QLatin1String("view-list-details")));
- connect(detailedAction, SIGNAL(activated()), SLOT(_k_slotDetailedView()));
+ connect(detailedAction, SIGNAL(triggered ()), SLOT(_k_slotDetailedView()));
QActionGroup* viewGroup = new QActionGroup(this);
shortAction->setActionGroup(viewGroup);
--- kfile/kdirselectdialog.cpp (revision 758956)
+++ kfile/kdirselectdialog.cpp (revision 758956)
@@ -296,7 +296,7 @@
connect( d->m_treeView, SIGNAL( customContextMenuRequested( const QPoint & )),
SLOT( _k_slotContextMenu( const QPoint & )));
- connect( d->m_urlCombo, SIGNAL( textChanged( const QString& ) ),
+ connect( d->m_urlCombo, SIGNAL( editTextChanged( const QString& ) ),
SLOT( _k_slotComboTextChanged( const QString& ) ));
connect( d->m_urlCombo, SIGNAL( activated( const QString& )),
SLOT( _k_slotUrlActivated( const QString& )));
--- kio/kio/previewjob.cpp (revision 758956)
+++ kio/kio/previewjob.cpp (revision 758956)
@@ -256,7 +256,7 @@
// Read configuration value for the maximum allowed size
KConfigGroup cg( KGlobal::config(), "PreviewSettings" );
- maximumSize = cg.readEntry( "MaximumSize", 1024*1024LL /* 1MB */ );
+ maximumSize = cg.readEntry( "MaximumSize", 5*1024*1024LL /* 5MB */ );
if (bNeedCache)
{
--- kio/kio/kdirwatch.cpp (revision 758956)
+++ kio/kio/kdirwatch.cpp (revision 758956)
@@ -609,7 +609,7 @@
(*it).m_entries.append(sub_entry);
kDebug(7001) << "Added already watched Entry " << path
<< " (for " << sub_entry->path << ")";
-#ifdef HAVE_SYS_INOTIFY
+#ifdef HAVE_SYS_INOTIFY_H
Entry* e = &(*it);
if( (e->m_mode == INotifyMode) && (e->wd > 0) ) {
int mask = IN_DELETE|IN_DELETE_SELF|IN_CREATE|IN_MOVE|IN_MOVE_SELF|IN_DONT_FOLLOW;
--- kdeui/dialogs/kconfigdialog.cpp (revision 758956)
+++ kdeui/dialogs/kconfigdialog.cpp (revision 758956)
@@ -150,7 +150,8 @@
KPageWidgetItem *item = new KPageWidgetItem( frame, itemName );
item->setHeader( header );
- item->setIcon( KIcon( pixmapName ) );
+ if ( !pixmapName.isEmpty() )
+ item->setIcon( KIcon( pixmapName ) );
q->KPageDialog::addPage( item );
return item;
--- kdeui/dialogs/kmessagebox.cpp (revision 758956)
+++ kdeui/dialogs/kmessagebox.cpp (revision 758956)
@@ -43,6 +43,38 @@
#include
#endif
+// Some i18n filters, that standard button texts are piped through
+// (the new KGuiItem object with filtered text is created from the old one).
+
+// i18n: Filter for the Yes-button text in standard message dialogs,
+// after the message caption/text have been translated.
+#define I18N_FILTER_BUTTON_YES(src, dst) \
+ KGuiItem dst(src); \
+ dst.setText( i18nc( "@action:button filter-yes", "%1", src.text() ) );
+
+// i18n: Filter for the No-button text in standard message dialogs,
+// after the message caption/text have been translated.
+#define I18N_FILTER_BUTTON_NO(src, dst) \
+ KGuiItem dst(src); \
+ dst.setText( i18nc( "@action:button filter-no", "%1", src.text() ) );
+
+// i18n: Filter for the Continue-button text in standard message dialogs,
+// after the message caption/text have been translated.
+#define I18N_FILTER_BUTTON_CONTINUE(src, dst) \
+ KGuiItem dst(src); \
+ dst.setText( i18nc( "@action:button filter-continue", "%1", src.text() ) );
+
+// i18n: Filter for the Cancel-button text in standard message dialogs,
+// after the message caption/text have been translated.
+#define I18N_FILTER_BUTTON_CANCEL(src, dst) \
+ KGuiItem dst(src); \
+ dst.setText( i18nc( "@action:button filter-cancel", "%1", src.text() ) );
+
+// i18n: Called after the button texts in standard message dialogs
+// have been filtered by the messages above. Not visible to user.
+#define I18N_POST_BUTTON_FILTER \
+ Q_UNUSED( i18nc( "@action:button post-filter", "." ) );
+
/**
* Easy MessageBox Dialog.
*
@@ -352,8 +384,8 @@
int KMessageBox::questionYesNoListWId(WId parent_id, const QString &text,
const QStringList &strlist,
const QString &caption,
- const KGuiItem &buttonYes,
- const KGuiItem &buttonNo,
+ const KGuiItem &buttonYes_,
+ const KGuiItem &buttonNo_,
const QString &dontAskAgainName,
Options options)
{
@@ -362,6 +394,10 @@
return res;
}
+ I18N_FILTER_BUTTON_YES(buttonYes_, buttonYes)
+ I18N_FILTER_BUTTON_NO(buttonNo_, buttonNo)
+ I18N_POST_BUTTON_FILTER
+
QWidget* parent = QWidget::find( parent_id );
KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Question") : caption );
@@ -410,9 +446,9 @@
int KMessageBox::questionYesNoCancelWId(WId parent_id,
const QString &text,
const QString &caption,
- const KGuiItem &buttonYes,
- const KGuiItem &buttonNo,
- const KGuiItem &buttonCancel,
+ const KGuiItem &buttonYes_,
+ const KGuiItem &buttonNo_,
+ const KGuiItem &buttonCancel_,
const QString &dontAskAgainName,
Options options)
{
@@ -421,6 +457,11 @@
return res;
}
+ I18N_FILTER_BUTTON_YES(buttonYes_, buttonYes)
+ I18N_FILTER_BUTTON_NO(buttonNo_, buttonNo)
+ I18N_FILTER_BUTTON_CANCEL(buttonCancel_, buttonCancel)
+ I18N_POST_BUTTON_FILTER
+
QWidget* parent = QWidget::find( parent_id );
KDialog *dialog= new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Question") : caption );
@@ -498,8 +539,8 @@
int KMessageBox::warningYesNoListWId(WId parent_id, const QString &text,
const QStringList &strlist,
const QString &caption,
- const KGuiItem &buttonYes,
- const KGuiItem &buttonNo,
+ const KGuiItem &buttonYes_,
+ const KGuiItem &buttonNo_,
const QString &dontAskAgainName,
Options options)
{
@@ -513,6 +554,10 @@
return res;
}
+ I18N_FILTER_BUTTON_YES(buttonYes_, buttonYes)
+ I18N_FILTER_BUTTON_NO(buttonNo_, buttonNo)
+ I18N_POST_BUTTON_FILTER
+
QWidget* parent = QWidget::find( parent_id );
KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Warning") : caption );
@@ -584,14 +629,18 @@
int KMessageBox::warningContinueCancelListWId(WId parent_id, const QString &text,
const QStringList &strlist,
const QString &caption,
- const KGuiItem &buttonContinue,
- const KGuiItem &buttonCancel,
+ const KGuiItem &buttonContinue_,
+ const KGuiItem &buttonCancel_,
const QString &dontAskAgainName,
Options options)
{
if ( !shouldBeShownContinue(dontAskAgainName) )
return Continue;
+ I18N_FILTER_BUTTON_CONTINUE(buttonContinue_, buttonContinue)
+ I18N_FILTER_BUTTON_CANCEL(buttonCancel_, buttonCancel)
+ I18N_POST_BUTTON_FILTER
+
QWidget* parent = QWidget::find( parent_id );
KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Warning") : caption );
@@ -666,9 +715,9 @@
int KMessageBox::warningYesNoCancelListWId(WId parent_id, const QString &text,
const QStringList &strlist,
const QString &caption,
- const KGuiItem &buttonYes,
- const KGuiItem &buttonNo,
- const KGuiItem &buttonCancel,
+ const KGuiItem &buttonYes_,
+ const KGuiItem &buttonNo_,
+ const KGuiItem &buttonCancel_,
const QString &dontAskAgainName,
Options options)
{
@@ -677,6 +726,11 @@
return res;
}
+ I18N_FILTER_BUTTON_YES(buttonYes_, buttonYes)
+ I18N_FILTER_BUTTON_NO(buttonNo_, buttonNo)
+ I18N_FILTER_BUTTON_CANCEL(buttonCancel_, buttonCancel)
+ I18N_POST_BUTTON_FILTER
+
QWidget* parent = QWidget::find( parent_id );
KDialog *dialog = new KDialog(parent, Qt::Dialog);
dialog->setCaption( caption.isEmpty() ? i18n("Warning") : caption );
--- kdeui/icons/kiconloader.cpp (revision 758956)
+++ kdeui/icons/kiconloader.cpp (revision 758956)
@@ -217,15 +217,18 @@
}
int iconSize = pix.size().width();
- int overlaySize = 22;
- if (iconSize >= 256) {
- overlaySize = 64;
- } else if (iconSize >= 128) {
- overlaySize = 32;
- } else if (iconSize <= 22) {
+ int overlaySize;
+
+ if (iconSize < 32) {
overlaySize = 8;
- } else if (iconSize < 32) {
- overlaySize = 12;
+ } else if (iconSize <= 48) {
+ overlaySize = 16;
+ } else if (iconSize <= 96) {
+ overlaySize = 22;
+ } else if (iconSize < 256) {
+ overlaySize = 32;
+ } else {
+ overlaySize = 64;
}
QPainter painter(&pix);
--- security/crypto/crypto.cpp (revision 758956)
+++ security/crypto/crypto.cpp (revision 758956)
@@ -1465,7 +1465,7 @@
void KCryptoConfig::slotYourImport() {
- QString certFile = KFileDialog::getOpenFileName(QString(), "application/x-pkcs12");
+ QString certFile = KFileDialog::getOpenFileName(QString(), "application/x-pkcs12", this);
if (certFile.isEmpty())
return;
@@ -1551,7 +1551,8 @@
// For now, we will only export to PKCS#12
QString certFile = KFileDialog::getSaveFileName(QString(),
- "application/x-pkcs12");
+ "application/x-pkcs12",
+ this);
if (!certFile.isEmpty() && !pkcs->toFile(certFile))
KMessageBox::sorry(this, i18n("Export failed."), i18n("SSL"));
@@ -1761,7 +1762,7 @@
void KCryptoConfig::slotCAImport() {
- QString certFile = KFileDialog::getOpenFileName(QString(), "application/x-x509-ca-cert");
+ QString certFile = KFileDialog::getOpenFileName(QString(), "application/x-x509-ca-cert", this);
if (certFile.isEmpty())
return;
--- kdecore/sonnet/filter.cpp (revision 758956)
+++ kdecore/sonnet/filter.cpp (revision 758956)
@@ -180,7 +180,7 @@
// currentPosition == -1 means we reached the beginning
int start = (currentPosition < 0) ? 0 : ++currentPosition;
currentPosition = pos ;
- if ( m_buffer.at( currentPosition ).isLetter() ) {
+ if ( currentPosition < m_buffer.length() && m_buffer.at( currentPosition ).isLetter() ) {
while ( m_buffer.at( currentPosition ).isLetter() ) {
foundWord.append( m_buffer.at( currentPosition ) );
++currentPosition;
--- knewstuff/knewstuff2/ui/downloaddialog.cpp (revision 758956)
+++ knewstuff/knewstuff2/ui/downloaddialog.cpp (revision 758956)
@@ -150,8 +150,8 @@
m_root = new QWidget(this);
m_root->setBackgroundRole(QPalette::Base);
- QGridLayout* _layout = new QGridLayout(m_root);
- _layout->setVerticalSpacing (10);
+ QVBoxLayout* _layout = new QVBoxLayout(m_root);
+ _layout->setSpacing (10);
if (m_currentFeed != NULL) {
Entry::List entries = m_currentFeed->entries();
@@ -176,9 +176,15 @@
Entry* entry = (*it);
if (entry->name().representation().toLower().contains(m_searchText.toLower())) {
+ QHBoxLayout * itemLayout = new QHBoxLayout(m_root);
+ _layout->addLayout(itemLayout);
+
EntryView *part = new EntryView(m_root);
part->setBackgroundRole(row & 1 ? QPalette::AlternateBase : QPalette::Base);
- _layout->addWidget(part, row*2, 1, 2, 1);
+ itemLayout->addWidget(part);
+
+ QVBoxLayout * previewLayout = new QVBoxLayout(m_root);
+ itemLayout->insertLayout(0, previewLayout);
KDXSButton *dxsbutton = new KDXSButton(m_root);
dxsbutton->setEntry(entry);
@@ -193,10 +199,9 @@
f->setFixedSize(64, 64);
connect(pix, SIGNAL(signalLoaded(const QPixmap&)),
f, SLOT(setPixmap(const QPixmap&)));
- _layout->addWidget(f, row*2, 0);
+ previewLayout->addWidget(f);
}
- _layout->setRowStretch(row*2, 1);
- _layout->addWidget(dxsbutton, row*2+1, 0);
+ previewLayout->addWidget(dxsbutton);
part->setEntry(entry);
m_views.insert(entry, part);
Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
Added: svn:externals
+
++++++ common-symlink-fix.diff ++++++
--- cmake/modules/KDE4Macros.cmake
+++ cmake/modules/KDE4Macros.cmake
@@ -308,7 +308,7 @@ macro (KDE4_CREATE_HANDBOOK _docbook)
# TODO symlinks on non-unix platforms
if (UNIX)
# execute some cmake code on make install which creates the symlink
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${_installDest}/common\" \"${_installDest}/${dirname}/common\" )" )
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${_installDest}/common\" \"\$ENV{DESTDIR}${_installDest}/${dirname}/common\" )" )
endif (UNIX)
endif(_installDest)
++++++ kdelibs-3.97.2.tar.bz2 -> kdelibs-4.0.0.tar.bz2 ++++++
KDE/kdelibs4/kdelibs-3.97.2.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-4.0.0.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org