# HG changeset patch # User Chris Cannam # Date 1545045181 0 # Node ID 7bca1f1340f66d0b9eb5f496a18ba49cb1a85507 # Parent 0180c7f925636b7c9043b28f94b3ff683cbb62fc Build fixes for Xcode 10 / Qt 5.12 diff -r 0180c7f92563 -r 7bca1f1340f6 kdiff3/src-QT4/diff.h --- 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; diff -r 0180c7f92563 -r 7bca1f1340f6 kdiff3/src-QT4/difftextwindow.cpp --- 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 #include #include +#include #include #include diff -r 0180c7f92563 -r 7bca1f1340f6 kdiff3/src-QT4/kdiff3.pro --- 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 \ diff -r 0180c7f92563 -r 7bca1f1340f6 kdiff3/src-QT4/mergeresultwindow.cpp --- 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 #include #include +#include #include #include diff -r 0180c7f92563 -r 7bca1f1340f6 kdiff3/src-QT4/pdiff.cpp --- 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 #include #include +#include #include #include diff -r 0180c7f92563 -r 7bca1f1340f6 kdiff3/src-QT4/smalldialogs.cpp --- 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 #include #include +#include #include #include