[SCM] marble packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-50-g4c2ec99

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=cf75cdd

The following commit has been merged in the kubuntu_wily_archive branch:
commit cf75cdd1ad3ea3ad1898e4985ab4f145aeaf7382
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Aug 18 00:26:47 2015 +0200

    force qt4 for the qt4 build
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 7d8c280..18fcf5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_configure:
 	$(overridden_command) -- -DWITH_DESIGNER_PLUGIN=ON \
 				 -DWITH_KF5=TRUE \
 				 $(conf_args)
-	$(overridden_command) --builddirectory=obj-marble-qt4 -- \
+	QT_SELECT=qt4 $(overridden_command) --builddirectory=obj-marble-qt4 -- \
 				 -DQT5BUILD=FALSE \
 				 -DWITH_DESIGNER_PLUGIN=ON \
 				 -DMARBLE_PLUGIN_PATH=$(marble_plugin_path) \

-- 
marble packaging