Merge lp:~dandrader/unity8/fixBuild_lp1328850 into lp:unity8

[Daniel d'Andrada]

Fix build problems. Reviewed by: Michael Terry

[Michael Terry (mterry)]

Worked for me.

review: Approve

[lp:~dandrader/unity8/fixBuild_lp1328850]

964. By Daniel d'Andrada on 2014-06-11

Fix build

"""
tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp:151:23: error: ‘std::function’ has not been declared
     bool waitFor(std::function<bool()> functor, int ms) {
"""

[Michael Terry (mterry)]

OK, actually went all the way through a build this time.

review: Approve

=== modified file 'tests/mocks/libusermetrics/UserMetrics.cpp'
--- tests/mocks/libusermetrics/UserMetrics.cpp	2013-12-17 14:56:25 +0000
+++ tests/mocks/libusermetrics/UserMetrics.cpp	2014-06-11 17:28:04 +0000
@@ -18,6 +18,7 @@
 
 #include "UserMetrics.h"
 #include <qvariantlistmodel.h>
+#include <functional>
 
 #include <QtCore/QDir>
 #include <QtCore/QString>

=== modified file 'tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp'
--- tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp	2013-12-12 12:25:20 +0000
+++ tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp	2014-06-11 17:28:04 +0000
@@ -24,6 +24,8 @@
 #include <QDebug>
 #include <unitymenumodel.h>
 
+#include <functional>
+
 class UnityMenuModelStackTest : public QObject
 {
     Q_OBJECT