Commits

Anonymous committed d04b72e

Issue 1272

  • Participants
  • Parent commits 7822b14

Comments (0)

Files changed (2)

 * 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
 -----------------

waflib/Tools/qt4.py

 	"""
 	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()
 		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