From 103cd0c0c1f27fc1ec53cc6824d319cfe8337aff Mon Sep 17 00:00:00 2001
From: Jerzy Kozera <jerzy.kozera@gmail.com>
Date: Sat, 8 Oct 2016 04:39:22 +0200
Subject: [PATCH] qmake: Fix missing defines causing memory corruption (fixes
 #595)

Missing USE_APPINDICATOR in libs/core/ was causing the MainWindow class
declaration to be truncated, thus causing memory corruption when later used
with the full definition in libs/ui/.
---
 qmake/common.pri   | 7 +++++++
 src/libs/ui/ui.pri | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/qmake/common.pri b/qmake/common.pri
index 4e26c76b7..ac08e59f9 100644
--- a/qmake/common.pri
+++ b/qmake/common.pri
@@ -63,3 +63,10 @@ CONFIG(zeal_portable) {
 unix:!macx {
     isEmpty(PREFIX): PREFIX = /usr
 }
+
+unix:!macx:packagesExist(appindicator-0.1) {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += appindicator-0.1 gtk+-2.0
+    DEFINES += USE_APPINDICATOR
+    message("AppIndicator support: Yes.")
+}
diff --git a/src/libs/ui/ui.pri b/src/libs/ui/ui.pri
index e3933b077..ca5169df9 100644
--- a/src/libs/ui/ui.pri
+++ b/src/libs/ui/ui.pri
@@ -2,13 +2,6 @@ ZEAL_LIB_NAME = Ui
 
 QT += widgets
 
-unix:!macx:packagesExist(appindicator-0.1) {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += appindicator-0.1 gtk+-2.0
-    DEFINES += USE_APPINDICATOR
-    message("AppIndicator support: Yes.")
-}
-
 # QxtGlobalShortcut dependencies
 unix:!macx {
     QT += x11extras