Merge lp:~dobey/ubuntuone-credentials/qtinfo-fix into lp:ubuntuone-credentials

[dobey]

Handle the new QtInfoMsg type when compiling against Qt >= 5.5.

[lp:~dobey/ubuntuone-credentials/qtinfo-fix]

221. By dobey on 2015-12-02

Do the version check correctly.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:220
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/133/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/134/rebuild

review: Approve (continuous-integration)

[Kyle Fazzari (kyrofa)]

Looks good to me.

review: Approve

=== modified file 'libubuntuoneauth/logging.cpp'
--- libubuntuoneauth/logging.cpp	2014-08-01 15:09:37 +0000
+++ libubuntuoneauth/logging.cpp	2015-12-02 15:38:58 +0000
@@ -18,6 +18,7 @@
 #include <QDateTime>
 #include <QDir>
 #include <QStandardPaths>
+#include <QtGlobal>
 
 #include "logging.h"
 
@@ -92,6 +93,11 @@
         case QtFatalMsg:
             return QStringLiteral("FATAL");
             break;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+        case QtInfoMsg:
+            return QStringLiteral("INFO");
+            break;
+#endif
         }
         return QStringLiteral("UNKNOWN");
     }