Merge with develop.
--HG-- branch : feature
This commit is contained in:
commit
ce4a217c57
|
@ -75,6 +75,10 @@ const QString VCommonSettings::SettingUserDefinedMaterials = QStringLitera
|
||||||
|
|
||||||
static const QString commonIniFilename = QStringLiteral("common");
|
static const QString commonIniFilename = QStringLiteral("common");
|
||||||
|
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
const QString VCommonSettings::unixStandardSharePath = QStringLiteral("/usr/share/valentina");
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -132,6 +132,10 @@ public:
|
||||||
bool GetForbidWorkpieceFlipping() const;
|
bool GetForbidWorkpieceFlipping() const;
|
||||||
void SetForbidWorkpieceFlipping(bool value);
|
void SetForbidWorkpieceFlipping(bool value);
|
||||||
|
|
||||||
|
#if !defined(Q_OS_WIN)
|
||||||
|
static const QString unixStandardSharePath;
|
||||||
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Q_DISABLE_COPY(VCommonSettings)
|
Q_DISABLE_COPY(VCommonSettings)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user