From b24810ab05625b5c3d4994b55059c7815bcb88e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Heli=20Hyv=C3=A4ttinen?= Date: Sat, 3 Sep 2011 19:25:30 +0300 Subject: [PATCH] Single instance attempt Does not start from the lauancher icon anymore --- ghostsoverboard.desktop | 2 +- ghostsoverboard.pro | 2 +- main.cpp | 2 +- qtc_packaging/debian_harmattan/rules | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ghostsoverboard.desktop b/ghostsoverboard.desktop index 3014875..22544f0 100644 --- a/ghostsoverboard.desktop +++ b/ghostsoverboard.desktop @@ -4,7 +4,7 @@ Version=1.0 Type=Application Terminal=false Name=Ghosts Overboard -Exec=/opt/usr/bin/ghostsoverboard +Exec=invoker --single-instance --type=d /opt/ghostsoverboard/bin/ghostsoverboard Icon=ghostsoverboard X-Window-Icon=ghostsoverboard X-HildonDesk-ShowInToolbar=true diff --git a/ghostsoverboard.pro b/ghostsoverboard.pro index 8779bb6..6072405 100644 --- a/ghostsoverboard.pro +++ b/ghostsoverboard.pro @@ -49,7 +49,7 @@ unix:!symbian { maemo5 { target.path = /opt/usr/bin } else { - target.path = /usr/local/bin + target.path = /opt/ghostsoverboard/bin } INSTALLS += target } diff --git a/main.cpp b/main.cpp index 6f7a93a..c8c2ae6 100644 --- a/main.cpp +++ b/main.cpp @@ -23,7 +23,7 @@ #include #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 --- 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 -- 1.7.9.5