Cleaned up after automerge

diff --git a/ghostsoverboard.pro b/ghostsoverboard.pro
index 4ada6ab..f97d02d 100644 (file)
--- a/ghostsoverboard.pro
+++ b/ghostsoverboard.pro
@@ -82,7 +82,8 @@ OTHER_FILES += \
     qtc_packaging/debian_harmattan/copyright \
     qtc_packaging/debian_harmattan/control \
     qtc_packaging/debian_harmattan/compat \
-    qtc_packaging/debian_harmattan/changelog
+    qtc_packaging/debian_harmattan/changelog \
+
 
 unix:!symbian:!maemo5 {
     desktopfile.files = $${TARGET}.desktop

diff --git a/seascene.cpp b/seascene.cpp
index 396cf75..af351c6 100644 (file)
--- a/seascene.cpp
+++ b/seascene.cpp
@@ -474,7 +474,7 @@ void SeaScene::handleScreenTapped()
     {
         qApp->quit();
     }
-    if (pItem != pSettingsItem_)
+
 }
 
 
@@ -686,7 +686,7 @@ void SeaScene::setItemPointersNull()
     pSettingsItem_ = NULL;
     pAboutItem_ = NULL;
     pQuitItem_ = NULL ;
-    pMinimizeItem_ = NULL;
+//    pMinimizeItem_ = NULL; //Fremantle spesific
 
     pAboutBoxItem_ = NULL;
 }