1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
Index: src/httpconnection.cpp
===================================================================
--- src/httpconnection.cpp (revision 4101)
+++ src/httpconnection.cpp (working copy)
@@ -237,6 +237,7 @@
QFile file(url);
if(!file.open(QIODevice::ReadOnly))
{
+ qDebug("File %s was not found!", qPrintable(url));
respondNotFound();
return;
}
Index: src/src.pro
===================================================================
--- src/src.pro (revision 4101)
+++ src/src.pro (working copy)
@@ -142,8 +142,9 @@
contains(DEFINES, DISABLE_GUI) {
QT = core
TARGET = qbittorrent-nox
+} else {
+ TARGET = qbittorrent
}
-else:TARGET = qbittorrent
# QMAKE_CXXFLAGS_RELEASE += -fwrapv
# QMAKE_CXXFLAGS_DEBUG += -fwrapv
@@ -211,25 +212,27 @@
}
unix:!macx:contains(DEFINES, WITH_GEOIP_EMBEDDED):message("You chose to embed GeoIP database in qBittorrent executable.")
+}
+
# Resource files
RESOURCES = icons.qrc \
lang.qrc \
search.qrc \
webui.qrc
- # Add GeoIP resource file if the GeoIP database
- # should be embedded in qBittorrent executable
- contains(DEFINES, WITH_GEOIP_EMBEDDED) {
- exists("geoip/GeoIP.dat") {
- message("GeoIP.dat was found in src/geoip/.")
- RESOURCES += geoip.qrc
- }
- else {
- DEFINES -= WITH_GEOIP_EMBEDDED
- error("GeoIP.dat was not found in src/geoip/ folder, please follow instructions in src/geoip/README.")
- }
+# Add GeoIP resource file if the GeoIP database
+# should be embedded in qBittorrent executable
+contains(DEFINES, WITH_GEOIP_EMBEDDED) {
+ exists("geoip/GeoIP.dat") {
+ message("GeoIP.dat was found in src/geoip/.")
+ RESOURCES += geoip.qrc
}
-else:message("GeoIP database will not be embedded in qBittorrent executable.")
+ else {
+ DEFINES -= WITH_GEOIP_EMBEDDED
+ error("GeoIP.dat was not found in src/geoip/ folder, please follow instructions in src/geoip/README.")
+ }
+} else {
+ message("GeoIP database will not be embedded in qBittorrent executable.")
}
# Translations
@@ -284,7 +287,7 @@
scannedfoldersmodel.h
contains(DEFINES, DISABLE_GUI) {
- HEADERS += headlessloader.h
+ HEADERS += headlessloader.h
} else {
HEADERS += GUI.h \
feedList.h \
@@ -331,7 +334,8 @@
}
}
-!contains(DEFINES, DISABLE_GUI):FORMS += ui/mainwindow.ui \
+!contains(DEFINES, DISABLE_GUI) {
+ FORMS += ui/mainwindow.ui \
ui/options.ui \
ui/about.ui \
ui/createtorrent.ui \
@@ -350,6 +354,7 @@
ui/propertieswidget.ui \
ui/peer.ui \
ui/confirmdeletiondlg.ui
+}
contains(DEFINES, DISABLE_GUI) {
include(qtsingleapp/qtsinglecoreapplication.pri)
|