From 99caec69bb1416ccd08103f5b527bd430bd7976c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Heli=20Hyv=C3=A4ttinen?= Date: Mon, 25 Jul 2011 22:16:45 +0300 Subject: [PATCH] Cleaned up after automerge --- ghostsoverboard.pro | 3 ++- seascene.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ghostsoverboard.pro b/ghostsoverboard.pro index 4ada6ab..f97d02d 100644 --- 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 --- 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; } -- 1.7.9.5