Merge with develop.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-02-17 21:01:11 +02:00
commit ce4a217c57
2 changed files with 8 additions and 0 deletions

View File

@ -75,6 +75,10 @@ const QString VCommonSettings::SettingUserDefinedMaterials = QStringLitera
static const QString commonIniFilename = QStringLiteral("common");
#if !defined(Q_OS_WIN)
const QString VCommonSettings::unixStandardSharePath = QStringLiteral("/usr/share/valentina");
#endif
namespace
{
//---------------------------------------------------------------------------------------------------------------------

View File

@ -132,6 +132,10 @@ public:
bool GetForbidWorkpieceFlipping() const;
void SetForbidWorkpieceFlipping(bool value);
#if !defined(Q_OS_WIN)
static const QString unixStandardSharePath;
#endif
private:
Q_DISABLE_COPY(VCommonSettings)