mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-29 05:48:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9410 from Chocobo1/clazy

Browse source 
Minor fixes
This commit is contained in:
Mike Tzou 2018-08-30 12:07:34 +08:00 committed by GitHub
commit 846d8993a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
INSTALL
View file

@ -1,54 +1,49 @@
qBittorrent - A BitTorrent client in C++ / Qt4 qBittorrent - A BitTorrent client in C++ / Qt
------------------------------------------ ------------------------------------------
1) Compile and install qBittorrent with Qt4 Graphical Interface 1) Compile and install qBittorrent with Qt graphical interface
$ ./configure $ ./configure
$ make && make install $ make && make install
$ qbittorrent $ qbittorrent
will install and execute qBittorrent hopefully without any problems. will install and execute qBittorrent.
Dependencies: Dependencies:
- Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional) - Qt >= 5.5.1
- pkg-config executable - pkg-config
- libtorrent-rasterbar by Arvid Norberg (>= 1.0.6) - libtorrent-rasterbar >= 1.0.6 (by Arvid Norberg)
-> http://www.libtorrent.net * https://www.libtorrent.org/
Be careful: another library (the one used by rTorrent) uses a similar name. * Be careful: another library (the one used by rTorrent) uses a similar name
- libboost >= 1.35.x (libboost-system) - Boost >= 1.35
- python >= 2.3 (needed by search engine) - Python >= 2.7.9 / 3.3.0 (optional, runtime only)
* Run time only dependency * Required by the internal search engine
- geoip-database (optional) 2) Compile and install qBittorrent without Qt graphical interface
* If qBittorrent cannot find this database, it will try to resolve countries using the Internet but it will be a lot slower.
* Run time only dependency
2) Compile and install qBittorrent without Qt4 Graphical interface
$ ./configure --disable-gui $ ./configure --disable-gui
$ make && make install $ make && make install
$ qbittorrent $ qbittorrent-nox
will install and execute qBittorrent hopefully without any problems. will install and execute qBittorrent.
Dependencies: Dependencies:
- Qt >= 4.4.0 (libqt-devel, libqtcore, libqtnetwork) - Qt >= 5.5.1
- pkg-config executable - pkg-config
- libtorrent-rasterbar by Arvid Norberg (>= v1.0.6) - libtorrent-rasterbar >= 1.0.6 (by Arvid Norberg)
-> http://www.libtorrent.net * https://www.libtorrent.org/
Be careful: another library (the one used by rTorrent) uses a similar name. * Be careful: another library (the one used by rTorrent) uses a similar name
- libboost: libboost-filesystem, libboost-date-time, libboost-thread, libboost-serialization
- Boost >= 1.35
DOCUMENTATION: DOCUMENTATION:
Please note that there is a documentation with a "compiling howto" at http://wiki.qbittorrent.org. Please note that there is a "Compilation" section at http://wiki.qbittorrent.org.
------------------------------------------ ------------------------------------------
Christophe Dumez <chris@qbittorrent.org> sledgehammer999 <sledgehammer999@qbittorrent.org>

2
src/base/search/searchpluginmanager.cpp
View file

@ -73,7 +73,7 @@ namespace
// python 2: remove "*.pyc" files // python 2: remove "*.pyc" files
const QStringList files = QDir(dir).entryList(QDir::Files); const QStringList files = QDir(dir).entryList(QDir::Files);
for (const QString file : files) { for (const QString &file : files) {
if (file.endsWith(".pyc")) if (file.endsWith(".pyc"))
Utils::Fs::forceRemove(file); Utils::Fs::forceRemove(file);
} }

12
src/gui/cookiesdialog.ui
View file

@ -45,11 +45,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QToolButton" name="buttonAdd"> <widget class="QToolButton" name="buttonAdd"/>
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
@ -68,11 +64,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QToolButton" name="buttonDelete"> <widget class="QToolButton" name="buttonDelete"/>
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer_3">

3
src/gui/deletionconfirmationdialog.ui
View file

@ -66,9 +66,6 @@
<property name="toolTip"> <property name="toolTip">
<string>Remember choice</string> <string>Remember choice</string>
</property> </property>
<property name="text">
<string notr="true"/>
</property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
<width>24</width> <width>24</width>

12
src/gui/optionsdialog.ui
View file

@ -2987,11 +2987,7 @@ Use ';' to split multiple entries. Can use wildcard '*'.</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_11"> <layout class="QGridLayout" name="gridLayout_11">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="lblSslCertStatus"> <widget class="QLabel" name="lblSslCertStatus"/>
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="lblWebUiCrt"> <widget class="QLabel" name="lblWebUiCrt">
@ -3028,11 +3024,7 @@ Use ';' to split multiple entries. Can use wildcard '*'.</string>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="lblSslKeyStatus"> <widget class="QLabel" name="lblSslKeyStatus"/>
<property name="text">
<string notr="true"/>
</property>
</widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLabel" name="lblWebUiKey"> <widget class="QLabel" name="lblWebUiKey">