diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-05-12 00:18:56 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-05-12 00:18:56 (GMT) |
| commit | a7d54ce95b9cb1cd923ea202fc7b561792003d0d (patch) | |
| tree | ca33410ab469c0f10040260e1d133ba835c1017f /src/gui/dialogs/qdialog.h | |
| parent | ee533dd0818c3bf7c940cd2d543adb1c6807dd1c (diff) | |
| parent | 4af513212d9ca9ed88e18bddaabd90006aca8541 (diff) | |
| download | Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.zip Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.tar.gz Qt-a7d54ce95b9cb1cd923ea202fc7b561792003d0d.tar.bz2 | |
Merge branch 'master' into contiguouscache
Diffstat (limited to 'src/gui/dialogs/qdialog.h')
| -rw-r--r-- | src/gui/dialogs/qdialog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/dialogs/qdialog.h b/src/gui/dialogs/qdialog.h index ee1997a..bd86251 100644 --- a/src/gui/dialogs/qdialog.h +++ b/src/gui/dialogs/qdialog.h @@ -107,7 +107,7 @@ public Q_SLOTS: protected: QDialog(QDialogPrivate &, QWidget *parent, Qt::WindowFlags f = 0); -#ifdef Q_OS_WINCE +#ifdef Q_WS_WINCE bool event(QEvent *e); #endif void keyPressEvent(QKeyEvent *); @@ -124,7 +124,7 @@ private: Q_DECLARE_PRIVATE(QDialog) Q_DISABLE_COPY(QDialog) -#ifdef Q_OS_WINCE_WM +#ifdef Q_WS_WINCE_WM Q_PRIVATE_SLOT(d_func(), void _q_doneAction()) #endif }; |