projects
/
situare
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
17cc9af
5a95f17
)
Merge branch 'master' of https://vcs.maemo.org/git/situare
v0.5
author
Ville Tiensuu
<ville.tiensuu@ixonos.com>
Tue, 1 Jun 2010 07:59:08 +0000
(10:59 +0300)
committer
Ville Tiensuu
<ville.tiensuu@ixonos.com>
Tue, 1 Jun 2010 07:59:08 +0000
(10:59 +0300)
1
2
src/src.pro
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/src.pro
index
3890c1f
,
2368dba
..
53abef3
---
1
/
src/src.pro
---
2
/
src/src.pro
+++ b/
src/src.pro
@@@
-95,14
-95,11
+95,11
@@@
HEADERS += ui/mainwindow.h
network/networkreply.h
QT += network \
webkit
-DEFINES += QT_NO_DEBUG_OUTPUT
+#DEFINES += QT_NO_DEBUG_OUTPUT
maemo5 | simulator {
- sbox | simulator {
- DEFINES += SBOX
- SOURCES += network/networkhandlerprivatestub.cpp
- HEADERS += network/networkhandlerprivatestub.h
- } else {
+ armel {
+ DEFINES += ARMEL
INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
SOURCES += network/networkhandlerprivate.cpp
HEADERS += network/networkhandlerprivate.h