From 1aacdc4e18a44eec840fdf1c3f48e2c3a8b81ab3 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Wed, 6 May 2020 16:35:36 -0400 Subject: [PATCH] qscintilla (#16182) * qscintilla * Revert "qscintilla" This reverts commit 00bd00ea3c5af4f29de5dd6961acf03fb51e2ea0. * Move logic to qt package. * flake8 Co-authored-by: Elizabeth Fischer --- var/spack/repos/builtin/packages/qt/package.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 08721e85c2..ce689892f8 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -222,6 +222,9 @@ def setup_run_environment(self, env): def setup_dependent_build_environment(self, env, dependent_spec): env.set('QTDIR', self.prefix) + # https://riverbankcomputing.com/pipermail/qscintilla/2015-January/001012.html + env.set('QMAKEFEATURES', join_path( + dependent_spec.stage.source_path, 'Qt4Qt5', 'features')) def setup_dependent_package(self, module, dependent_spec): module.qmake = Executable(join_path(self.spec.prefix.bin, 'qmake'))