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.
This commit is contained in:
Christian Prochaska 2013-08-09 15:04:47 +02:00 committed by Norman Feske
parent 5b0a8e54f9
commit 572592b0f3

View File

@ -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))../..)