From 3f6d84344cb59aa1f34ed7cd135e7cdeea9404f8 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 22 Jun 2016 20:36:39 +0200
Subject: [PATCH] Fixed stringification - 2.

---
 rssguard.pro                  | 2 +-
 src/definitions/definitions.h | 3 ---
 src/gui/dialogs/formabout.cpp | 2 +-
 src/main.cpp                  | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/rssguard.pro b/rssguard.pro
index 7b60aa838..18cd35829 100755
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -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'.)
diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h
index f24526910..caccd5ec0 100755
--- a/src/definitions/definitions.h
+++ b/src/definitions/definitions.h
@@ -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"
diff --git a/src/gui/dialogs/formabout.cpp b/src/gui/dialogs/formabout.cpp
index ea44b2237..3a09bf8e3 100755
--- a/src/gui/dialogs/formabout.cpp
+++ b/src/gui/dialogs/formabout.cpp
@@ -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(),
diff --git a/src/main.cpp b/src/main.cpp
index 173095d38..1256fd4e4 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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() << "\'.";