Merge with develop

This commit is contained in:
kervala 2016-10-01 14:11:10 +02:00
parent 4fc06a0c63
commit 6b24cd95d0

View file

@ -286,9 +286,9 @@ QString appendLinkExtension(const QString &link)
{ {
QString extension; QString extension;
#ifdef Q_OS_WIN32 #if defined(Q_OS_WIN32)
extension = ".lnk"; extension = ".lnk";
#elif Q_OS_MAC #elif defined(Q_OS_MAC)
// TODO // TODO
#else #else
extension = ".desktop"; extension = ".desktop";