comparison mainwindow.cpp @ 212:4c5993d860f3

* OS/X: platform-specific binaries

     QSettings settings;
     settings.beginGroup("Locations");
     QString diff = settings.value("extdiffbinary", "").toString();
     if (diff == "") {
         QStringList bases;
-        bases << "easyhg-extdiff-osx.sh" << "kompare" << "kdiff3" << "meld";
+#ifdef Q_OS_MAC
+        bases << "easyhg-extdiff-osx.sh";
+#endif 
+        bases << "kompare" << "kdiff3" << "meld";
         bool found = false;
         foreach (QString base, bases) {
             diff = findInPath(base, m_myDirPath, true);
             if (diff != base && diff != base + ".exe") {
                 found = true;

     if (v != QVariant()) {
         return v.toString(); // even if empty: user may have specified no external tool
     }
     QString merge;
     QStringList bases;
-    bases << "fmdiff3" << "meld" << "diffuse" << "kdiff3";
+#ifdef Q_OS_MAC
+    bases << "easyhg-merge-osx.sh";
+#endif
+    bases << "meld" << "diffuse" << "kdiff3";
     bool found = false;
     foreach (QString base, bases) {
         merge = findInPath(base, m_myDirPath, true);
         if (merge != base && merge != base + ".exe") {
             found = true;

 #if defined Q_OS_WIN32
             << "wordpad.exe"
             << "C:\\Program Files\\Windows NT\\Accessories\\wordpad.exe"
             << "notepad.exe"
 #elif defined Q_OS_MAC
-            << "textedit"
+            << "/Applications/TextEdit.app/Contents/MacOS/TextEdit"
 #else
             << "gedit" << "kate"
 #endif
             ;
         bool found = false;