Merge branch 'qtcreatorpackaging'

Conflicts:
	src/kitchenalert.pro

diff --cc src/kitchenalert.pro
index c850638,956ee91..69f70f4
--- 1/src/kitchenalert.pro
--- 2/src/kitchenalert.pro
+++ b/src/kitchenalert.pro
@@@ -70,10 -83,8 +85,16 @@@ maemo5 
      INSTALLS += desktopfile
  }
  
+ maemo5 {
+     icon.files = kitchenalert.png
+     icon.path = /usr/share/icons/hicolor/64x64/apps
+     INSTALLS += icon
+ }
++
 +OTHER_FILES += \
 +    qtc_packaging/debian_fremantle/rules \
 +    qtc_packaging/debian_fremantle/README \
 +    qtc_packaging/debian_fremantle/copyright \
 +    qtc_packaging/debian_fremantle/control \
 +    qtc_packaging/debian_fremantle/compat \
 +    qtc_packaging/debian_fremantle/changelog