Mercurial > hg > easyhg-kdiff3
comparison kdiff3/src-QT4/mergeresultwindow.cpp @ 113:7bca1f1340f6 tip
Build fixes for Xcode 10 / Qt 5.12
| author | Chris Cannam |
|---|---|
| date | Mon, 17 Dec 2018 11:13:01 +0000 |
| parents | 1b9430d5cf2b |
| children |
comparison
equal
deleted
inserted
replaced
| 112:0180c7f92563 | 113:7bca1f1340f6 |
|---|---|
| 45 #include <QEvent> | 45 #include <QEvent> |
| 46 #include <QInputEvent> | 46 #include <QInputEvent> |
| 47 #include <QDropEvent> | 47 #include <QDropEvent> |
| 48 #include <QPaintEvent> | 48 #include <QPaintEvent> |
| 49 #include <QTextStream> | 49 #include <QTextStream> |
| 50 #include <QMimeData> | |
| 50 | 51 |
| 51 #include <klocale.h> | 52 #include <klocale.h> |
| 52 #include <kmessagebox.h> | 53 #include <kmessagebox.h> |
| 53 #include <iostream> | 54 #include <iostream> |
| 54 | 55 |