Further project file clean up

kylewooten · Nov 20, 2010 · b7ae2ea · b7ae2ea
1 parent c9ff34a
commit b7ae2ea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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