Am Sa, den 17.01.2004 schrieb Phil Thompson um 18:15: > Can you try 3.10?
Done and succeeded - thanks very much! I have two patches against pyqt 3.10 attached. The first one allows the qtpe module to be built against newer libqpe's as appearing in Qtopia 1.6, Qtopia 1.7 and Opie 1.x. I have added a timeline entry so this won't interfere with building against older Qtopia SDKs. The second one adds a missing check for the Qt_NETWORKPROTOCOL feature in qhttp.sip. Cheers, Mickey. -- :M: -------------------------------------------------------------------------- Dipl.-Inf. Michael 'Mickey' Lauer [EMAIL PROTECTED] Raum 10b - ++49 69 798 28358 Fachbereich Informatik und Biologie --------------------------------------------------------------------------
# # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # --- PyQt-x11-gpl-3.9/sip/qtpe/qpefileselector.sip~libqpe-opie 2003-12-06 21:26:03.000000000 +0100 +++ PyQt-x11-gpl-3.9/sip/qtpe/qpefileselector.sip 2004-01-17 14:33:34.000000000 +0100 @@ -53,7 +53,13 @@ void setCloseVisible(bool); void reread(); int fileCount(); - const DocLnk *selected(); +%If (- QtPE_1_6_0) + const DocLnk *selected(); // private in Qtopia >= 1.6 and Opie >= 0.9.1 +%End + +%If (QtPE_1_6_0 -) + DocLnk selectedDocument(); // appears in Qtopia 1.6 (libqtopia) and Opie 0.9.1 (libqpe) +%End signals: void fileSelected(const DocLnk &); --- PyQt-x11-gpl-3.9/sip/qtpe/qpeglobal.sip~libqpe-opie 2003-12-06 21:26:03.000000000 +0100 +++ PyQt-x11-gpl-3.9/sip/qtpe/qpeglobal.sip 2004-01-17 14:34:34.000000000 +0100 @@ -57,7 +57,9 @@ // static void setBuiltinCommands(Command *); - static void invoke(const QString &); +%If (- QtPE_1_6_0) + static void invoke(const QString &); // private in Qtopia >= 1.6 and Opie >= 0.9.1 +%End static void execute(const QString &,const QString & = QString::null) /ReleaseGIL/; static void setDocument(QWidget *,const QString &); static bool terminateBuiltin(const QString &); --- PyQt-x11-gpl-3.9/sip/qtpe/qtpemod.sip~libqpe-opie 2003-12-06 21:26:03.000000000 +0100 +++ PyQt-x11-gpl-3.9/sip/qtpe/qtpemod.sip 2004-01-17 14:35:01.000000000 +0100 @@ -28,7 +28,7 @@ // QPE has it's own version numbering. -%Timeline {QtPE_1_5_0} +%Timeline {QtPE_1_5_0 QtPE_1_6_0} %ModuleHeaderCode
# # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # --- PyQt-x11-gpl-3.10/sip/qtnetwork/qhttp.sip~add-missing-feature-test 2004-01-16 21:55:07.000000000 +0100 +++ PyQt-x11-gpl-3.10/sip/qtnetwork/qhttp.sip 2004-01-18 18:34:55.000000000 +0100 @@ -52,6 +52,7 @@ </Sect2> %End +%If (Qt_NETWORKPROTOCOL) %If (Qt_3_1_0 -) @@ -273,3 +274,5 @@ }; %End +%End +
