1 --- configure.py 2009-06-16 10:37:38.000000000 +0200
2 +++ configure.py.new 2009-07-04 04:47:49.000000000 +0200
13 sipconfig.inform("Qt v%s %sis being used." % (sipconfig.version_to_string(qt_version), edstr))
16 + sipconfig.inform("Qt is licensed to %s." % qt_licensee)
18 if sys.platform == "darwin" and qt_framework:
19 sipconfig.inform("Qt is built as a framework.")
22 sipconfig.inform("This is the %s version of PyQt %s (licensed under the %s) for Python %s on %s." % (ltype, pyqt_version_str, lname, sys.version.split()[0], sys.platform))
25 - if qt_edition and ltype != "internal":
26 - if qt_edition != "free" and ltype == "GPL":
27 - sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qt_edition)
28 + if qt_licensee and ltype == "GPL":
29 + sipconfig.error("This version of PyQt and the commercial version of Qt have incompatible licenses.")
31 # Confirm the license if not already done.
32 if not opts.license_confirmed:
34 out << QT_VERSION << '\\n';
35 out << QT_EDITION << '\\n';
37 + out << QLibraryInfo::licensee() << '\\n';
39 #if defined(QT_SHARED) || defined(QT_DLL)
45 global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir, qt_pluginsdir
46 - global qt_version, qt_edition, qt_shared, qt_xfeatures
47 + global qt_version, qt_edition, qt_licensee, qt_shared, qt_xfeatures
51 @@ -1771,8 +1776,12 @@
52 qt_pluginsdir = lines[5]
56 - qt_xfeatures = lines[9:]
57 + qt_licensee = lines[8]
59 + qt_xfeatures = lines[10:]
61 + if qt_licensee == 'Open Source':
65 qt_version = int(qt_version)
66 @@ -1789,6 +1798,10 @@
67 if qt_edition & 0x200:
69 qt_edition = "Desktop"
71 + # ActiveQt became part of the open source version in v4.5.2.
72 + if qt_version >= 0x040502 and qt_licensee is None:
74 elif qt_edition & 0x008: