From 572592b0f3faf43712ba4621fd543c51fa90542a Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Fri, 9 Aug 2013 15:04:47 +0200 Subject: [PATCH] qt4: require 'qt4_deprecated' SPECS variable To avoid build conflicts with Qt5, with this patch, 'qt4_deprecated' needs to be added to the 'SPECS' variable (in specs.conf) when building for Qt4. Issue #345. --- qt4/lib/import/import-qt4.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qt4/lib/import/import-qt4.inc b/qt4/lib/import/import-qt4.inc index 5e5f66e9f3..772330085c 100644 --- a/qt4/lib/import/import-qt4.inc +++ b/qt4/lib/import/import-qt4.inc @@ -4,6 +4,8 @@ ifeq ($(QT4_IMPORTED),) QT4_IMPORTED = true +REQUIRES += qt4_deprecated + # identify the qt4 repository by searching for a file that is unique for qt4 QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.inc) QT4_REP_DIR := $(realpath $(dir $(QT4_REP_DIR))../..)