X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FStyle%2FStyle_Salome.h;h=846022e9d041c4efd584de42fe8b91c904a7be2e;hb=d6bd12111347879cd8dbe1a15ac4d6ba32ce0d6b;hp=45ee1309c314e415675cd2b241bb777ba63e2460;hpb=e07448c48ea5b2127e34fc7b8c3427d01c7ce17b;p=modules%2Fgui.git diff --git a/src/Style/Style_Salome.h b/src/Style/Style_Salome.h index 45ee1309c..846022e9d 100644 --- a/src/Style/Style_Salome.h +++ b/src/Style/Style_Salome.h @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // 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 @@ -24,9 +24,12 @@ #define STYLE_SALOME_H #include "Style.h" - +#include +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #include - +#else +#include +#endif class Style_Model; class QApplication; @@ -34,7 +37,12 @@ class QWidget; class QPainter; class QtxResourceMgr; -class STYLE_SALOME_EXPORT Style_Salome : public QWindowsStyle +class STYLE_SALOME_EXPORT Style_Salome +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) +: public QWindowsStyle +#else +: public QCommonStyle +#endif { Q_OBJECT