diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-08-04 21:40:47 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-08-04 21:40:47 +0000 |
| commit | d7d1dddbb3b5e2cdcf228bdc828dbfc4f79af4f8 (patch) | |
| tree | 6381947d80756cabce907d8923dcdb40b8c9d21f | |
| parent | 12eeb3c8fffdc6fdff57cf221e7dbeaa3f3f6735 (diff) | |
| download | ports-d7d1dddbb3b5e2cdcf228bdc828dbfc4f79af4f8.tar.gz ports-d7d1dddbb3b5e2cdcf228bdc828dbfc4f79af4f8.zip | |
Notes
| -rw-r--r-- | deskutils/qorganizer/files/patch-qOrganizer-qt-4.5.0 | 22 | ||||
| -rw-r--r-- | polish/kadu/Makefile | 4 |
2 files changed, 24 insertions, 2 deletions
diff --git a/deskutils/qorganizer/files/patch-qOrganizer-qt-4.5.0 b/deskutils/qorganizer/files/patch-qOrganizer-qt-4.5.0 new file mode 100644 index 000000000000..708994d69797 --- /dev/null +++ b/deskutils/qorganizer/files/patch-qOrganizer-qt-4.5.0 @@ -0,0 +1,22 @@ +--- qorganizer.cpp.orig 2009-04-06 07:56:17 +0000 ++++ qorganizer.cpp 2009-04-06 07:56:23 +0000 +@@ -1511,7 +1511,7 @@ void CQTextEdit::insertFromMimeData( con + QImage *image = new QImage(origin); + if(!image->isNull()) + { +- document->addResource(QTextDocument::ImageResource,origin,image); ++ document->addResource(QTextDocument::ImageResource,origin,QVariant::fromValue(image)); + cursor.insertImage(origin); + } + delete image; +--- qorganizer.h.orig 2009-04-06 07:56:12 +0000 ++++ qorganizer.h 2009-04-06 07:56:39 +0000 +@@ -104,6 +104,8 @@ class CQTextEdit:public QTextEdit + + }; + ++Q_DECLARE_METATYPE(QImage*); ++ + //LineEdit with clear button on the right. + + class LineEdit : public QLineEdit diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile index c84d4840f099..9669a334ca1c 100644 --- a/polish/kadu/Makefile +++ b/polish/kadu/Makefile @@ -41,8 +41,8 @@ CMAKE_ARGS= -DENABLE_AUTODOWNLOAD:BOOL=OFF CMAKE_USE_PTHREAD= yes USE_QT_VER= 4 -QT_COMPONENTS= gui dbus linguist_build network qt3support webkit xml \ - qmake_build moc_build rcc_build uic_build +QT_COMPONENTS= gui dbus network qt3support script webkit xml \ + qmake_build linguist_build moc_build rcc_build uic_build WANT_GNOME= yes INSTALLS_ICONS= yes |