Lines 1-8
Link Here
|
1 |
--- qtox.pro.orig 2015-06-12 10:53:59 UTC |
1 |
--- qtox.pro.orig 2015-11-14 22:51:30 UTC |
2 |
+++ qtox.pro |
2 |
+++ qtox.pro |
3 |
@@ -483,6 +483,18 @@ SOURCES += \ |
3 |
@@ -203,26 +203,26 @@ unix:!macx:!android { |
4 |
src/widget/translator.cpp \ |
4 |
contains(ENABLE_SYSTRAY_UNITY_BACKEND, YES) { |
5 |
src/persistence/settingsserializer.cpp |
5 |
DEFINES += ENABLE_SYSTRAY_UNITY_BACKEND |
|
|
6 |
|
7 |
- INCLUDEPATH += "/usr/include/glib-2.0" |
8 |
- INCLUDEPATH += "/usr/include/gtk-2.0" |
9 |
- INCLUDEPATH += "/usr/include/atk-1.0" |
10 |
- INCLUDEPATH += "/usr/include/cairo" |
11 |
- INCLUDEPATH += "/usr/include/ffmpeg" |
12 |
- INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0" |
13 |
- INCLUDEPATH += "/usr/include/libappindicator-0.1" |
14 |
- INCLUDEPATH += "/usr/include/libdbusmenu-glib-0.4" |
15 |
- INCLUDEPATH += "/usr/include/pango-1.0" |
16 |
+ INCLUDEPATH += "/usr/local/include/glib-2.0" |
17 |
+ INCLUDEPATH += "/usr/local/include/gtk-2.0" |
18 |
+ INCLUDEPATH += "/usr/local/include/atk-1.0" |
19 |
+ INCLUDEPATH += "/usr/local/include/cairo" |
20 |
+ INCLUDEPATH += "/usr/local/include/ffmpeg" |
21 |
+ INCLUDEPATH += "/usr/local/include/gdk-pixbuf-2.0" |
22 |
+ INCLUDEPATH += "/usr/local/include/libappindicator-0.1" |
23 |
+ INCLUDEPATH += "/usr/local/include/libdbusmenu-glib-0.4" |
24 |
+ INCLUDEPATH += "/usr/local/include/pango-1.0" |
25 |
equals(QT_ARCH, x86_64) { |
26 |
- INCLUDEPATH += "/usr/lib64/glib-2.0/include" |
27 |
- INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include" |
28 |
- INCLUDEPATH += "/usr/lib64/gtk-2.0/include" |
29 |
- INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include" |
30 |
+ INCLUDEPATH += "/usr/local/lib/glib-2.0/include" |
31 |
+ INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/glib-2.0/include" |
32 |
+ INCLUDEPATH += "/usr/local/lib/gtk-2.0/include" |
33 |
+ INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/gtk-2.0/include" |
34 |
} |
35 |
else { |
36 |
- INCLUDEPATH += "/usr/lib/glib-2.0/include" |
37 |
- INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include" |
38 |
- INCLUDEPATH += "/usr/lib/gtk-2.0/include" |
39 |
- INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include" |
40 |
+ INCLUDEPATH += "/usr/local/lib/glib-2.0/include" |
41 |
+ INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/glib-2.0/include" |
42 |
+ INCLUDEPATH += "/usr/local/lib/gtk-2.0/include" |
43 |
+ INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/gtk-2.0/include" |
44 |
} |
45 |
|
46 |
LIBS += -lgobject-2.0 -lappindicator -lgtk-x11-2.0 |
47 |
@@ -235,24 +235,24 @@ contains(ENABLE_SYSTRAY_STATUSNOTIFIER_B |
48 |
} else { |
49 |
DEFINES += ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND |
50 |
|
51 |
- INCLUDEPATH += "/usr/include/glib-2.0" |
52 |
- INCLUDEPATH += "/usr/include/gtk-2.0" |
53 |
- INCLUDEPATH += "/usr/include/atk-1.0" |
54 |
- INCLUDEPATH += "/usr/include/cairo" |
55 |
- INCLUDEPATH += "/usr/include/ffmpeg" |
56 |
- INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0" |
57 |
- INCLUDEPATH += "/usr/include/pango-1.0" |
58 |
+ INCLUDEPATH += "/usr/local/include/glib-2.0" |
59 |
+ INCLUDEPATH += "/usr/local/include/gtk-2.0" |
60 |
+ INCLUDEPATH += "/usr/local/include/atk-1.0" |
61 |
+ INCLUDEPATH += "/usr/local/include/cairo" |
62 |
+ INCLUDEPATH += "/usr/local/include/ffmpeg" |
63 |
+ INCLUDEPATH += "/usr/local/include/gdk-pixbuf-2.0" |
64 |
+ INCLUDEPATH += "/usr/local/include/pango-1.0" |
65 |
equals(QT_ARCH, x86_64) { |
66 |
- INCLUDEPATH += "/usr/lib64/glib-2.0/include" |
67 |
- INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include" |
68 |
- INCLUDEPATH += "/usr/lib64/gtk-2.0/include" |
69 |
- INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include" |
70 |
+ INCLUDEPATH += "/usr/local/lib/glib-2.0/include" |
71 |
+ INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/glib-2.0/include" |
72 |
+ INCLUDEPATH += "/usr/local/lib/gtk-2.0/include" |
73 |
+ INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/gtk-2.0/include" |
74 |
} |
75 |
else { |
76 |
- INCLUDEPATH += "/usr/lib/glib-2.0/include" |
77 |
- INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include" |
78 |
- INCLUDEPATH += "/usr/lib/gtk-2.0/include" |
79 |
- INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include" |
80 |
+ INCLUDEPATH += "/usr/local/lib/glib-2.0/include" |
81 |
+ INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/glib-2.0/include" |
82 |
+ INCLUDEPATH += "/usr/local/lib/gtk-2.0/include" |
83 |
+ INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/gtk-2.0/include" |
84 |
} |
85 |
|
86 |
|
87 |
@@ -275,23 +275,23 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) |
88 |
} else { |
89 |
DEFINES += ENABLE_SYSTRAY_GTK_BACKEND |
90 |
|
91 |
- INCLUDEPATH += "/usr/include/glib-2.0" |
92 |
- INCLUDEPATH += "/usr/include/gtk-2.0" |
93 |
- INCLUDEPATH += "/usr/include/atk-1.0" |
94 |
- INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0" |
95 |
- INCLUDEPATH += "/usr/include/cairo" |
96 |
- INCLUDEPATH += "/usr/include/pango-1.0" |
97 |
+ INCLUDEPATH += "/usr/local/include/glib-2.0" |
98 |
+ INCLUDEPATH += "/usr/local/include/gtk-2.0" |
99 |
+ INCLUDEPATH += "/usr/local/include/atk-1.0" |
100 |
+ INCLUDEPATH += "/usr/local/include/gdk-pixbuf-2.0" |
101 |
+ INCLUDEPATH += "/usr/local/include/cairo" |
102 |
+ INCLUDEPATH += "/usr/local/include/pango-1.0" |
103 |
equals(QT_ARCH, x86_64) { |
104 |
- INCLUDEPATH += "/usr/lib64/glib-2.0/include" |
105 |
- INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include" |
106 |
- INCLUDEPATH += "/usr/lib64/gtk-2.0/include" |
107 |
- INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include" |
108 |
+ INCLUDEPATH += "/usr/local/lib/glib-2.0/include" |
109 |
+ INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/glib-2.0/include" |
110 |
+ INCLUDEPATH += "/usr/local/lib/gtk-2.0/include" |
111 |
+ INCLUDEPATH += "/usr/local/lib/x86_64-linux-gnu/gtk-2.0/include" |
112 |
} |
113 |
else { |
114 |
- INCLUDEPATH += "/usr/lib/glib-2.0/include" |
115 |
- INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include" |
116 |
- INCLUDEPATH += "/usr/lib/gtk-2.0/include" |
117 |
- INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include" |
118 |
+ INCLUDEPATH += "/usr/local/lib/glib-2.0/include" |
119 |
+ INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/glib-2.0/include" |
120 |
+ INCLUDEPATH += "/usr/local/lib/gtk-2.0/include" |
121 |
+ INCLUDEPATH += "/usr/local/lib/i386-linux-gnu/gtk-2.0/include" |
122 |
} |
123 |
|
124 |
|
125 |
@@ -504,6 +504,18 @@ SOURCES += \ |
126 |
src/video/groupnetcamview.cpp \ |
127 |
src/core/toxcall.cpp |
6 |
|
128 |
|
7 |
+unix { |
129 |
+unix { |
8 |
+ target.path = $$PREFIX/bin |
130 |
+ target.path = $$PREFIX/bin |