[SCM] qtcreator packaging branch, master, updated. debian/4.5.0-1-4-g69936e7

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit 0f76993a2dd4d8920880838a8aa29940ad222891
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Jan 29 22:52:22 2018 +0100

    Fix FTBFS on armhf. (Closes: #886820)
    
    Remove hack to build some files with -O1.
    Thanks to Adrian Bunk for testing.
---
 debian/rules | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index ef05b9e..74d572f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,14 +44,6 @@ override_dh_auto_configure:
 		CONFIG+=disable_external_rpath \
 		$(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
 
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armhf))
-	# Hack over a g++ problem while using -O2 on armhf.
-	# If you don't like this horrible hack please feel free to help me try to
-	# reproduce it in a minimal test case so as to be able to properly fill a
-	# bug against g++.
-	sed -i 's/O2/O1/g' builddir/src/plugins/qmldesigner/Makefile.qmldesignerplugin
-endif
-
 override_dh_auto_install:
 ifneq (,$(filter qtcreator-doc, $(shell dh_listpackages)))
 	dh_auto_build -- qch_docs

-- 
qtcreator packaging