Merge pull request #44 from AsamK/improve_qmake

Improve qmake: "make install" support and ability to change install prefix
This commit is contained in:
Cyril Soler 2015-08-26 20:38:27 -04:00
commit b8459b3161
25 changed files with 124 additions and 74 deletions

View file

@ -70,11 +70,7 @@ SoundManager::SoundManager() : QObject()
void SoundManager::soundEvents(SoundEvents &events)
{
#ifdef WINDOWS_SYS
QDir baseDir = QDir(qApp->applicationDirPath() + "/sounds");
#else
QDir baseDir = QDir("/usr/share/RetroShare06/sounds");
#endif
QDir baseDir = QDir(QString::fromUtf8(RsAccounts::DataDirectory().c_str()) + "/sounds");
events.mDefaultPath = baseDir.absolutePath();