[SCM] qbs packaging branch, master, updated. f0dc50598d4bd3818aa0ccb74dc632c902bcf156

[Dmitry Shachnev]

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

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

    Fix build failure when multiple compilers are installed.
---
 debian/changelog | 2 ++
 debian/rules     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index aa71e73..43baa32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.2.2+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Fix build failure when multiple compilers are installed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 27 Jul 2014 18:14:27 +0400
 
diff --git a/debian/rules b/debian/rules
index c6b8839..581bbbf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,8 @@ 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
 	dh_auto_test
 

-- 
qbs packaging