summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-04-05 11:11:01 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-04-05 11:13:39 (GMT)
commitb5254246d55f0bdad2bc89fc282958618159511d (patch)
tree880665c4b49db6d6c3ba66670825962d69382e39 /src
parenta4baffe212882c42d7674972a749b531289a7287 (diff)
downloadQt-b5254246d55f0bdad2bc89fc282958618159511d.zip
Qt-b5254246d55f0bdad2bc89fc282958618159511d.tar.gz
Qt-b5254246d55f0bdad2bc89fc282958618159511d.tar.bz2
Make it possible to build QtDBus and its tools on Windows CE.
This of course requires installing libdbus compiled for Windows CE too. Task-number: QTBUG-9582 Patch-by: Romain Pokrzywka (from KDAB)
Diffstat (limited to 'src')
-rw-r--r--src/dbus/dbus.pro3
-rw-r--r--src/src.pro2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index 9ab3920..7c59808 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -20,7 +20,8 @@ unix {
QtXml
}
win32 {
- LIBS_PRIVATE += -lws2_32 \
+ wince*:LIBS_PRIVATE += -lws2
+ else:LIBS_PRIVATE += -lws2_32 \
-ladvapi32 \
-lnetapi32 \
-luser32
diff --git a/src/src.pro b/src/src.pro
index c2ed59d..6ccd955 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -14,10 +14,10 @@ wince*:{
SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_testlib
!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
include(tools/tools.pro)
- contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
}
win32:SRC_SUBDIRS += src_activeqt
+!symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl
contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg
contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns