diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2013-11-12 20:45:22 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-11-12 20:45:22 +1100 |
| commit | bf0847b6c71d2effd42481721c3cf94de6a5489e (patch) | |
| tree | 0106dd9d6d51d73d852b05a7f75ea525f7b42314 /kde-misc/kdiff3/files/kdiff3-build.patch | |
| parent | 42124be8b0556bf37c215b78e971d5af7c915c92 (diff) | |
| parent | 00cda536c44b83e9aa7f61913386299cbe6c414b (diff) | |
| download | kde-bf0847b6c71d2effd42481721c3cf94de6a5489e.tar.gz kde-bf0847b6c71d2effd42481721c3cf94de6a5489e.tar.bz2 kde-bf0847b6c71d2effd42481721c3cf94de6a5489e.zip | |
Merge branch 'master' into frameworks
Diffstat (limited to 'kde-misc/kdiff3/files/kdiff3-build.patch')
| -rw-r--r-- | kde-misc/kdiff3/files/kdiff3-build.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/kde-misc/kdiff3/files/kdiff3-build.patch b/kde-misc/kdiff3/files/kdiff3-build.patch new file mode 100644 index 00000000000..14b7147c8cc --- /dev/null +++ b/kde-misc/kdiff3/files/kdiff3-build.patch @@ -0,0 +1,25 @@ +diff --git a/kdiff3/src-QT4/difftextwindow.cpp b/kdiff3/src-QT4/difftextwindow.cpp +index c2c0779..ee104a3 100644 +--- a/kdiff3/src-QT4/difftextwindow.cpp ++++ b/kdiff3/src-QT4/difftextwindow.cpp +@@ -33,6 +33,8 @@ + #include <QUrl> + #include <QMenu> + #include <QTextLayout> ++#include <QRunnable> ++#include <QThreadPool> + + + +diff --git a/kdiff3/src-QT4/progress.cpp b/kdiff3/src-QT4/progress.cpp +index 9e585a3..88947db 100644 +--- a/kdiff3/src-QT4/progress.cpp ++++ b/kdiff3/src-QT4/progress.cpp +@@ -15,6 +15,7 @@ + #include <QPushButton> + #include <QLabel> + #include <QApplication> ++#include <QThread> + #include <kio/job.h> + + #include <klocale.h> |