Apply qtkdeintegration patches to Qt3v3.5.13

This partially resolves Bug #528

1 files changed, 10 insertions, 0 deletions

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 <private/qfontdata_p.h>
 #include <qvalidator.h>
 
+#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;