Mercurial Repositories > eric / file comparison
comparison: patches/qwebpage.sip.4.6.diff
patches/qwebpage.sip.4.6.diff
- changeset 260
- 21f7999b7abe
equal
deleted
inserted
replaced
| 259:103969d5594b | 260:21f7999b7abe |
|---|---|
| 1 228a229,231 | |
| 2 > %If (Qt_4_6_0 -) | |
| 3 > ErrorPageExtension, | |
| 4 > %End | |
| 5 230a234,242 | |
| 6 > %If (Qt_4_6_0 -) | |
| 7 > enum ErrorDomain | |
| 8 > { | |
| 9 > QtNetwork, | |
| 10 > Http, | |
| 11 > WebKit, | |
| 12 > }; | |
| 13 > %End | |
| 14 > | |
| 15 318a331,367 | |
| 16 > }; | |
| 17 > | |
| 18 > %End | |
| 19 > | |
| 20 > %If (Qt_4_6_0 -) | |
| 21 > | |
| 22 > class ErrorPageExtensionOption : QWebPage::ExtensionOption | |
| 23 > { | |
| 24 > | |
| 25 > %TypeHeaderCode | |
| 26 > #include <qwebpage.h> | |
| 27 > %End | |
| 28 > | |
| 29 > public: | |
| 30 > QUrl url; | |
| 31 > QWebFrame* frame; | |
| 32 > QWebPage::ErrorDomain domain; | |
| 33 > int error; | |
| 34 > QString errorString; | |
| 35 > }; | |
| 36 > | |
| 37 > %End | |
| 38 > %If (Qt_4_6_0 -) | |
| 39 > | |
| 40 > class ErrorPageExtensionReturn : QWebPage::ExtensionReturn | |
| 41 > { | |
| 42 > | |
| 43 > %TypeHeaderCode | |
| 44 > #include <qwebpage.h> | |
| 45 > %End | |
| 46 > | |
| 47 > public: | |
| 48 > ErrorPageExtensionReturn(); | |
| 49 > QString contentType; | |
| 50 > QString encoding; | |
| 51 > QUrl baseUrl; | |
| 52 > QByteArray content; |
