From b7ae2eabc77011ed5e18be777106d343690a6d97 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 20 Nov 2010 17:32:59 +0000 Subject: [PATCH] Further project file clean up --- configure | 2 +- qcm/libnotify.qcm | 2 +- unixconf.pri | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 44eb92cdb..3bfeea59d 100755 --- a/configure +++ b/configure @@ -534,7 +534,7 @@ public: QString version, libs, other; VersionMode mode = VersionMin; if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) { - conf->addDefine("WITH_LIBNOTIFY"); + conf->addExtra("CONFIG += libnotify"); for(int n = 0; n < incs.count(); ++n) conf->addIncludePath(incs[n]); if(!libs.isEmpty()) diff --git a/qcm/libnotify.qcm b/qcm/libnotify.qcm index 6bdba595d..4a9e45485 100644 --- a/qcm/libnotify.qcm +++ b/qcm/libnotify.qcm @@ -24,7 +24,7 @@ public: QString version, libs, other; VersionMode mode = VersionMin; if(conf->findPkgConfig("libnotify", mode, req_ver, &version, &incs, &libs, &other)) { - conf->addDefine("WITH_LIBNOTIFY"); + conf->addExtra("CONFIG += libnotify"); for(int n = 0; n < incs.count(); ++n) conf->addIncludePath(incs[n]); if(!libs.isEmpty()) diff --git a/unixconf.pri b/unixconf.pri index 66a7c31fb..184d5204c 100644 --- a/unixconf.pri +++ b/unixconf.pri @@ -4,6 +4,10 @@ QMAKE_LFLAGS_APP += -rdynamic CONFIG += link_pkgconfig PKGCONFIG += libtorrent-rasterbar +libnotify { + DEFINES += WITH_LIBNOTIFY +} + # Man page nox { man.files = ../doc/qbittorrent-nox.1