From 0ed898e3c21b0624bb0492490b3a5ff11b880645 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 3 Jun 2018 12:16:52 +0200 Subject: [PATCH] WIP: proper dependencies to avoid build issues. --- src/gsiqt/qt4/qt4.pro | 5 +++++ src/klayout.pro | 4 ++-- src/pymod/pymod.pro | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gsiqt/qt4/qt4.pro b/src/gsiqt/qt4/qt4.pro index e93ae8d78..01daec72f 100644 --- a/src/gsiqt/qt4/qt4.pro +++ b/src/gsiqt/qt4/qt4.pro @@ -9,3 +9,8 @@ SUBDIRS = \ QtNetwork \ QtDesigner +# This is weired, but true: because QSignalMapper (inside QtCore) has a QWidget +# argument, we need to enforce linking of QtCore against QtGui so this GSI declaration +# is available there +# TODO: +QtCore.depends += QtGui diff --git a/src/klayout.pro b/src/klayout.pro index 2cbe8cb65..e6c91bfbe 100644 --- a/src/klayout.pro +++ b/src/klayout.pro @@ -40,7 +40,7 @@ equals(HAVE_PYTHON, "1") { LANG_DEPENDS += pya pya.depends += gsi db SUBDIRS += pymod - pymod.depends += pya + pymod.depends += pya lay } else { SUBDIRS += pyastub pyastub.depends += gsi @@ -69,7 +69,7 @@ buddies.depends += rdb lib $$LANG_DEPENDS equals(HAVE_QTBINDINGS, "1") { SUBDIRS += gsiqt - gsiqt.depends += gsi + gsiqt.depends += gsi db laybasic.depends += gsiqt pymod.depends += gsiqt } diff --git a/src/pymod/pymod.pro b/src/pymod/pymod.pro index dd371b5de..c1471d747 100644 --- a/src/pymod/pymod.pro +++ b/src/pymod/pymod.pro @@ -31,4 +31,3 @@ equals(HAVE_QT5, "1") { QtDesigner } -