Skip to content

Commit

Permalink
qmake: Fix missing defines causing memory corruption (fixes zealdocs#595
Browse files Browse the repository at this point in the history
) (zealdocs#616)

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/.
  • Loading branch information
jkozera authored and trollixx committed Oct 8, 2016
1 parent e18ff9c commit 2f9dd40
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
7 changes: 7 additions & 0 deletions qmake/common.pri
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
}
7 changes: 0 additions & 7 deletions src/libs/ui/ui.pri
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2f9dd40

Please sign in to comment.