From a89d8a1b6f1ce28b1cde7149cc1ede8128b74e31 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Fri, 17 Sep 2010 15:34:15 +0000
Subject: fix linking flags for symbian

---
 examples/examples.pri | 12 +-----------
 qxmpp.pri             | 16 ++++++++++++++++
 tests/tests.pro       |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/examples/examples.pri b/examples/examples.pri
index 69c7acdc..782ec465 100644
--- a/examples/examples.pri
+++ b/examples/examples.pri
@@ -7,17 +7,7 @@ QT += network xml
 CONFIG += console
 
 INCLUDEPATH += $$QXMPP_INCLUDE_DIR
-LIBS += -L$$QXMPP_LIBRARY_DIR -l$$QXMPP_LIBRARY_NAME
-
-# FIXME: we should be able to use the link_prl option to automatically pull
-# in the extra libraries which the qxmpp library needs, but this does not
-# seem to work on win32, so we specify the dependencies here:
-unix {
-    LIBS += -lresolv
-}
-win32 {
-    LIBS += -ldnsapi
-}
+LIBS += $$QXMPP_LIBS
 
 # FIXME: we need to express a dependency on the library, but the file name
 # depends on the platform and whether the library is static or dynamic
diff --git a/qxmpp.pri b/qxmpp.pri
index c3d11087..a016738a 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -9,3 +9,19 @@ CONFIG(debug, debug|release) {
     QXMPP_LIBRARY_NAME = qxmpp
 }
 
+QXMPP_LIBS = -L$$QXMPP_LIBRARY_DIR -l$${QXMPP_LIBRARY_NAME}
+
+# Symbian needs a .lib extension to recognise the library as static
+symbian {
+	QXMPP_LIBS = -L$$QXMPP_LIBRARY_DIR -l$${QXMPP_LIBRARY_NAME}.lib
+}
+
+# FIXME: we should be able to use the link_prl option to automatically pull
+# in the extra libraries which the qxmpp library needs, but this does not
+# seem to work on win32, so we specify the dependencies here:
+unix {
+    QXMPP_LIBS += -lresolv
+}
+win32 {
+    QXMPP_LIBS += -ldnsapi
+}
diff --git a/tests/tests.pro b/tests/tests.pro
index 2848c2ed..c36c28c6 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -9,4 +9,4 @@ SOURCES += tests.cpp
 HEADERS += tests.h 
 
 INCLUDEPATH += $$QXMPP_INCLUDE_DIR
-LIBS += -L$$QXMPP_LIBRARY_DIR -l$$QXMPP_LIBRARY_NAME
+LIBS += $$QXMPP_LIBS
-- 
cgit v1.2.3