Merge lp:~marcustomlinson/unity-scopes-api/lp-1275931 into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Added #define hack to allow unity-scopes-api to build with clang-3.4+ (To be removed when Qt is updated to 5.1.1+ on Ubuntu)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/173/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-amd64-ci/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-ci/173
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-ci/173/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-i386-ci/173

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/173/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Could you wrap that in a macro that really checks Qt's version?

#if QT_VERSION < 0x050101
  ...
#endif

review: Needs Fixing

[lp:~marcustomlinson/unity-scopes-api/lp-1275931]

240. By Marcus Tomlinson on 2014-02-26

Added check for Qt version before applying clang-3.4+ hack.

[Marcus Tomlinson (marcustomlinson)]

> Could you wrap that in a macro that really checks Qt's version?
>
> #if QT_VERSION < 0x050101
> ...
> #endif

done.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:240
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/175/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-amd64-ci/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-ci/175
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-armhf-ci/175/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-trusty-i386-ci/175

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/175/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

+1

review: Approve

=== modified file 'include/unity/scopes/internal/smartscopes/HttpClientQtThread.h'
--- include/unity/scopes/internal/smartscopes/HttpClientQtThread.h	2014-02-18 06:38:07 +0000
+++ include/unity/scopes/internal/smartscopes/HttpClientQtThread.h	2014-02-26 14:53:52 +0000
@@ -19,10 +19,20 @@
 #ifndef UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTQTTHREAD_H
 #define UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTQTTHREAD_H
 
+// This hack allows unity-scopes-api to be built with
+// clang-3.4+ and versions of Qt before v5.1.1.
+#if QT_VERSION < 0x050101
+    #define qHash(x,y) qHash(const QUrl &url, uint seed)
+    #include <QUrl>
+    #undef qHash
+#else
+    #include <QUrl>
+#endif
+
+#include <QThread>
+
 #include <unity/util/NonCopyable.h>
 
-#include <QThread>
-#include <QUrl>
 #include <mutex>
 
 class QNetworkReply;