[prev in list] [next in list] [prev in thread] [next in thread]
List: pykde
Subject: Re: [PyKDE] Patch for PyQt4 to work with Qt 4.1.0
From: Andreas Pakulat <apaku () gmx ! de>
Date: 2005-12-26 10:28:26
Message-ID: 20051226102826.GA5345 () morpheus
[Download RAW message or body]
On 26.12.05 11:23:27, Andreas Pakulat wrote:
> Hi,
>
> the attached patch makes the latest PyQt4 snapshot build with Qt 4.1.0.
> It fixes 2 build errors and 1 slot which is new in Qt 4.1.0.
>
> This is for all who don't want to wait until Phil has the time to
> officially support Qt 4.1.0 in PyQt4. I'll send updates if I find more
> issues.
Sorry forgot the attachment.
Andreas
--
You will be attacked by a beast who has the body of a wolf, the tail of
a lion, and the face of Donald Duck.
["patch_pyqt4_for_qt4.1" (text/plain)]
diff -ru PyQt4-gpl-snapshot-20051224/sip/QtCore/qtextcodec.sip \
PyQt4-gpl-snapshot-20051224.new/sip/QtCore/qtextcodec.sip
--- PyQt4-gpl-snapshot-20051224/sip/QtCore/qtextcodec.sip 2005-12-25 \
04:31:29.000000000 +0100
+++ PyQt4-gpl-snapshot-20051224.new/sip/QtCore/qtextcodec.sip 2005-12-25 \
19:30:23.080699424 +0100 @@ -66,6 +66,8 @@
ConverterState(QFlags<QTextCodec::ConversionFlag> f = \
QTextCodec::DefaultConversion); ~ConverterState();
+ private:
+ ConverterState(const QTextCodec::ConverterState&);
};
QString toUnicode(const char *in /Array/, int length /ArraySize/, \
QTextCodec::ConverterState *state = 0) const; @@ -80,6 +82,9 @@
QTextCodec();
virtual ~QTextCodec();
+private:
+ QTextCodec(const QTextCodec&);
+
public:
static QTextCodec *codecForTr();
static void setCodecForTr(QTextCodec *c);
@@ -96,6 +101,9 @@
#include <qtextcodec.h>
%End
+private:
+ QTextEncoder(const QTextEncoder&);
+
public:
explicit QTextEncoder(const QTextCodec *codec);
~QTextEncoder();
@@ -108,9 +116,13 @@
#include <qtextcodec.h>
%End
+private:
+ QTextDecoder(const QTextDecoder&);
+
public:
explicit QTextDecoder(const QTextCodec *codec);
~QTextDecoder();
QString toUnicode(const char *chars /Array/, int len /ArraySize/);
QString toUnicode(const QByteArray &ba);
+
};
diff -ru PyQt4-gpl-snapshot-20051224/sip/QtGui/qtextformat.sip \
PyQt4-gpl-snapshot-20051224.new/sip/QtGui/qtextformat.sip
--- PyQt4-gpl-snapshot-20051224/sip/QtGui/qtextformat.sip 2005-12-25 \
04:31:28.000000000 +0100
+++ PyQt4-gpl-snapshot-20051224.new/sip/QtGui/qtextformat.sip 2005-12-25 \
19:30:23.132691520 +0100 @@ -119,7 +119,6 @@
ImageName,
ImageWidth,
ImageHeight,
- DocumentFragmentMark,
UserProperty
};
diff -ru PyQt4-gpl-snapshot-20051224/sip/QtGui/qworkspace.sip \
PyQt4-gpl-snapshot-20051224.new/sip/QtGui/qworkspace.sip
--- PyQt4-gpl-snapshot-20051224/sip/QtGui/qworkspace.sip 2005-12-25 \
04:31:29.000000000 +0100
+++ PyQt4-gpl-snapshot-20051224.new/sip/QtGui/qworkspace.sip 2005-12-25 \
20:56:13.969645280 +0100 @@ -53,6 +53,7 @@
public slots:
void setActiveWindow(QWidget *w);
void cascade();
+ void arrangeIcons();
void tile();
void closeActiveWindow();
void closeAllWindows();
_______________________________________________
PyKDE mailing list PyKDE@mats.imk.fraunhofer.de
http://mats.imk.fraunhofer.de/mailman/listinfo/pykde
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic