From d71a83ef0d306b8e23b2be5baa3e347116ba8253 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 6 Oct 2011 13:29:55 -0500 Subject: Apply qtkdeintegration patches to Qt3 This partially resolves Bug #528 --- src/dialogs/qfontdialog.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/dialogs/qfontdialog.cpp') diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp index 1deec00..d1c31fa 100644 --- a/src/dialogs/qfontdialog.cpp +++ b/src/dialogs/qfontdialog.cpp @@ -59,6 +59,10 @@ #include #include +#ifdef Q_WS_X11 +#include "private/qtkdeintegration_x11_p.h" +#endif + /*! \class QFontDialog qfontdialog.h \ingroup dialogs @@ -387,9 +391,15 @@ QFont QFontDialog::getFont( bool *ok, QWidget *parent,const char* name) return getFont( ok, 0, parent, name ); } +extern bool qt_use_native_dialogs; + QFont QFontDialog::getFont( bool *ok, const QFont *def, QWidget *parent, const char* name) { +#if defined(Q_WS_X11) + if ( qt_use_native_dialogs && QKDEIntegration::enabled()) + return QKDEIntegration::getFont( ok, def, parent, name ); +#endif QFont result; if ( def ) result = *def; -- cgit v1.2.3