Mercurial > hg > easyhg-kdiff3

diff kdiff3/src/kdiff3.pro @ 68:d7cafcda8c99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
KDiff3 0.9.87
author joachim99
date Mon, 31 Jan 2005 22:30:47 +0000
parents 8af4bb9d9a5a
children 8febbfb1148c
line wrap: on
line diff
--- a/kdiff3/src/kdiff3.pro	Thu Sep 16 02:45:37 2004 +0000
+++ b/kdiff3/src/kdiff3.pro	Mon Jan 31 22:30:47 2005 +0000
@@ -1,5 +1,7 @@
 TEMPLATE = app
+# When unresolved items remain during linking: Try adding "shared" in the CONFIG.
 CONFIG  += qt warn_on thread release
+
 HEADERS  = version.h diff.h kdiff3.h merger.h optiondialog.h kreplacements/kreplacements.h \
                   directorymergewindow.h fileaccess.h kdiff3_shell.h kdiff3_part.h
 SOURCES  = diff.cpp difftextwindow.cpp kdiff3.cpp main.cpp merger.cpp mergeresultwindow.cpp \
@@ -11,9 +13,9 @@
 
 win32 {
    QMAKE_CXXFLAGS_DEBUG  -= -Zi
-   QMAKE_CXXFLAGS_DEBUG  += -GX -GR -Z7 /FR
+   QMAKE_CXXFLAGS_DEBUG  += -GX -GR -Z7 /FR -DQT_NO_ASCII_CAST
    QMAKE_LFLAGS_DEBUG  += /PDB:NONE
-   QMAKE_CXXFLAGS_RELEASE  += -GX -GR -DNDEBUG
+   QMAKE_CXXFLAGS_RELEASE  += -GX -GR -DNDEBUG -DQT_NO_ASCII_CAST
    RC_FILE = kdiff3.rc
 }
 unix {