Browse Source

Fix freebsd compilation

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
commit
cb719e2bf5
  1. 6
      configure
  2. 6
      qcm/qt4.qcm
  3. 2
      src/filesystemwatcher.h
  4. 2
      src/misc.cpp
  5. 3
      unixconf.pri

6
configure vendored

@ -346,6 +346,12 @@ public:
if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) { if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
conf->addExtra("CONFIG += debug"); conf->addExtra("CONFIG += debug");
} }
#ifdef Q_OS_FREEBSD
conf->addLib("-lexecinfo");
conf->addExtra("MANPREFIX = \$\$PREFIX");
#else
conf->addExtra("MANPREFIX = \$\$PREFIX/share");
#endif
return(QT_VERSION >= 0x040500); return(QT_VERSION >= 0x040500);
} }
}; };

6
qcm/qt4.qcm

@ -21,6 +21,12 @@ public:
if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) { if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) {
conf->addExtra("CONFIG += debug"); conf->addExtra("CONFIG += debug");
} }
#ifdef Q_OS_FREEBSD
conf->addLib("-lexecinfo");
conf->addExtra("MANPREFIX = $$PREFIX");
#else
conf->addExtra("MANPREFIX = $$PREFIX/share");
#endif
return(QT_VERSION >= 0x040500); return(QT_VERSION >= 0x040500);
} }
}; };

2
src/filesystemwatcher.h

@ -12,7 +12,7 @@
#include <QSet> #include <QSet>
#include <iostream> #include <iostream>
#include <errno.h> #include <errno.h>
#ifdef Q_WS_MAC #if defined(Q_WS_MAC) || defined(Q_OS_FREEBSD)
#include <sys/param.h> #include <sys/param.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <string.h> #include <string.h>

2
src/misc.cpp

@ -60,7 +60,7 @@ const int UNLEN = 256;
#endif #endif
#ifndef Q_WS_WIN #ifndef Q_WS_WIN
#ifdef Q_WS_MAC #if defined(Q_WS_MAC) || defined(Q_OS_FREEBSD)
#include <sys/param.h> #include <sys/param.h>
#include <sys/mount.h> #include <sys/mount.h>
#else #else

3
unixconf.pri

@ -19,7 +19,8 @@ nox {
} else { } else {
man.files = ../doc/qbittorrent.1 man.files = ../doc/qbittorrent.1
} }
man.path = $$PREFIX/share/man/man1/
man.path = $$MANPREFIX/man/man1/
INSTALLS += man INSTALLS += man
# Menu Icon # Menu Icon

Loading…
Cancel
Save