dca7d17bce
Changes in 3.18.1 since 3.18: * Fixed the handwritten code for all QDomDocument.setContent() overloads which was using deprecated (and now removed) sipBuildResult() format characters. * Fixed a build problem that affected Python v2.5 and earlier. Changes in 3.18 since 3.17.6: * Removed some compiler warning messages. * Reverted the changes that removed the use of sipSelfWasArg in handwritten code. * Tweaked configure.py so that Python3 can run just enough of it to display an error message. * Fixed a regression in emitting Python signals to Qt signals. * Handwritten code changes for the removal of the sipProtectVirt_*() methods. * Fixed a build problem with the GPL version. * Refactored the signla/slot support. * Safety checking of latest signal/slot refactoring. * Safety commit of the PyQt3-specific meta-type and super-type (just stubs at the moment). * Use the %Plugin directive to enable PyQt3 signal support. * More changes to the QObject.sender() support. * Updated the QObject::sender() support in response to sip changes. * Moved the last of the type parsing from sip. * The type parsing now uses sipResolveTypedef(). * Added the type parsing support from the sip module as PyQt4 no longer uses it. * Replaced sipFindConnection() with sipFindSlot(). * Replaced sipFreeConnection() with sipFreeSipslot(). * Changes required by recent changes to the Qt support API. * Compatibility changes needed for SIP v4.8. * Merged the v3.17 maintenance branch into the trunk. * Made some char* in handwritten code const needed by SIP v4.8.
96 lines
3.9 KiB
Text
96 lines
3.9 KiB
Text
$NetBSD: patch-aa,v 1.7 2009/06/17 07:11:03 hasso Exp $
|
|
|
|
--- configure.py.orig 2009-06-16 11:47:29 +0300
|
|
+++ configure.py 2009-06-17 05:21:23 +0300
|
|
@@ -197,23 +197,23 @@ class ConfigurePyQt3(ConfigureBase):
|
|
def check_modules(self):
|
|
pyqt_modules.append("qt")
|
|
|
|
- check_module("qtcanvas", "qcanvas.h", "QCanvas()")
|
|
- check_module("qtnetwork", "qsocket.h", "QSocket()")
|
|
- check_module("qttable", "qtable.h", "QTable()")
|
|
- check_module("qtxml", "qdom.h", "QDomImplementation()")
|
|
- check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
|
|
+ #check_module("qtcanvas", "qcanvas.h", "QCanvas()")
|
|
+ #check_module("qtnetwork", "qsocket.h", "QSocket()")
|
|
+ #check_module("qttable", "qtable.h", "QTable()")
|
|
+ #check_module("qtxml", "qdom.h", "QDomImplementation()")
|
|
+ #check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1)
|
|
+
|
|
+ #if qt_version >= 0x030000:
|
|
+ # check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
|
|
|
|
- if qt_version >= 0x030000:
|
|
- check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui")
|
|
-
|
|
- if qt_edition in ("enterprise", "free"):
|
|
- check_module("qtsql", "qsql.h", "QSql()")
|
|
+ # if qt_edition in ("enterprise", "free"):
|
|
+ # check_module("qtsql", "qsql.h", "QSql()")
|
|
|
|
- if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
|
|
- check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
|
|
+ # if sys.platform == "win32" and sipcfg.sip_version >= 0x040200:
|
|
+ # check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer")
|
|
|
|
- if qsci_version:
|
|
- check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
|
|
+ #if qsci_version:
|
|
+ # check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")
|
|
|
|
if opt_qtpetag:
|
|
pyqt_modules.append("qtpe")
|
|
@@ -289,7 +289,7 @@ class ConfigurePyQt3(ConfigureBase):
|
|
|
|
sipconfig.inform("Creating pyuic Makefile...")
|
|
|
|
- if prof or "qtxml" not in pyqt_modules:
|
|
+ if prof: # or "qtxml" not in pyqt_modules:
|
|
buildfile= "pyuic-prof.sbf"
|
|
|
|
for xml in ("qdom.cpp", "qxml.cpp"):
|
|
@@ -310,7 +310,7 @@ class ConfigurePyQt3(ConfigureBase):
|
|
makefile.extra_defines.append("UIC")
|
|
makefile.extra_defines.append("QT_INTERNAL_XML")
|
|
|
|
- if prof or "qtxml" not in pyqt_modules:
|
|
+ if prof: # or "qtxml" not in pyqt_modules:
|
|
makefile.extra_defines.append("QT_MODULE_XML")
|
|
|
|
if qt_version < 0x030100:
|
|
@@ -321,7 +321,7 @@ class ConfigurePyQt3(ConfigureBase):
|
|
|
|
sipconfig.inform("Creating pylupdate Makefile...")
|
|
|
|
- if prof or "qtxml" not in pyqt_modules:
|
|
+ if prof: # or "qtxml" not in pyqt_modules:
|
|
buildfile= "pylupdate-prof.sbf"
|
|
|
|
shutil.copyfile(qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp")
|
|
@@ -340,7 +340,7 @@ class ConfigurePyQt3(ConfigureBase):
|
|
|
|
makefile.extra_defines.append("QT_INTERNAL_XML")
|
|
|
|
- if prof or "qtxml" not in pyqt_modules:
|
|
+ if prof: # or "qtxml" not in pyqt_modules:
|
|
makefile.extra_defines.append("QT_MODULE_XML")
|
|
|
|
makefile.generate()
|
|
@@ -1010,7 +1010,7 @@ Type 'no' to decline the terms of the li
|
|
|
|
""")
|
|
|
|
- while 1:
|
|
+ while 0:
|
|
try:
|
|
resp = raw_input("Do you accept the terms of the license? ")
|
|
except:
|
|
@@ -1392,7 +1392,7 @@ def main(argv):
|
|
check_license()
|
|
|
|
# Check for QScintilla.
|
|
- check_qscintilla()
|
|
+ #check_qscintilla()
|
|
|
|
# Check which modules to build.
|
|
qtmod_lib = pyqt.check_modules()
|