From b25105fb9bd11288033eaa06f828cad31f7b6f97 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Tue, 25 Sep 2018 20:12:03 +0000 Subject: Update Qt5 to 5.11.2 PR: 231560 Exp-run by: antoine --- devel/qt5-qdbus/files/patch-src_src.pro | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'devel/qt5-qdbus/files/patch-src_src.pro') diff --git a/devel/qt5-qdbus/files/patch-src_src.pro b/devel/qt5-qdbus/files/patch-src_src.pro index 425724632e12..ed90e7206cd7 100644 --- a/devel/qt5-qdbus/files/patch-src_src.pro +++ b/devel/qt5-qdbus/files/patch-src_src.pro @@ -1,9 +1,9 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro.orig 2018-06-09 11:10:38 UTC +--- src/src.pro.orig 2018-09-21 17:34:02 UTC +++ src/src.pro -@@ -1,53 +1,4 @@ +@@ -1,48 +1,3 @@ TEMPLATE = subdirs -qtHaveModule(widgets) { @@ -32,13 +32,9 @@ missing dependencies. -mac { - SUBDIRS += macdeployqt -} -- --android { -- SUBDIRS += androiddeployqt --} - qtHaveModule(dbus): SUBDIRS += qdbus - +- -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner -qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag @@ -51,7 +47,6 @@ missing dependencies. -# This is necessary to avoid a race condition between toolchain.prf -# invocations in a module-by-module cross-build. -cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { -- androiddeployqt.depends += qtattributionsscanner - qdoc.depends += qtattributionsscanner - windeployqt.depends += qtattributionsscanner - winrtrunner.depends += qtattributionsscanner -- cgit v1.2.3