Mercurial > hg > easyhg-kdiff3

changeset 109:84ce1ddf7a48 easyhg_kdiff3_simplifications

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Omit icons from menus on Mac
author Chris Cannam
date Thu, 21 Jul 2011 15:45:39 +0100
parents 6e2801ed68a1
children 042422e4eb38
files kdiff3/src-QT4/kdiff3.pro kdiff3/src-QT4/main.cpp
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/kdiff3/src-QT4/kdiff3.pro	Thu May 26 11:03:06 2011 +0100
+++ b/kdiff3/src-QT4/kdiff3.pro	Thu Jul 21 15:45:39 2011 +0100
@@ -1,7 +1,7 @@
 TEMPLATE = app
 DEFINES += SIMPLIFIED_KDIFF3
 # 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                        \
--- a/kdiff3/src-QT4/main.cpp	Thu May 26 11:03:06 2011 +0100
+++ b/kdiff3/src-QT4/main.cpp	Thu Jul 21 15:45:39 2011 +0100
@@ -248,6 +248,12 @@
      KDiff3Shell* p = new KDiff3Shell();
      p->show();
   }
+
+#ifdef Q_OS_MAC
+  // Mac doesn't align menu labels when icons are shown: result is messy --cc
+  app.setAttribute(Qt::AA_DontShowIconsInMenus);
+#endif
+
 //app.installEventFilter( new CFilter );
   int retVal = app.exec();
   return retVal;