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

Fixed stringification - 2.

Browse Source
This commit is contained in:
Martin Rotter 2016-06-22 20:36:39 +02:00
parent d8b355ad83
commit 3f6d84344c
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rssguard.pro
View File

@ -127,7 +127,7 @@ isEmpty(APP_REVISION) {
APP_REVISION = "-" APP_REVISION = "-"
} }
DEFINES += APP_REVISION=\"$$APP_REVISION\" 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'.)

3
src/definitions/definitions.h
View File

@ -20,9 +20,6 @@
#include <QtGlobal> #include <QtGlobal>
#define _STR(x) #x
#define STRFY(x) _STR(x)
#define SERVICE_CODE_STD_RSS "std-rss" #define SERVICE_CODE_STD_RSS "std-rss"
#define SERVICE_CODE_TT_RSS "tt-rss" #define SERVICE_CODE_TT_RSS "tt-rss"
#define SERVICE_CODE_OWNCLOUD "owncloud" #define SERVICE_CODE_OWNCLOUD "owncloud"

2
src/gui/dialogs/formabout.cpp
View File

@ -105,7 +105,7 @@ void FormAbout::loadLicenseAndInformation() {
"<b>Qt:</b> %6 (compiled against %7)<br>").arg(qApp->applicationVersion(), "<b>Qt:</b> %6 (compiled against %7)<br>").arg(qApp->applicationVersion(),
APP_SYSTEM_NAME, APP_SYSTEM_NAME,
APP_SYSTEM_VERSION, APP_SYSTEM_VERSION,
STRFY(APP_REVISION), APP_REVISION,
TextFactory::parseDateTime(QString("%1 %2").arg(__DATE__, TextFactory::parseDateTime(QString("%1 %2").arg(__DATE__,
__TIME__)).toString(Qt::DefaultLocaleShortDate), __TIME__)).toString(Qt::DefaultLocaleShortDate),
qVersion(), qVersion(),

2
src/main.cpp
View File

@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
Application::setApplicationVersion(APP_VERSION); Application::setApplicationVersion(APP_VERSION);
Application::setOrganizationName(APP_AUTHOR); Application::setOrganizationName(APP_AUTHOR);
Application::setOrganizationDomain(APP_URL); 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() << "\'."; qDebug().nospace() << "Creating main application form in thread: \'" << QThread::currentThreadId() << "\'.";