Merge remote-tracking branch 'origin/KDE/4.10'

13 years ago · 17f89f7fa4
parent 73764362ed 284ba411d3
commit 17f89f7fa4
1 changed files with 1 additions and 2 deletions
--- a/configuredialog.cpp
+++ b/configuredialog.cpp
@ -219,8 +219,7 @@ ConfigureDialog::ConfigureDialog( QWidget *parent, bool modal )
  : KCMultiDialog( parent )
 {
  setFaceType( List );
-  setButtons( Help | Default | Cancel | Apply | Ok | User1 );
-  setButtonGuiItem( User1, KStandardGuiItem::reset() );
+  setButtons( Help | Default | Cancel | Apply | Ok | Reset );
  setModal( modal );
  KWindowSystem::setIcons( winId(), qApp->windowIcon().pixmap( IconSize( KIconLoader::Desktop ), IconSize( KIconLoader::Desktop ) ), qApp->windowIcon().pixmap(IconSize( KIconLoader::Small ), IconSize( KIconLoader::Small ) ) );
  addModule( "kmail_config_identity" );