From 55bd4e157f2f81f20133cb55412e4abf064c1c3b Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 19 Jun 2012 08:45:55 +0300 Subject: [PATCH] Fix building of qttools when printsupport module is disabled. The source code already has necessary #ifdefs in place, but dependency to printsupport library wasn't conditional in *.pro files. Made printsupport conditional also in *.pro files. Change-Id: I0bcc4765d5f848dc5334fd380671989a9cc27f74 Reviewed-by: Andreas Holzammer Reviewed-by: Oswald Buddenhagen --- src/assistant/assistant/assistant.pro | 3 ++- src/designer/src/designer/designer.pro | 3 ++- src/linguist/linguist/linguist.pro | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro index f5cfbd5..3264f2d 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -10,7 +10,8 @@ DESTDIR = $$QT.help.bins CONFIG += qt \ warn_on \ help -QT += widgets printsupport network help +QT += widgets network help +!isEmpty(QT.printsupport.name): QT += printsupport PROJECTNAME = Assistant DEPENDPATH += ../shared diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro index 92e6899..a9efc94 100644 --- a/src/designer/src/designer/designer.pro +++ b/src/designer/src/designer/designer.pro @@ -1,7 +1,8 @@ load(qt_module) DESTDIR = $$QT.designer.bins -QT += core-private widgets xml network designer-private printsupport +QT += core-private widgets xml network designer-private +!isEmpty(QT.printsupport.name): QT += printsupport CONFIG += module MODULE_PRI = ../../../../modules/qt_designer.pri diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro index a0f213c..21e39c4 100644 --- a/src/linguist/linguist/linguist.pro +++ b/src/linguist/linguist/linguist.pro @@ -4,7 +4,8 @@ TEMPLATE = app LANGUAGE = C++ DESTDIR = $$QT.designer.bins -QT += core-private widgets xml uitools-private printsupport +QT += core-private widgets xml uitools-private +!isEmpty(QT.printsupport.name): QT += printsupport CONFIG += qt warn_on -- 2.7.4