FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue 1272

This commit is contained in:
Thomas Nagy 2013-05-01 10:55:26 +02:00
parent b059ce784d
commit 43caa85c5a
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ NEW IN WAF 1.7.11
* Detection of convert in parallel_debug #1300
* Bibtopic support #1299
* Safer encoding for ConfigSet files #1297
* Qt defines on windows #1272
NEW IN WAF 1.7.10
-----------------

10
waflib/Tools/qt4.py
View File

@ -422,6 +422,7 @@ def configure(self):
"""
self.find_qt4_binaries()
self.set_qt4_libs_to_check()
self.set_qt4_defines()
self.find_qt4_libraries()
self.add_qt4_rpath()
self.simplify_qt4_libs()
@ -666,6 +667,15 @@ def set_qt4_libs_to_check(self):
self.qt4_vars_debug = [a + '_debug' for a in self.qt4_vars]
self.qt4_vars_debug = Utils.to_list(self.qt4_vars_debug)
@conf
def set_qt4_defines(self):
if sys.platform != 'win32':
return
for x in self.qt4_vars:
y = x[2:].upper()
self.env.append_unique('DEFINES_%s' % x.upper(), 'QT_%s_LIB' % y)
self.env.append_unique('DEFINES_%s_DEBUG' % x.upper(), 'QT_%s_LIB' % y)
def options(opt):
"""
Command-line options