Revert changes to qt (#16516)

Co-authored-by: Elizabeth Fischer <elizabeth.fischer@alaska.edu>
This commit is contained in:
Elizabeth Fischer 2020-05-07 19:32:44 -04:00 committed by GitHub
parent 1ed564a1e6
commit bff5708a4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -222,9 +222,6 @@ 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'))