Commit graph

7138 commits

Author SHA1 Message Date
Eugene Shalygin
05e4d4fc0d cmake: copy qt version requirements from autotools
Set versions 4.8.0 and 5.2.0 as minimal required for Qt4 and Qt5.
2016-03-07 22:38:40 +01:00
sledgehammer999
8656c1897d Merge pull request #4922 from evsh/cmake
cmake: fix man installation
2016-03-07 14:17:02 -06:00
Eugene Shalygin
6800c1a6ad cmake: fix man installation
Fix copy-n-paste error: for non-GUI build we have to install
qbittorrent-nox.1, but not qbittorrent.1.
2016-03-07 15:15:38 +01:00
Chocobo1
dd2dcc4147 Fix additional space in comment label 2016-03-07 12:34:01 +08:00
thalieht
1fa6f3123b add toggle columns for peerlist 2016-03-06 23:59:36 +02:00
sledgehammer999
80ac326f28 Merge pull request #4911 from glassez/fixes
Fix save path bugs
2016-03-06 15:46:46 -06:00
Vladimir Golovnev (Glassez)
c047ef5b37 Fix save path bugs 2016-03-06 21:23:15 +03:00
sledgehammer999
b11ab06bb2 Merge pull request #4904 from UnDifferential/master
Support SSL certificate bundles. Closes #4896.
2016-03-06 10:49:14 -06:00
UnDifferential
f50a8d4f59 Support SSL certificate bundles. Issue #4896. 2016-03-05 14:10:28 -05:00
sledgehammer999
45617e086c Merge pull request #4908 from evsh/cmake
cmake: fix systemd unit install path
2016-03-05 13:05:30 -06:00
Eugene Shalygin
5996738030 cmake: fix systemd unit install path 2016-03-05 19:23:43 +01:00
sledgehammer999
46a355675e Fix commit 83e931766f (wrong conflict resolution). 2016-03-05 19:49:15 +02:00
sledgehammer999
89b334d71c Merge pull request #4451 from netjunki/master
add a remaining column to the torrent content model
2016-03-05 10:42:14 -06:00
sledgehammer999
8372c819e9 Merge pull request #4903 from evsh/cmake
fix cmake build
2016-03-05 08:51:34 -06:00
sledgehammer999
96c2947283 Merge pull request #4849 from Chocobo1/run_ext_slash
Save "Run external program" input as is. Closes #4830.
2016-03-05 08:51:14 -06:00
Chocobo1
83e931766f Add tip about adding quotation marks around parameter 2016-03-05 11:34:56 +08:00
Chocobo1
6835b99f10 Save "Run external program" input as is. Closes #4830. 2016-03-05 11:33:55 +08:00
Eugene Shalygin
45b1a75d56 fix cmake build 2016-03-05 00:36:17 +01:00
sledgehammer999
15ec515872 Merge pull request #4877 from evsh/cmake
add basic cmake support
2016-03-04 17:30:08 -06:00
sledgehammer999
0190ac9037 Merge pull request #4885 from Chocobo1/comment_scroll
Put comment_lbl in QScrollArea.
2016-03-04 17:28:42 -06:00
sledgehammer999
ee0306c4fd Merge pull request #4883 from evsh/fix-avg-speed-units
Fix typos in speed label text
2016-03-04 17:28:12 -06:00
sledgehammer999
56605cd0c3 Merge pull request #4865 from Chocobo1/os_name
Shorten crash report on windows
2016-03-04 17:27:48 -06:00
sledgehammer999
3ddb1b98b3 Merge pull request #4833 from dsemi/master
Do not try to parse request message when content-length is 0
2016-03-04 17:26:28 -06:00
sledgehammer999
8b559a8b51 Merge pull request #4824 from starius/mxe-compat
compatibility with MXE
2016-03-04 17:25:57 -06:00
sledgehammer999
1cfda610cc Merge pull request #4781 from DoumanAsh/python_align_search_style
[search engine] Align search engine url getting mechanism. Closes #4778
2016-03-04 17:25:05 -06:00
sledgehammer999
6ff929e567 Merge pull request #4784 from glassez/asm
Implement Advanced Saving Management subsystem
2016-03-04 17:22:06 -06:00
Vladimir Golovnev (Glassez)
dd34663224 Implement Advanced Saving Management subsystem
Closes #4696
2016-03-04 19:59:53 +03:00
Vladimir Golovnev (Glassez)
d05d5a85a5 Move Preferences backend code into SettingsStorage class
Closes #4764
2016-03-04 08:39:00 +03:00
Boris Nagaev
f4dc5c6809 configure: pass variable QMAKE_LRELEASE to qmake 2016-03-03 07:54:34 +03:00
Boris Nagaev
e4c8862cc5 winconf-mingw.pri: clean library names
* remove versions from libraries,
  * remove *.dll from libraries
    (actual name of library files can be "libfoo.a")
2016-03-03 07:52:57 +03:00
Boris Nagaev
39d8f09c38 winconf.pri: change example library path for build
Path with "<", ">" causes errors when building in MXE.
http://mxe.cc/

Removing or commenting out these hardcoded paths is not
desirable, as they serve as a guide (on what to edit) for
the newcomers that want to build on windows.

See https://github.com/qbittorrent/qBittorrent/pull/4824#issuecomment-186936960
2016-03-03 07:52:57 +03:00
Boris Nagaev
fa2a1ad6d3 winconf.pri: use mask "win32-g++*"
Mask "win32-g++" doesn't match MXE.
Mask "win32-g++*" match MXE.
See http://stackoverflow.com/a/14523545
See http://mxe.cc
2016-03-03 07:50:20 +03:00
Chocobo1
94ae44bb71 Put comment_lbl in QScrollArea. Closes #4881. 2016-03-02 12:05:56 +08:00
Eugene Shalygin
7080d3da98 Fix typos in speed label text
Qt's tr() ate 'true' parameter, which was supposed to be for
friendlyUnit()
2016-03-01 23:49:33 +01:00
Dan Seminara
d75564b885 Do not try to parse request message when content-length is 0 2016-02-29 15:57:34 -05:00
Eugene Shalygin
64daecb266 add basic cmake support 2016-02-29 12:53:43 +01:00
Chocobo1
d0e31adaf7 Create helper function to get libtorrent version 2016-02-28 17:47:43 +08:00
Chocobo1
12627bbc10 Create helper function to get boost version 2016-02-28 17:47:42 +08:00
Chocobo1
498f5e3877 Create helper function to get OS name 2016-02-28 13:23:06 +08:00
Eugene Shalygin
8baa144933 Use correct piece size while calling torrent_info::map_block()
This should fix crashes. Issue #4597
2016-02-27 21:07:54 +01:00
Eugene Shalygin
b24bdcb8d9 Revert "Temporarily revert PR #2885 (filename column in peers view)."
This reverts commit 69d52a06d7.
2016-02-27 20:51:39 +01:00
Chocobo1
7b2fab411c Comment out "List of linked Modules" section in windows crash report.
It is bloating the crash report with unhelpful messages.
2016-02-27 05:42:48 +08:00
Vladimir Golovnev (Glassez)
a96cabfe73 Make AddNewTorrentDialog behavior uniform 2016-02-23 16:02:17 +03:00
sledgehammer999
654c8edc6b Merge pull request #4831 from Chocobo1/mail_time
Fix malformed date header in email.
2016-02-21 16:41:31 -06:00
Chocobo1
f83f3b84ca Follow project coding style. Issue #2192. 2016-02-22 03:18:37 +08:00
Chocobo1
60417a598a Simplify statement 2016-02-22 03:18:35 +08:00
Chocobo1
41fe85b624 Fix malformed date header in email. Closes #4828. 2016-02-22 03:18:02 +08:00
sledgehammer999
c1f7446c26 Partially revert decfae7b8a. Newer libtorrent RC_1_1 has added back the missing variables. 2016-02-21 18:42:55 +02:00
sledgehammer999
12e1cae93c Merge pull request #4810 from Chocobo1/addtor_fixup
Remove additional vertical spacer.
2016-02-21 09:46:35 -06:00
Chocobo1
ebc7997dbf Remove additional vertical spacer.
Fixup of 843f7ed.
2016-02-17 22:47:39 +08:00