1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
--- PyQt-x11-gpl-3.18.1.orig/configure.py 2009-06-16 03:47:29.000000000 -0500
+++ PyQt-x11-gpl-3.18.1/configure.py 2012-12-27 08:45:18.859375913 -0500
@@ -258,27 +258,27 @@
}
def code(self, extra_include_dirs, extra_lib_dir, extra_libs):
- generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
+ generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs, extra_cxxflags="-DANY=void")
if "qtext" in pyqt_modules:
- generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags)
+ generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags, extra_cxxflags="-DANY=void")
if "qtgl" in pyqt_modules:
- generate_code("qtgl", opengl=1)
+ generate_code("qtgl", opengl=1, extra_cxxflags="-DANY=void")
if "qtpe" in pyqt_modules:
- generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags)
+ generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags, extra_cxxflags="-DANY=void")
if "qtui" in pyqt_modules:
- generate_code("qtui", extra_libs=["qui"])
+ generate_code("qtui", extra_libs=["qui"], extra_cxxflags="-DANY=void")
if "qtaxcontainer" in pyqt_modules:
- generate_code("qtaxcontainer", extra_libs=["qaxcontainer"])
+ generate_code("qtaxcontainer", extra_libs=["qaxcontainer"], extra_cxxflags="-DANY=void")
# The rest don't need special handling.
for m in ("qtcanvas", "qtnetwork", "qtsql", "qttable", "qtxml"):
if m in pyqt_modules:
- generate_code(m)
+ generate_code(m, extra_cxxflags="-DANY=void")
def tools(self):
tool_dirs = []
|
