diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-11-25 20:20:31 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-11-26 20:58:23 (GMT) |
| commit | d54fe278bcbba0018bbed9a09abc35b628b0024b (patch) | |
| tree | ce389a05e58991defb0bb89f2e8ef536a1439ba5 /src/gui/dialogs | |
| parent | 2534805c3fa3dafe4fad7c35687b105c6b01fd97 (diff) | |
| download | Qt-d54fe278bcbba0018bbed9a09abc35b628b0024b.zip Qt-d54fe278bcbba0018bbed9a09abc35b628b0024b.tar.gz Qt-d54fe278bcbba0018bbed9a09abc35b628b0024b.tar.bz2 | |
Fix warning about mixing integral with non-integral type in ?:
Diffstat (limited to 'src/gui/dialogs')
| -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 b7a0026..fbdc522 100644 --- a/src/gui/dialogs/qdialog.cpp +++ b/src/gui/dialogs/qdialog.cpp @@ -282,8 +282,8 @@ QDialog::QDialog(QWidget *parent, Qt::WindowFlags f) QDialog::QDialog(QWidget *parent, const char *name, bool modal, Qt::WindowFlags f) : QWidget(*new QDialogPrivate, parent, f - | QFlag(modal ? Qt::WShowModal : 0) - | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : 0) + | QFlag(modal ? Qt::WShowModal : Qt::WindowType(0)) + | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : Qt::WindowType(0)) ) { setObjectName(QString::fromAscii(name)); |