Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf

Change-Id: I1ddc8586418c2d6915481c27d95dfa331c32738a

examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc

 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -38,4 +38,8 @@
 
     Click on either of the smiley faces to put a notification in the status area of the Android
     device.
+
+    \include examples-run.qdocinc
+
+    \sa {Qt for Android}, {Qt Android Extras}
 */