Merge branch 'master' of ssh://git.salome-platform.org/modules/gui

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

diff --git a/src/Qtx/Qtx.h b/src/Qtx/Qtx.h
index 4efece8995628974f13e425bd698a8aedbbef2f5..429653bc1d012acfbcd6b7eb6b431d80b65c961f 100755 (executable)
--- a/src/Qtx/Qtx.h
+++ b/src/Qtx/Qtx.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -258,6 +258,8 @@ public:
   static QString        backgroundToString( const BackgroundData& );
   static BackgroundData stringToBackground( const QString& );
 
+  static long        versionToId( const QString& );
+
 #ifndef WIN32
   static void*       getDisplay();
   static Qt::HANDLE  getVisual();