From d9e7abfd22ef30e6535b8bb290b9bd1ef7a7bff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 4 Jul 2009 16:32:19 +0200
Subject: Remove fixwindows.pri again.


diff --git a/Swift/QtUI/Swift.pro b/Swift/QtUI/Swift.pro
index 23042bb..da5f4e8 100644
--- a/Swift/QtUI/Swift.pro
+++ b/Swift/QtUI/Swift.pro
@@ -24,9 +24,9 @@ else {
 	DEFINES += HAVE_OPENSSL
 	INCLUDEPATH += C:/OpenSSL/include
 	LIBS += -LC:/OpenSSL/lib/VC -llibeay32MT -lssleay32MT
+	LIBS += -ldnsapi -lws2_32 -lwsock32
 
 	include(Swiften.pri)
-	include(fixwindows.pri)
 }
 
 win32 {
diff --git a/Swift/QtUI/fixwindows.pri b/Swift/QtUI/fixwindows.pri
deleted file mode 100644
index 4d924ed..0000000
--- a/Swift/QtUI/fixwindows.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-INCLUDEPATH += ../../3rdParty/SQLite/
-LIBS += Dnsapi.lib
diff --git a/Swift/QtUI/qmakeish.py b/Swift/QtUI/qmakeish.py
index c5b302d..ebbb0cd 100755
--- a/Swift/QtUI/qmakeish.py
+++ b/Swift/QtUI/qmakeish.py
@@ -90,6 +90,10 @@ for line in makefile :
     if match : 
       processFlags(match.group(1), match.group(2))
 
+    match = re.match("SQLITE_CPPFLAGS \+= (.*)", line) 
+    if match : 
+      processFlags("CPPFLAGS", match.group(1))
+
     if line.startswith("## ") :
       print line
 
-- 
cgit v0.10.2-6-g49f6