mirror of
https://github.com/martinrotter/rssguard.git
synced 2024-12-25 23:54:15 +01:00
Fixed stringification - 2.
This commit is contained in:
parent
d8b355ad83
commit
3f6d84344c
@ -127,7 +127,7 @@ isEmpty(APP_REVISION) {
|
||||
APP_REVISION = "-"
|
||||
}
|
||||
|
||||
DEFINES += APP_REVISION=\"$$APP_REVISION\"
|
||||
DEFINES += APP_REVISION='"\\\"$$APP_REVISION\\\""'
|
||||
|
||||
message(rssguard: RSS Guard version is: '$$APP_VERSION'.)
|
||||
message(rssguard: Detected Qt version: '$$QT_VERSION'.)
|
||||
|
@ -20,9 +20,6 @@
|
||||
|
||||
#include <QtGlobal>
|
||||
|
||||
#define _STR(x) #x
|
||||
#define STRFY(x) _STR(x)
|
||||
|
||||
#define SERVICE_CODE_STD_RSS "std-rss"
|
||||
#define SERVICE_CODE_TT_RSS "tt-rss"
|
||||
#define SERVICE_CODE_OWNCLOUD "owncloud"
|
||||
|
@ -105,7 +105,7 @@ void FormAbout::loadLicenseAndInformation() {
|
||||
"<b>Qt:</b> %6 (compiled against %7)<br>").arg(qApp->applicationVersion(),
|
||||
APP_SYSTEM_NAME,
|
||||
APP_SYSTEM_VERSION,
|
||||
STRFY(APP_REVISION),
|
||||
APP_REVISION,
|
||||
TextFactory::parseDateTime(QString("%1 %2").arg(__DATE__,
|
||||
__TIME__)).toString(Qt::DefaultLocaleShortDate),
|
||||
qVersion(),
|
||||
|
@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
|
||||
Application::setApplicationVersion(APP_VERSION);
|
||||
Application::setOrganizationName(APP_AUTHOR);
|
||||
Application::setOrganizationDomain(APP_URL);
|
||||
Application::setWindowIcon(QIcon(STRFY(APP_ICON_PATH)));
|
||||
Application::setWindowIcon(QIcon(APP_ICON_PATH));
|
||||
|
||||
qDebug().nospace() << "Creating main application form in thread: \'" << QThread::currentThreadId() << "\'.";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user