fix layout of Help and Release Notes buttons (bsc#916814) (credits to…

… tgoettlicher)
libyui · Feb 10, 2015 · a1a887c · a1a887c
1 parent 52695bd
commit a1a887c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 10 11:54:04 UTC 2015 - jsrain@suse.cz
+
+- fix layout of Help and Release Notes buttons (bsc#916814)
+  (credits to tgoettlicher)
+- 2.46.17
+
 -------------------------------------------------------------------
 Tue Feb  3 12:38:23 UTC 2015 - jsrain@suse.cz
 

diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,6 +1,6 @@
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "46")
-SET(VERSION_PATCH "16")
+SET(VERSION_PATCH "17")
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
 
 ##### This is need for the libyui core, ONLY.

diff --git a/src/YQWizard.cc b/src/YQWizard.cc
@@ -419,7 +419,7 @@ void YQWizard::updateSteps()
 
     _stepsVBox->addStretch( 99 );
     QVBoxLayout *rbl = new QVBoxLayout();
-    rbl->addWidget( _releaseNotesButton, 0, Qt::AlignCenter );
+    rbl->addWidget( (QWidget *) _releaseNotesButton->widgetRep(), 0, Qt::AlignCenter );
 
     _stepsVBox->addLayout( rbl );
     _stepsVBox->addStretch( 29 );
@@ -861,7 +861,7 @@ QLayout *YQWizard::layoutButtonBox( QWidget * parent )
     connect( _helpButton, &pclass(_helpButton)::clicked,
 	     this,	  &pclass(this)::showHelp );
 
-    hbox->addWidget( _helpButton );
+    hbox->addWidget( (QWidget *) _helpButton->widgetRep() );
 
     hbox->addSpacing( 10 );
 
@@ -873,7 +873,7 @@ QLayout *YQWizard::layoutButtonBox( QWidget * parent )
     // QT handles duplicate shortcuts, it can be kept (bnc#880983)
     _releaseNotesButton = new YQWizardButton( this, parent, _( "&Release Notes" ).toStdString ());
     YUI_CHECK_NEW( _releaseNotesButton );
-    hbox->addWidget( _releaseNotesButton );
+    hbox->addWidget( (QWidget *) _releaseNotesButton->widgetRep() );
     connect( _releaseNotesButton,      &pclass(_releaseNotesButton)::clicked,
             this,                      &pclass(this)::showReleaseNotes );