Mercurial > hg > easyhg-kdiff3

changeset 113:7bca1f1340f6 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build fixes for Xcode 10 / Qt 5.12
author Chris Cannam
date Mon, 17 Dec 2018 11:13:01 +0000
parents 0180c7f92563
children
files kdiff3/src-QT4/diff.h kdiff3/src-QT4/difftextwindow.cpp kdiff3/src-QT4/kdiff3.pro kdiff3/src-QT4/mergeresultwindow.cpp kdiff3/src-QT4/pdiff.cpp kdiff3/src-QT4/smalldialogs.cpp
diffstat 6 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kdiff3/src-QT4/diff.h	Fri Dec 07 13:40:01 2018 +0000
+++ b/kdiff3/src-QT4/diff.h	Mon Dec 17 11:13:01 2018 +0000
@@ -115,7 +115,7 @@
       pFineAB=0; pFineBC=0; pFineCA=0;
    }
 
-   bool operator==( const Diff3Line& d3l )
+   bool operator==( const Diff3Line& d3l ) const
    {
       return lineA == d3l.lineA  &&  lineB == d3l.lineB  &&  lineC == d3l.lineC  
          && bAEqB == d3l.bAEqB  && bAEqC == d3l.bAEqC  && bBEqC == d3l.bBEqC;
--- a/kdiff3/src-QT4/difftextwindow.cpp	Fri Dec 07 13:40:01 2018 +0000
+++ b/kdiff3/src-QT4/difftextwindow.cpp	Mon Dec 17 11:13:01 2018 +0000
@@ -31,6 +31,7 @@
 #include <QLayout>
 #include <QTextCodec>
 #include <QUrl>
+#include <QMimeData>
 
 #include <klocale.h>
 #include <kfiledialog.h>
--- a/kdiff3/src-QT4/kdiff3.pro	Fri Dec 07 13:40:01 2018 +0000
+++ b/kdiff3/src-QT4/kdiff3.pro	Mon Dec 17 11:13:01 2018 +0000
@@ -1,7 +1,7 @@
 TEMPLATE = app
 QT += widgets printsupport
 # When unresolved items remain during linking: Try adding "shared" in the CONFIG.
-CONFIG  += qt warn_on thread precompile_header
+CONFIG  += qt warn_on thread
 !os2:PRECOMPILED_HEADER = stable.h
 HEADERS  = version.h                     \
            diff.h                        \
--- a/kdiff3/src-QT4/mergeresultwindow.cpp	Fri Dec 07 13:40:01 2018 +0000
+++ b/kdiff3/src-QT4/mergeresultwindow.cpp	Mon Dec 17 11:13:01 2018 +0000
@@ -47,6 +47,7 @@
 #include <QDropEvent>
 #include <QPaintEvent>
 #include <QTextStream>
+#include <QMimeData>
 
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/kdiff3/src-QT4/pdiff.cpp	Fri Dec 07 13:40:01 2018 +0000
+++ b/kdiff3/src-QT4/pdiff.cpp	Mon Dec 17 11:13:01 2018 +0000
@@ -36,6 +36,7 @@
 #include <QDropEvent>
 #include <QUrl>
 #include <QProcess>
+#include <QMimeData>
 
 #include <klocale.h>
 #include <kmessagebox.h>
--- a/kdiff3/src-QT4/smalldialogs.cpp	Fri Dec 07 13:40:01 2018 +0000
+++ b/kdiff3/src-QT4/smalldialogs.cpp	Mon Dec 17 11:13:01 2018 +0000
@@ -33,6 +33,7 @@
 #include <QDropEvent>
 #include <QMenu>
 #include <QPushButton>
+#include <QMimeData>
 
 #include <kfiledialog.h>
 #include <klocale.h>