Mercurial > hg > easyhg-kdiff3

diff kdiff3/src-QT4/kdiff3.pro @ 95:6f42f5bd218e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- OS2-port by Silvan Scherrer - Fixed writing to KIO. - Fix crash on A/B-overview (infinite recursion)
author joachim99
date Sun, 28 Feb 2010 20:32:34 +0000
parents fcd146072e0c
children f0c42ddbbda4
line wrap: on
line diff
--- a/kdiff3/src-QT4/kdiff3.pro	Sun Feb 28 19:43:48 2010 +0000
+++ b/kdiff3/src-QT4/kdiff3.pro	Sun Feb 28 20:32:34 2010 +0000
@@ -1,7 +1,7 @@
 TEMPLATE = app
 # When unresolved items remain during linking: Try adding "shared" in the CONFIG.
 CONFIG  += qt warn_on thread precompile_header
-PRECOMPILED_HEADER = stable.h
+!os2:PRECOMPILED_HEADER = stable.h
 HEADERS  = version.h                     \
            diff.h                        \
            difftextwindow.h              \
@@ -53,7 +53,9 @@
            QMAKE_LFLAGS += user32.lib shell32.lib
    }
 }
-
+os2 {
+  RC_FILE = kdiff3os2.rc
+}
 
 unix {
   documentation.path = /usr/local/share/doc/kdiff3