FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move target exe to subdir when compiling.

Browse Source
This commit is contained in:
Martin Rotter 2016-08-13 20:29:23 +02:00
parent 5a33076ac0
commit 1695af454b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rssguard.pro
View File

@ -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) { isEmpty(LRELEASE_EXECUTABLE) {
LRELEASE_EXECUTABLE = lrelease LRELEASE_EXECUTABLE = lrelease
@ -125,7 +131,7 @@ DEFINES += APP_REVISION='"\\\"$$APP_REVISION\\\""'
message(rssguard: RSS Guard version is: \"$$APP_VERSION\".) message(rssguard: RSS Guard version is: \"$$APP_VERSION\".)
message(rssguard: Detected Qt version: \"$$QT_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: Prefix directory: \"$$PREFIX\".)
message(rssguard: Build revision: \"$$APP_REVISION\".) message(rssguard: Build revision: \"$$APP_REVISION\".)
message(rssguard: lrelease executable name: \"$$LRELEASE_EXECUTABLE\".) message(rssguard: lrelease executable name: \"$$LRELEASE_EXECUTABLE\".)

2
src/miscellaneous/skinfactory.cpp
View File

@ -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) { void SkinFactory::loadSkinFromData(const Skin &skin) {