diff options
| author | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-02-22 15:19:44 (GMT) |
|---|---|---|
| committer | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-02-22 15:19:44 (GMT) |
| commit | 7a328e4f69f10f4fea6d48746ff214030794328d (patch) | |
| tree | 6c69b59ca94655c544e1ff54c01e03f7bc589270 /src | |
| parent | 0094e35f2303f5cf43d8fb97330efce916250bf9 (diff) | |
| download | Qt-7a328e4f69f10f4fea6d48746ff214030794328d.zip Qt-7a328e4f69f10f4fea6d48746ff214030794328d.tar.gz Qt-7a328e4f69f10f4fea6d48746ff214030794328d.tar.bz2 | |
Build fix for 976a2b6ad1f95175d8d0be2d1eb7603cf4e4026a.
Forgot to add some #ifdef's.
Reviewed-by: Richard Moe Gustavsen
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/dialogs/qfontdialog.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp index 4358313..a4bf15d 100644 --- a/src/gui/dialogs/qfontdialog.cpp +++ b/src/gui/dialogs/qfontdialog.cpp @@ -994,7 +994,7 @@ void QFontDialog::setVisible(bool visible) return; } else if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden)) return; - +#ifdef Q_WS_MAC if (d->canBeNativeDialog()){ if (d->setVisible_sys(visible)){ d->nativeDialogInUse = true; @@ -1006,7 +1006,7 @@ void QFontDialog::setVisible(bool visible) setAttribute(Qt::WA_DontShowOnScreen, false); } } - +#endif // Q_WS_MAC QDialog::setVisible(visible); } @@ -1038,6 +1038,7 @@ void QFontDialog::done(int result) d->memberToDisconnectOnClose.clear(); } +#ifdef Q_WS_MAC bool QFontDialogPrivate::canBeNativeDialog() { Q_Q(QFontDialog); @@ -1052,6 +1053,7 @@ bool QFontDialogPrivate::canBeNativeDialog() QLatin1String dynamicName(q->metaObject()->className()); return (staticName == dynamicName); } +#endif // Q_WS_MAC /*! \fn QFont QFontDialog::getFont(bool *ok, const QFont &initial, QWidget* parent, const char* name) |