Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntushape-include-cleanup into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

[UbuntuShape] Cleaned up includes.

[UbuntuShape] Cleaned up includes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1726
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2527/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1257
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1257/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1254

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2527/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Nothin' fancy to review :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-10-21 12:54:54 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-11-24 11:55:14 +0000
@@ -29,17 +29,13 @@
 #include "ucubuntushapetexture.h"
 #include "ucunits.h"
 #include "quickutils.h"
-#include <QtCore/QPointer>
 #include <QtGui/QGuiApplication>
-#include <QtGui/QScreen>
-#include <QtQuick/QQuickWindow>
-#include <QtQuick/QSGTextureProvider>
+#include <QtQml/QQmlInfo>
+#include <QtQuick/private/qsgadaptationlayer_p.h>
+// This private header uses the emit keyword while we build with QT_NO_KEYWORDS set. See #1507910.
 #define emit Q_EMIT
 #include <QtQuick/private/qquickimage_p.h>
 #undef emit
-#include <QtQuick/private/qsgadaptationlayer_p.h>
-#include <QtQml/qqmlinfo.h>
-#include <math.h>
 
 // Anti-aliasing distance of the contour in pixels.
 const float distanceAApx = 1.75f;

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.h'
--- src/Ubuntu/Components/plugin/ucubuntushape.h	2015-09-10 11:04:16 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.h	2015-11-24 11:55:14 +0000
@@ -21,7 +21,6 @@
 
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QSGNode>
-#include <QtQuick/qsgtexture.h>
 #include <QtQuick/qsgmaterial.h>
 #include <QtGui/QOpenGLFunctions>