diff options
| author | Will Andrews <will@FreeBSD.org> | 2002-07-31 05:12:46 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2002-07-31 05:12:46 +0000 |
| commit | a3140d136aced5957b6feebc0c46b2f043903f44 (patch) | |
| tree | 34ae615ce29778d3e90c57f1568c6b56ad605038 /deskutils | |
| parent | 1. Remove redundant @exec/@unexec lines in pkg-plist [alane]. (diff) | |
In the words of Stephan Kulow <coolo@kde.org>:
"That's the penalty of using private interfaces".
Fix build with Qt 3.0.5 by using a patch committed to KDE CVS. It was
backported to KDE_3_0_BRANCH so this patch will be removed with the upgrade
to KDE 3.0.3 (well, if it happens long enough before KDE 3.1).
Notes
Notes:
svn path=/head/; revision=63774
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/kdepim3/files/patch-knote.cpp | 15 | ||||
| -rw-r--r-- | deskutils/kdepim4/files/patch-knote.cpp | 15 | ||||
| -rw-r--r-- | deskutils/kdepim44/files/patch-knote.cpp | 15 |
3 files changed, 45 insertions, 0 deletions
diff --git a/deskutils/kdepim3/files/patch-knote.cpp b/deskutils/kdepim3/files/patch-knote.cpp new file mode 100644 index 000000000000..eed60bebbf01 --- /dev/null +++ b/deskutils/kdepim3/files/patch-knote.cpp @@ -0,0 +1,15 @@ +--- knotes/knote.cpp 2002/06/17 20:23:11 1.61 ++++ knotes/knote.cpp 2002/07/04 08:51:19 1.62 +@@ -497,7 +497,11 @@ + + QTextDocument* textDoc = new QTextDocument( 0 ); + textDoc->setFormatter( new QTextFormatterBreakWords ); +- textDoc->setDefaultFont( font ); // only needed for the pointsize ++#if QT_VERSION > 304 ++ textDoc->setDefaultFormat( font, Qt::black ); // only needed for the pointsize ++#else ++ textDoc->setDefaultFont( font ); // only needed for the pointsize ++#endif + textDoc->setUnderlineLinks( true ); + textDoc->setStyleSheet( m_editor->styleSheet() ); + textDoc->setMimeSourceFactory( m_editor->mimeSourceFactory() ); diff --git a/deskutils/kdepim4/files/patch-knote.cpp b/deskutils/kdepim4/files/patch-knote.cpp new file mode 100644 index 000000000000..eed60bebbf01 --- /dev/null +++ b/deskutils/kdepim4/files/patch-knote.cpp @@ -0,0 +1,15 @@ +--- knotes/knote.cpp 2002/06/17 20:23:11 1.61 ++++ knotes/knote.cpp 2002/07/04 08:51:19 1.62 +@@ -497,7 +497,11 @@ + + QTextDocument* textDoc = new QTextDocument( 0 ); + textDoc->setFormatter( new QTextFormatterBreakWords ); +- textDoc->setDefaultFont( font ); // only needed for the pointsize ++#if QT_VERSION > 304 ++ textDoc->setDefaultFormat( font, Qt::black ); // only needed for the pointsize ++#else ++ textDoc->setDefaultFont( font ); // only needed for the pointsize ++#endif + textDoc->setUnderlineLinks( true ); + textDoc->setStyleSheet( m_editor->styleSheet() ); + textDoc->setMimeSourceFactory( m_editor->mimeSourceFactory() ); diff --git a/deskutils/kdepim44/files/patch-knote.cpp b/deskutils/kdepim44/files/patch-knote.cpp new file mode 100644 index 000000000000..eed60bebbf01 --- /dev/null +++ b/deskutils/kdepim44/files/patch-knote.cpp @@ -0,0 +1,15 @@ +--- knotes/knote.cpp 2002/06/17 20:23:11 1.61 ++++ knotes/knote.cpp 2002/07/04 08:51:19 1.62 +@@ -497,7 +497,11 @@ + + QTextDocument* textDoc = new QTextDocument( 0 ); + textDoc->setFormatter( new QTextFormatterBreakWords ); +- textDoc->setDefaultFont( font ); // only needed for the pointsize ++#if QT_VERSION > 304 ++ textDoc->setDefaultFormat( font, Qt::black ); // only needed for the pointsize ++#else ++ textDoc->setDefaultFont( font ); // only needed for the pointsize ++#endif + textDoc->setUnderlineLinks( true ); + textDoc->setStyleSheet( m_editor->styleSheet() ); + textDoc->setMimeSourceFactory( m_editor->mimeSourceFactory() ); |