Merge branch 'singleinstance' into harmattan

Single instance works.

Conflicts:
	ghostsoverboard.desktop
	ghostsoverboard.pro

diff --git a/ghostsoverboard.desktop b/ghostsoverboard.desktop
index 2aa5f4a..5472d95 100644 (file)
--- a/ghostsoverboard.desktop
+++ b/ghostsoverboard.desktop
@@ -4,7 +4,7 @@ Version=1.0
 Type=Application
 Terminal=false
 Name=Ghosts Overboard
-Exec=/opt/ghostsoverboard/bin/ghostsoverboard
+Exec=invoker --single-instance --type=e /opt/ghostsoverboard/bin/ghostsoverboard
 Icon=ghostsoverboard
 X-Window-Icon=ghostsoverboard
 X-HildonDesk-ShowInToolbar=true

diff --git a/ghostsoverboard.pro b/ghostsoverboard.pro
index cc7a97e..039d296 100644 (file)
--- a/ghostsoverboard.pro
+++ b/ghostsoverboard.pro
@@ -51,7 +51,7 @@ unix:!symbian {
     maemo5 {
         target.path = /opt/usr/bin
     } else {
-        target.path = /opt/ghostsoverboard/bin
+    target.path = /opt/ghostsoverboard/bin
     }
     INSTALLS += target
 }

diff --git a/main.cpp b/main.cpp
index 6f7a93a..c8c2ae6 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -23,7 +23,7 @@
 #include <QtGui/QApplication>
 #include "seaview.h"
 
-int main(int argc, char *argv[])
+Q_DECL_EXPORT int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     a.setApplicationName("Ghosts Overboard");

diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index 5497d44..b601ba8 100755 (executable)
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -38,7 +38,7 @@ clean:
        rm -f build-stamp configure-stamp
 
        # Add here commands to clean up after the build process.
-       $(MAKE) clean
+       $(MAKE)  clean
 
        dh_clean