[SCM] qbs packaging branch, master, updated. 602dc2070cda56acdbbaf3243db0ec8cbe788eda

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=602dc20

The following commit has been merged in the master branch:
commit 602dc2070cda56acdbbaf3243db0ec8cbe788eda
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jul 27 18:53:47 2014 +0400

    Really fix build failure when multiple compilers are installed.
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 581bbbf..c30c9b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,9 +53,9 @@ override_dh_auto_install-arch:
 override_dh_auto_test:
 	mkdir -p $(CONFIG_DIR)/QtProject
 	$(CURDIR)/bin/qbs-setup-toolchains --detect --settings-dir $(CONFIG_DIR)/QtProject
-	grep defaultProfile $(CONFIG_DIR)/QtProject/qbs.conf || \
-		echo "qt-project\qbs\defaultProfile=gcc" >> $(CONFIG_DIR)/QtProject/qbs.conf
 	$(CURDIR)/bin/qbs-setup-qt /usr/bin/qmake qbs_autotests
+	grep baseProfile $(CONFIG_DIR)/QtProject/qbs.conf || \
+		/bin/echo "qt-project\qbs\profiles\qbs_autotestsaseProfile=gcc" >> $(CONFIG_DIR)/QtProject/qbs.conf
 	dh_auto_test
 
 override_dh_install:

-- 
qbs packaging