Mac OS X improvements - Application icon; 'make install' installs to /Applications; Ostinato is able to find drone at startup (as long as both bundles are present together)

.hgignore

@@ -4,6 +4,8 @@ syntax: glob
 *.o
 *.a
 *.exe
+drone.app
+ostinato.app
 
 # Qt generated files
 ui_*.h
@@ -23,6 +25,7 @@ version.cpp
 
 # vim swap files
 *.swp
+.DS_Store
 
 # ctags
 tags

client/mainwindow.cpp

@@ -42,6 +42,11 @@ MainWindow::MainWindow(QWidget *parent)
 {
     QString serverApp = QCoreApplication::applicationDirPath();
 
+#ifdef Q_OS_MAC
+    // applicationDirPath() does not return bundle, but executable inside bundle
+    serverApp.replace("ostinato.app", "drone.app");
+#endif
+
 #ifdef Q_OS_WIN32
     serverApp.append("/drone.exe");
 #else

client/ostinato.pro

@@ -1,6 +1,7 @@
 TEMPLATE = app
 CONFIG += qt
-RC_FILE = ostinato.rc
+win32:RC_FILE = ostinato.rc
+macx:ICON = icons/logo.icns
 QT += network script
 INCLUDEPATH += "../rpc/" "../common/"
 LIBS += -lprotobuf

install.pri

@@ -2,8 +2,13 @@
 # to qmake; if one is not provided, we use the below defaults -
 isEmpty(PREFIX) {
     unix:PREFIX = "/usr/local/"
+    macx:PREFIX = "/Applications/"
     win32:PREFIX = "../"
 }
-target.path = $$PREFIX/bin
+macx {
+    target.path = $$PREFIX/Ostinato
+} else {
+    target.path = $$PREFIX/bin
+}
 
 INSTALLS += target