diff --git a/macxconf.pri b/macxconf.pri index 876af0850..653a9ec43 100644 --- a/macxconf.pri +++ b/macxconf.pri @@ -10,6 +10,7 @@ exists($$OUT_PWD/../conf.pri) { } LIBS += -framework Carbon -framework IOKit +CONFIG += c++11 document_icon.path = Contents/Resources document_icon.files = mac/qBitTorrentDocument.icns @@ -19,7 +20,7 @@ qt_conf.path = Contents/Resources qt_conf.files = mac/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/qt_bg.qm \ qt-translations/qt_ca.qm \ diff --git a/src/about_imp.h b/src/about_imp.h index 1dc97e492..4990f528a 100644 --- a/src/about_imp.h +++ b/src/about_imp.h @@ -69,7 +69,7 @@ class about : public QDialog, private Ui::AboutDlg{ // Set icons logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png"))); //Title - lb_name->setText(QString::fromUtf8("

qBittorrent")+QString::fromUtf8(" "VERSION"

")); + lb_name->setText(QString::fromUtf8("

qBittorrent")+QString::fromUtf8(" " VERSION"

")); // Thanks QString thanks_txt; thanks_txt += QString::fromUtf8("

I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.

"); diff --git a/src/dnsupdater.cpp b/src/dnsupdater.cpp index af9795ceb..b7d1a0d9c 100644 --- a/src/dnsupdater.cpp +++ b/src/dnsupdater.cpp @@ -76,7 +76,7 @@ void DNSUpdater::checkPublicIP() m_lastIPCheckTime = QDateTime::currentDateTime(); QNetworkRequest request; 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); } @@ -123,7 +123,7 @@ void DNSUpdater::updateDNSService() m_lastIPCheckTime = QDateTime::currentDateTime(); QNetworkRequest request; request.setUrl(getUpdateUrl()); - request.setRawHeader("User-Agent", "qBittorrent/"VERSION" chris@qbittorrent.org"); + request.setRawHeader("User-Agent", "qBittorrent/" VERSION" chris@qbittorrent.org"); manager->get(request); } diff --git a/src/mac/qt.conf b/src/mac/qt.conf index 47e7d450f..4c8277466 100644 --- a/src/mac/qt.conf +++ b/src/mac/qt.conf @@ -1,4 +1,3 @@ [Paths] - Prefix = MacOS Translations = translations Plugins = PlugIns diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/qtlibtorrent/qbtsession.cpp index 3a8bba73e..cd46234aa 100755 --- a/src/qtlibtorrent/qbtsession.cpp +++ b/src/qtlibtorrent/qbtsession.cpp @@ -421,7 +421,7 @@ void QBtSession::configureSession() { } // * Session 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; logger->addMessage(tr("HTTP user agent is %1").arg(misc::toQString(sessionSettings.user_agent))); diff --git a/src/torrentcreator/torrentcreatorthread.cpp b/src/torrentcreator/torrentcreatorthread.cpp index a87b19fc6..88f9666d1 100644 --- a/src/torrentcreator/torrentcreatorthread.cpp +++ b/src/torrentcreator/torrentcreatorthread.cpp @@ -83,7 +83,7 @@ void TorrentCreatorThread::sendProgressSignal(int progress) { void TorrentCreatorThread::run() { emit updateProgress(0); - QString creator_str("qBittorrent "VERSION); + QString creator_str("qBittorrent " VERSION); try { file_storage fs; // Adding files to the torrent