aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2002-07-31 13:12:46 +0800
committerwill <will@FreeBSD.org>2002-07-31 13:12:46 +0800
commit10dfcbdbca10e68cf2f892ee1875382d95915f2e (patch)
tree4064795f2d738af19a8ce8987904e9d53d75d2c1 /deskutils
parent56d626df3c54f3a1069268e844122ca10348695a (diff)
downloadfreebsd-ports-gnome-10dfcbdbca10e68cf2f892ee1875382d95915f2e.tar.gz
freebsd-ports-gnome-10dfcbdbca10e68cf2f892ee1875382d95915f2e.tar.zst
freebsd-ports-gnome-10dfcbdbca10e68cf2f892ee1875382d95915f2e.zip
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).
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/kdepim3/files/patch-knote.cpp15
-rw-r--r--deskutils/kdepim4/files/patch-knote.cpp15
-rw-r--r--deskutils/kdepim44/files/patch-knote.cpp15
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() );