summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-10 07:15:22 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-10 07:15:22 (GMT)
commita8fd5486e8d98a2998ab3430770d9e9d691ff16f (patch)
tree4d8528c9f162587a6dbaa8e791d8b5c79ba1bfed /Swiften
parentfbe2f7e1937d1098c4d33303a0bdec19f035e359 (diff)
downloadswift-contrib-a8fd5486e8d98a2998ab3430770d9e9d691ff16f.zip
swift-contrib-a8fd5486e8d98a2998ab3430770d9e9d691ff16f.tar.bz2
Fixed compilation of StorageTest.
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/QA/StorageTest/SConscript1
-rw-r--r--Swiften/QA/StorageTest/VCardFileStorageTest.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/Swiften/QA/StorageTest/SConscript b/Swiften/QA/StorageTest/SConscript
index bd77793..bb8646e 100644
--- a/Swiften/QA/StorageTest/SConscript
+++ b/Swiften/QA/StorageTest/SConscript
@@ -5,6 +5,7 @@ Import("env")
if env["TEST"] :
myenv = env.Clone()
myenv.MergeFlags(myenv["CHECKER_FLAGS"])
+ myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
myenv.MergeFlags(myenv["BOOST_FLAGS"])
diff --git a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
index cab25b8..7ef1fd5 100644
--- a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
+++ b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
@@ -9,7 +9,7 @@
#include "Swiften/VCards/VCardFileStorage.h"
#include "Swiften/JID/JID.h"
-#include "Swiften/Application/PlatformApplicationPathProvider.h"
+#include "SwifTools/Application/PlatformApplicationPathProvider.h"
#include "Swiften/Elements/VCard.h"
using namespace Swift;