Merge lp:~chris.gagnon/kubuntu-packaging/qtpim-opensource-src-fix-headers-in-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src

[Chris Gagnon]

fix headers in tests so they build and run

[Timo Jyrinki (timo-jyrinki)]

Seems to fix the tests properly: https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3830468/+listing-archive-extra

It's still a problem these patches are needed, but at least passing the tests makes it more comfortable to trust Qt PIM again.

review: Approve

=== added file 'debian/patches/fix_5.2_test_headers.patch'
--- debian/patches/fix_5.2_test_headers.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_5.2_test_headers.patch	2014-01-16 17:42:32 +0000
@@ -0,0 +1,41 @@
+Index: qtpim-opensource-src-5.0~git20130828/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp
+===================================================================
+--- qtpim-opensource-src-5.0~git20130828.orig/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp	2013-08-22 15:36:13.000000000 +0000
++++ qtpim-opensource-src-5.0~git20130828/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp	2014-01-16 16:07:32.370873000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include "tst_qversitcontactimporter.h"
+ #include <qversitcontactimporter.h>
+-#include <private/qversitcontactimporter_p.h>
++#include <../../../../src/versit/qversitcontactimporter_p.h>
+ #include <qversitproperty.h>
+ #include <qversitdocument.h>
+ #include <qcontacts.h>
+Index: qtpim-opensource-src-5.0~git20130828/tests/auto/versit/qversitproperty/tst_qversitproperty.cpp
+===================================================================
+--- qtpim-opensource-src-5.0~git20130828.orig/tests/auto/versit/qversitproperty/tst_qversitproperty.cpp	2013-08-22 15:36:13.000000000 +0000
++++ qtpim-opensource-src-5.0~git20130828/tests/auto/versit/qversitproperty/tst_qversitproperty.cpp	2014-01-16 16:10:15.710873000 +0000
+@@ -43,7 +43,7 @@
+ 
+ #include "tst_qversitproperty.h"
+ #include <qversitproperty.h>
+-#include <private/qversitproperty_p.h>
++#include <../../../../src/versit/qversitproperty_p.h>
+ #include <qversitdocument.h>
+ #include <QtTest/QtTest>
+ 
+Index: qtpim-opensource-src-5.0~git20130828/tests/auto/versit/qversitreader/tst_qversitreader.cpp
+===================================================================
+--- qtpim-opensource-src-5.0~git20130828.orig/tests/auto/versit/qversitreader/tst_qversitreader.cpp	2013-08-22 15:36:13.000000000 +0000
++++ qtpim-opensource-src-5.0~git20130828/tests/auto/versit/qversitreader/tst_qversitreader.cpp	2014-01-16 16:11:57.918873000 +0000
+@@ -43,8 +43,8 @@
+ 
+ #include "tst_qversitreader.h"
+ #include <qversitproperty.h>
+-#include <private/qversitreader_p.h>
+-#include <private/qversitutils_p.h>
++#include <../../../../src/versit/qversitreader_p.h>
++#include <../../../../src/versit/qversitutils_p.h>
+ #include <QtTest/QtTest>
+ #include <QSignalSpy>
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-18 13:10:03 +0000
+++ debian/patches/series	2014-01-16 17:42:32 +0000
@@ -4,3 +4,4 @@
 0001-Update-QDeclarativeContact-contactId-field-after-cre.patch
 syncqt_create_headers.patch
 fix_headers_building_against_qt52.patch
+fix_5.2_test_headers.patch

=== modified file 'debian/rules'
--- debian/rules	2014-01-15 06:17:11 +0000
+++ debian/rules	2014-01-16 17:42:32 +0000
@@ -18,8 +18,6 @@
 	rm -f qml/*/*.so
 
 override_dh_auto_configure:
-	# Disabled until qtpim is properly fixed again
-	rm -rf tests
 	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_install:
@@ -30,8 +28,7 @@
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/organizer/libqtorganizer_skeleton.so
 
 override_dh_auto_test:
-	# Disabled until qtpim is properly fixed again
-	#xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+	xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz