Commit 48f604dd authored by Joachim Eibl's avatar Joachim Eibl
Browse files

Qt now at qt-project.org

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@175 c8aa9fed-2811-0410-8543-893ada326672
parent c15f9ab3
...@@ -118,7 +118,7 @@ Requirements & Installation ...@@ -118,7 +118,7 @@ Requirements & Installation
- for Windows - for Windows
- for Mac - for Mac
The version 0.9.97 requires Qt 4.4.0 or newer (from qt.nokia.com) for The version 0.9.97 requires Qt 4.4.0 or newer (from http://qt-project.org/) for
compilation. compilation.
You always need: You always need:
...@@ -147,7 +147,7 @@ Requirements & Installation ...@@ -147,7 +147,7 @@ Requirements & Installation
- for Mac: gcc, g++ with version >=3.4.2 - for Mac: gcc, g++ with version >=3.4.2
Qt-Mac-libraries Qt-Mac-libraries
- Optional: Qt Creator IDE: Development environment optimized for Qt - Optional: Qt Creator IDE: Development environment optimized for Qt
(http://qt.nokia.com) (from http://qt-project.org)
Build-instructions (Un*x): Build-instructions (Un*x):
Assuming Qt is correctly installed run "./configure qt4" which essentially Assuming Qt is correctly installed run "./configure qt4" which essentially
...@@ -191,8 +191,9 @@ Requirements & Installation ...@@ -191,8 +191,9 @@ Requirements & Installation
Using break with c++-methods requires to specify the parameter types Using break with c++-methods requires to specify the parameter types
too. Breakpoints in constructors might not work. too. Breakpoints in constructors might not work.
Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal Building KDiff3 (Qt4) for Mac OSX:
binary (by Michael Schmidt) 0) Build with Qt Creator from the SDK and src-QT4\kdiff3.pro.
Building a universal binary (by Michael Schmidt, perhaps outdated):
1) Install Qt/Mac 4.x with thread support, static libraries and universal 1) Install Qt/Mac 4.x with thread support, static libraries and universal
flag. (For Qt4 run "configure -static"; only necessary if the final binary flag. (For Qt4 run "configure -static"; only necessary if the final binary
should not require shared Qt4-libs.) should not require shared Qt4-libs.)
...@@ -205,7 +206,7 @@ Requirements & Installation ...@@ -205,7 +206,7 @@ Requirements & Installation
4) Execute: 4) Execute:
make make
5) After the build completes copy kdiff3 from the kdiff3-0.9.97/src-QT4 5) After the build completes copy kdiff3 from the kdiff3-0.9.97/src-QT4
directory to: directory to:
/Applications /Applications
Creating and installing the translation messages Creating and installing the translation messages
......
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