From f865a7012559b10f39cbc58f1d3d7fa92ae6de5b Mon Sep 17 00:00:00 2001 From: Toby Tomkins Date: Tue, 24 Jan 2012 15:08:33 +1000 Subject: [PATCH] Remove dependency on designer from linguist and headers autotest. When compiling with shadow build option the Qt sources are not available. The QtDesigner library requires direct access to these sources to compile. Hence if we remove the dependency on designer (which is not required) we can compile successfully with the shadow build configure option. Change-Id: I36fa408a32a354d54a9b47aed8a7cba447cf4129 Sanity-Review: Qt Sanity Bot Reviewed-by: Oswald Buddenhagen --- src/linguist/linguist/formpreviewview.cpp | 1 - src/linguist/linguist/linguist.pro | 2 +- tests/auto/headersclean/headersclean.pro | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/linguist/linguist/formpreviewview.cpp b/src/linguist/linguist/formpreviewview.cpp index ec702db..5fbd7e6 100644 --- a/src/linguist/linguist/formpreviewview.cpp +++ b/src/linguist/linguist/formpreviewview.cpp @@ -43,7 +43,6 @@ #include "messagemodel.h" #include -#include #include #include diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro index d929964..a74a6b7 100644 --- a/src/linguist/linguist/linguist.pro +++ b/src/linguist/linguist/linguist.pro @@ -4,7 +4,7 @@ TEMPLATE = app LANGUAGE = C++ DESTDIR = $$QT.designer.bins -QT += core-private widgets xml designer uitools-private printsupport +QT += core-private widgets xml uitools-private printsupport CONFIG += qt warn_on diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 0851cad..df49c6f 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,4 +1,4 @@ TARGET = tst_headersclean CONFIG += testcase SOURCES += tst_headersclean.cpp -QT = core designer help testlib +QT = core help testlib -- 2.7.4