github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 12:59:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2464 from Noctem/stdlib-flags

Browse source 
Fix OS X compilation and packaging
This commit is contained in:
sledgehammer999 2015-02-02 00:21:02 +02:00
commit d0b476a4be
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
macxconf.pri
View file

@ -10,6 +10,7 @@ exists($$OUT_PWD/../conf.pri) {
} }
LIBS += -framework Carbon -framework IOKit LIBS += -framework Carbon -framework IOKit
CONFIG += c++11
document_icon.path = Contents/Resources document_icon.path = Contents/Resources
document_icon.files = mac/qBitTorrentDocument.icns document_icon.files = mac/qBitTorrentDocument.icns
@ -19,7 +20,7 @@ qt_conf.path = Contents/Resources
qt_conf.files = mac/qt.conf qt_conf.files = mac/qt.conf
QMAKE_BUNDLE_DATA += qt_conf QMAKE_BUNDLE_DATA += qt_conf
qt_translations.path = Contents/MacOS/translations qt_translations.path = Contents/translations
qt_translations.files = qt-translations/qt_ar.qm \ qt_translations.files = qt-translations/qt_ar.qm \
qt-translations/qt_bg.qm \ qt-translations/qt_bg.qm \
qt-translations/qt_ca.qm \ qt-translations/qt_ca.qm \

2
src/about_imp.h
View file

@ -69,7 +69,7 @@ class about : public QDialog, private Ui::AboutDlg{
// Set icons // Set icons
logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png"))); logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
//Title //Title
lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>")); lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" " VERSION"</h1></b>"));
// Thanks // Thanks
QString thanks_txt; QString thanks_txt;
thanks_txt += QString::fromUtf8("<p>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</p>"); thanks_txt += QString::fromUtf8("<p>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</p>");

4
src/dnsupdater.cpp
View file

@ -76,7 +76,7 @@ void DNSUpdater::checkPublicIP()
m_lastIPCheckTime = QDateTime::currentDateTime(); m_lastIPCheckTime = QDateTime::currentDateTime();
QNetworkRequest request; QNetworkRequest request;
request.setUrl(QUrl("http://checkip.dyndns.org")); request.setUrl(QUrl("http://checkip.dyndns.org"));
request.setRawHeader("User-Agent", "qBittorrent/"VERSION" chris@qbittorrent.org"); request.setRawHeader("User-Agent", "qBittorrent/" VERSION" chris@qbittorrent.org");
manager->get(request); manager->get(request);
} }
@ -123,7 +123,7 @@ void DNSUpdater::updateDNSService()
m_lastIPCheckTime = QDateTime::currentDateTime(); m_lastIPCheckTime = QDateTime::currentDateTime();
QNetworkRequest request; QNetworkRequest request;
request.setUrl(getUpdateUrl()); request.setUrl(getUpdateUrl());
request.setRawHeader("User-Agent", "qBittorrent/"VERSION" chris@qbittorrent.org"); request.setRawHeader("User-Agent", "qBittorrent/" VERSION" chris@qbittorrent.org");
manager->get(request); manager->get(request);
} }

1
src/mac/qt.conf
View file

@ -1,4 +1,3 @@
[Paths] [Paths]
Prefix = MacOS
Translations = translations Translations = translations
Plugins = PlugIns Plugins = PlugIns

2
src/qtlibtorrent/qbtsession.cpp
View file

@ -421,7 +421,7 @@ void QBtSession::configureSession() {
} }
// * Session settings // * Session settings
session_settings sessionSettings = s->settings(); session_settings sessionSettings = s->settings();
sessionSettings.user_agent = "qBittorrent "VERSION; sessionSettings.user_agent = "qBittorrent " VERSION;
//std::cout << "HTTP user agent is " << sessionSettings.user_agent << std::endl; //std::cout << "HTTP user agent is " << sessionSettings.user_agent << std::endl;
logger->addMessage(tr("HTTP user agent is %1").arg(misc::toQString(sessionSettings.user_agent))); logger->addMessage(tr("HTTP user agent is %1").arg(misc::toQString(sessionSettings.user_agent)));

2
src/torrentcreator/torrentcreatorthread.cpp
View file

@ -83,7 +83,7 @@ void TorrentCreatorThread::sendProgressSignal(int progress) {
void TorrentCreatorThread::run() { void TorrentCreatorThread::run() {
emit updateProgress(0); emit updateProgress(0);
QString creator_str("qBittorrent "VERSION); QString creator_str("qBittorrent " VERSION);
try { try {
file_storage fs; file_storage fs;
// Adding files to the torrent // Adding files to the torrent