diff options
| author | Timothy Pearson <[email protected]> | 2012-07-28 15:50:52 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-07-28 15:50:52 -0500 |
| commit | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (patch) | |
| tree | 2b17bdf68dd5a96e5ef742207426f65010aedac6 /src/dialogs/qdialog.cpp | |
| parent | b129c37241b8777665c2c063713d496e43e934b2 (diff) | |
| download | qt3-ebcb1d80bf517aceb69778e1e9f67e5f4da8c484.tar.gz qt3-ebcb1d80bf517aceb69778e1e9f67e5f4da8c484.zip | |
Fix build warnings
Thanks to Bruce Sass for the patch!
Diffstat (limited to 'src/dialogs/qdialog.cpp')
| -rw-r--r-- | src/dialogs/qdialog.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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(); } |