[Telepathy-commits] [telepathy-qt4/master] Compile the prototype test ignoring missing declarations warnings (thanks Qt for your nice and clean resource system)

[Olli Salli]

---
 tests/prototype/Makefile.am   |   11 ++++++-----
 tests/prototype/prototype.cpp |    2 --
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/prototype/Makefile.am b/tests/prototype/Makefile.am
index 7cb4702..105949a 100644
--- a/tests/prototype/Makefile.am
+++ b/tests/prototype/Makefile.am
@@ -14,15 +14,15 @@ noinst_PROGRAMS = \
     $(manual_tests)
 
 BUILT_SOURCES = \
-    _gen/images.hpp \
+    _gen/resources.cpp \
     _gen/prototype.h.moc
 
-test_prototype_SOURCES = prototype.cpp prototype.h _gen/images.hpp
+test_prototype_SOURCES = prototype.cpp prototype.h _gen/resources.cpp
 
 EXTRA_DIST = images.qrc avatar.png
 
-_gen/images.hpp: images.qrc avatar.png
-	( cd @srcdir@ && $(RCC) images.qrc ) > $@.tmp
+_gen/resources.cpp: images.qrc avatar.png
+	( cd @srcdir@ && $(RCC) $< ) > $@.tmp
 	mv -f $@.tmp $@
 
 DEP_CFLAGS = \
@@ -43,7 +43,8 @@ LDADD = \
 
 AM_CXXFLAGS = \
     $(ERROR_CXXFLAGS) \
-    $(DEP_CFLAGS)
+    $(DEP_CFLAGS) \
+    -Wno-error=missing-declarations
 
 TESTS_ENV = \
     abs_top_builddir=@abs_top_builddir@ \
diff --git a/tests/prototype/prototype.cpp b/tests/prototype/prototype.cpp
index 59f012a..8397d5b 100644
--- a/tests/prototype/prototype.cpp
+++ b/tests/prototype/prototype.cpp
@@ -27,8 +27,6 @@
 #include <TelepathyQt4/Prototype/PresenceManager.h>
 #include <TelepathyQt4/Prototype/StreamedMediaChannel.h>
 
-#include "_gen/images.hpp"
-
 // #define ENABLE_DEBUG_OUTPUT_
 // #define DO_INTERACTIVE_TESTS_ // Needs user interaction
 
-- 
1.5.6.5