diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-04-01 09:57:12 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-04-01 10:04:03 (GMT) |
| commit | b477224b08bc1bad53050c98355281cc1c3f7ea3 (patch) | |
| tree | 418d37f68d6ee3ae5aec45b4b4b0f426c3380dc9 /src | |
| parent | bbca1080899ae809daa9e53f82e2f45dde245299 (diff) | |
| download | Qt-b477224b08bc1bad53050c98355281cc1c3f7ea3.zip Qt-b477224b08bc1bad53050c98355281cc1c3f7ea3.tar.gz Qt-b477224b08bc1bad53050c98355281cc1c3f7ea3.tar.bz2 | |
Fix compilation warnings
qdialog.cpp:261: warning: enumeral and non-enumeral type in conditional expression
Reviewed-by: Thiago
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/dialogs/qdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp index 3f8cc72..c9129c1 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -258,7 +258,7 @@ QT_BEGIN_NAMESPACE QDialog::QDialog(QWidget *parent, Qt::WindowFlags f) : QWidget(*new QDialogPrivate, parent, - f | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : 0)) + f | ((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : Qt::WindowType(0))) { #ifdef Q_WS_WINCE if (!qt_wince_is_smartphone()) @@ -295,7 +295,7 @@ QDialog::QDialog(QWidget *parent, const char *name, bool modal, Qt::WindowFlags \internal */ QDialog::QDialog(QDialogPrivate &dd, QWidget *parent, Qt::WindowFlags f) - : QWidget(dd, parent, f | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : 0)) + : QWidget(dd, parent, f | ((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : Qt::WindowType(0))) { #ifdef Q_WS_WINCE if (!qt_wince_is_smartphone()) |