diff --git a/rssguard.pro b/rssguard.pro index 80710d702..1cba14907 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -86,7 +86,13 @@ isEmpty(PREFIX) { } } -message(rssguard: Compiled application will be copied to \"$$OUT_PWD\".) +isEmpty(DESTDIR) { + unix:!mac { + DESTDIR = $$OUT_PWD/bin + } +} + +message(rssguard: Shadow copy build directory \"$$OUT_PWD\".) isEmpty(LRELEASE_EXECUTABLE) { LRELEASE_EXECUTABLE = lrelease @@ -125,7 +131,7 @@ DEFINES += APP_REVISION='"\\\"$$APP_REVISION\\\""' message(rssguard: RSS Guard version is: \"$$APP_VERSION\".) message(rssguard: Detected Qt version: \"$$QT_VERSION\".) -message(rssguard: Build directory: \"$$DESTDIR\".) +message(rssguard: Build destination directory: \"$$DESTDIR\".) message(rssguard: Prefix directory: \"$$PREFIX\".) message(rssguard: Build revision: \"$$APP_REVISION\".) message(rssguard: lrelease executable name: \"$$LRELEASE_EXECUTABLE\".) diff --git a/src/miscellaneous/skinfactory.cpp b/src/miscellaneous/skinfactory.cpp index 818d63d1b..e6e221e9f 100755 --- a/src/miscellaneous/skinfactory.cpp +++ b/src/miscellaneous/skinfactory.cpp @@ -59,7 +59,7 @@ void SkinFactory::loadCurrentSkin() { } } - qFatal("Failed to load selected or default skin. Quitting!"); + qCritical("Failed to load selected or default skin. Quitting!"); } void SkinFactory::loadSkinFromData(const Skin &skin) {