palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-07-01 00:28:12 +02:00
Code Issues Projects Releases Wiki Activity

Fix for searching the folder 'templates'.

Browse source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-09-29 17:13:29 +03:00
parent bf2db165da
commit 2e344b27b0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libs/vmisc/vtapesettings.cpp
View file

@ -113,7 +113,8 @@ QString VTapeSettings::StandardTablesPath() const
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QString VTapeSettings::TemplatesPath() const QString VTapeSettings::TemplatesPath() const
{ {
const QString stPath = QStringLiteral("/tables/template"); const QString stPath = QStringLiteral("/tables/templates");
const QString unixFullPath = QStringLiteral("/usr/share/valentina/tables/templates");
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
return QApplication::applicationDirPath() + stPath; return QApplication::applicationDirPath() + stPath;
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
@ -131,11 +132,12 @@ QString VTapeSettings::TemplatesPath() const
} }
else else
{ {
return QStringLiteral("/usr/share/valentina/tables/template"); return unixFullPath;
} }
} }
#else // Unix #else // Unix
#ifdef QT_DEBUG #ifdef QT_DEBUG
Q_UNUSED(unixFullPath);
return QApplication::applicationDirPath() + stPath; return QApplication::applicationDirPath() + stPath;
#else #else
QDir dir(QApplication::applicationDirPath() + stPath); QDir dir(QApplication::applicationDirPath() + stPath);
@ -145,7 +147,7 @@ QString VTapeSettings::TemplatesPath() const
} }
else else
{ {
return QStringLiteral("/usr/share/valentina/tables/template"); return unixFullPath;
} }
#endif #endif
#endif #endif