Merge lp:~aacid/gsettings-qt/use_minimal_qpa_for_test into lp:gsettings-qt

[Albert Astals Cid]

No need for X in this text (LP: #1259145)

[Timo Jyrinki (timo-jyrinki)]

Tested successfully at https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3808316/+listing-archive-extra - now builds fine also on x86.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/gsettings-qt-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-qt-trusty-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-qt-ci/17/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2013-07-19 14:22:57 +0000
+++ tests/tests.pro	2014-01-09 09:15:25 +0000
@@ -13,6 +13,6 @@
 PRE_TARGETDEPS = gschemas.compiled
 
 # qmake prepends this to the command line executed by `make check`
-check.commands = LD_LIBRARY_PATH=$$PWD/../src GSETTINGS_BACKEND=memory GSETTINGS_SCHEMA_DIR=$$PWD
+check.commands = QT_QPA_PLATFORM=minimal LD_LIBRARY_PATH=$$PWD/../src GSETTINGS_BACKEND=memory GSETTINGS_SCHEMA_DIR=$$PWD
 
 OTHER_FILES += tst_GSettings.qml