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
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- configure.py.orig 2013-03-27 00:54:08.000000000 +0000
+++ configure.py
@@ -258,27 +258,27 @@ class ConfigurePyQt3(ConfigureBase):
}
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 = []
@@ -1092,15 +1092,12 @@ def check_qt_installation(macros):
macros["LIBDIR_QT"] = qt_libdir
# Check the Qt header files have been installed. Quietly check for Qt v4.
- qt4_d = os.path.join(qt_incdir, "QtCore")
+ # NO. This won't allow having both PyQt3 and PyQt4. Check for Qt3 only.
- qglobal = os.path.join(qt4_d, "qglobal.h")
+ qglobal = os.path.join(qt_incdir, "qglobal.h")
if not os.access(qglobal, os.F_OK):
- qglobal = os.path.join(qt_incdir, "qglobal.h")
-
- if not os.access(qglobal, os.F_OK):
- sipconfig.error("qglobal.h could not be found in %s." % qt_incdir)
+ sipconfig.error("qglobal.h could not be found in %s." % qt_incdir)
# Get the Qt version number.
global qt_version
|
