Merge changes from 'master' branch.

[modules/gui.git] / src / Qtx / Qtx.h

diff --git a/src/Qtx/Qtx.h b/src/Qtx/Qtx.h
index 807002e74db3fb7610ba85124831bec5ba842a38..164b46c042dce5f94e8eeb728a9c18f4f8af8d5c 100755 (executable)
--- a/src/Qtx/Qtx.h
+++ b/src/Qtx/Qtx.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -44,6 +44,7 @@
 
 #include <QString>
 #include <QList>
+#include <QFont>
 #include <QColor>
 #include <QImage>
 #include <QPixmap>
@@ -276,10 +277,16 @@ public:
 
   static QString     qtDir( const QString& = QString());
 
+  static QFont   stringToFont( const QString& fontDescription );
+
 #ifndef WIN32
   static void*       getDisplay();
   static Qt::HANDLE  getVisual();
 #endif
+
+#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+  static void initDefaultSurfaceFormat();
+#endif
 };
 
 #endif