From 5ae82a06c308960c66757b0a956500b05b83f002 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 28 Jul 2012 15:50:52 -0500 Subject: Fix build warnings Thanks to Bruce Sass for the patch! (cherry picked from commit ebcb1d80bf517aceb69778e1e9f67e5f4da8c484) --- src/dialogs/qdialog.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/dialogs/qdialog.cpp') diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp index a80f509..04f72a2 100644 --- a/src/dialogs/qdialog.cpp +++ b/src/dialogs/qdialog.cpp @@ -1077,13 +1077,14 @@ void QDialog::showExtension( bool showIt ) /*! \reimp */ QSize QDialog::sizeHint() const { - if ( d->extension ) + if ( d->extension ) { if ( d->orientation == Horizontal ) return QSize( QWidget::sizeHint().width(), QMAX( QWidget::sizeHint().height(),d->extension->sizeHint().height() ) ); else return QSize( QMAX( QWidget::sizeHint().width(), d->extension->sizeHint().width() ), QWidget::sizeHint().height() ); + } return QWidget::sizeHint(); } @@ -1092,13 +1093,14 @@ QSize QDialog::sizeHint() const /*! \reimp */ QSize QDialog::minimumSizeHint() const { - if ( d->extension ) + if ( d->extension ) { if (d->orientation == Horizontal ) return QSize( QWidget::minimumSizeHint().width(), QMAX( QWidget::minimumSizeHint().height(), d->extension->minimumSizeHint().height() ) ); else return QSize( QMAX( QWidget::minimumSizeHint().width(), d->extension->minimumSizeHint().width() ), QWidget::minimumSizeHint().height() ); + } return QWidget::minimumSizeHint(); } -- cgit v1.2.3