Commit a814cee9 authored by Michael Reeves's avatar Michael Reeves

Unoffical 1.7 release in the wild not based on this code bump version.

parent 8707b85a
Version 1.7.0 - 2017-01-23
Version 1.7.90 - 2017-01-23
============================
-ported to QT5/KDEFramework5
-depreciated cmake 2.8.12 support in master
......
......@@ -3,11 +3,10 @@ KDiff3-Readme
Author: Joachim Eibl (joachim.eibl at gmx.de)
Port to KF5/Qt5 by Michael Reeves (reeves.87@gmail.com)
KDiff3-Version: 1.7
KDiff3-Version: 1.7.90
Now requires Qt 5.6 or later and KF5 5.14+. Legacy 0.9.98 and earlier builds are not supported.
Windows/MacOSX build is untested since port. Builds and runs under kubuntu 16.04 will likely
still work under other Linux/Un*x. The Konqueror specific plugin is not ported and no longer mantained.
MacOSX build is untested since port. The Konqueror specific plugin is not ported and no longer mantained.
This plugin would only apply to KDE before 4.6. Support as been removed from main CMakeLists.txt.
As of 1/13/17 cmake 3.1+ is the targeted cmake version.
......@@ -20,7 +19,6 @@ The original pre KF5/Qt5 Readme fallows old build intrustions have been removed
Copyright: (C) 2002-2014 by Joachim Eibl
KDiff3-Version: 0.9.98
KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs.
These are available for Un*x, Windows, Mac.
......@@ -35,14 +33,6 @@ Contents
- Introduction
- License
- Requirements & Installation
- For KDE4
- With Qt4-libs, without KDE
- for Linux/Un*x
- for Windows
- Debugging with MinGW under Windows:
- for Mac: Building KDiff3 for Mac OSX (with Intel processor) as a universal binary
- Creating and installing translation messages
- Additional hints
......
......@@ -65,7 +65,7 @@ Do NOT change these in the translation. -->
<listitem><para>supports version control keyword and history merging.</para></listitem>
</itemizedlist>
</para><para>
This document describes &kdiff3;-version 1.7.0.
This document describes &kdiff3;-version 1.7.90.
</para>
</abstract>
......
......@@ -11,7 +11,7 @@
&Burkhard.Lueck.mail;
</author>
<date>2018-05-19</date>
<releaseinfo>kdiff3 1.7.0</releaseinfo>
<releaseinfo>kdiff3 1.7.90</releaseinfo>
</refentryinfo>
<refmeta>
......
......@@ -110,7 +110,7 @@ int main(int argc, char* argv[])
const QByteArray& appName = QByteArray::fromRawData("kdiff3", 6);
const QString i18nName = i18n("KDiff3");
QByteArray appVersion = QByteArray::fromRawData(VERSION, sizeof(VERSION));
QByteArray appVersion = QByteArray::fromRawData(KDIFF3_VERSION, sizeof(KDIFF3_VERSION));
if(sizeof(void*) == 8)
appVersion += " (64 bit)";
else if(sizeof(void*) == 4)
......@@ -208,5 +208,3 @@ int main(int argc, char* argv[])
return retVal;
}
// Suppress warning with --enable-final
#undef VERSION
#undef VERSION
#define VERSION "1.7.0"
#undef KDIFF3_VERSION
#define KDIFF3_VERSION "1.7.90"
......@@ -3,7 +3,7 @@
;Apdapted for KDiff3 by Sebastien Fricker and Joachim Eibl
;Requires nsis_v2.19
!define KDIFF3_VERSION "0.9.98"
!define KDIFF3_VERSION "1.70.90"
!define DIFF_EXT32_CLSID "{9F8528E4-AB20-456E-84E5-3CE69D8720F3}"
!define DIFF_EXT64_CLSID "{34471FFB-4002-438b-8952-E4588D0C0FE9}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment