# HG changeset patch
# User Chris Cannam
# Date 1311259539 -3600
# Node ID 84ce1ddf7a48cfb1a1f21206794aea39354e6f48
# Parent  6e2801ed68a14b8a13fbdd5db5309030730d8bb6
Omit icons from menus on Mac

diff -r 6e2801ed68a1 -r 84ce1ddf7a48 kdiff3/src-QT4/kdiff3.pro
--- 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                        \
diff -r 6e2801ed68a1 -r 84ce1ddf7a48 kdiff3/src-QT4/main.cpp
--- 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;