Merge lp:~timo-jyrinki/ubuntu-system-settings/add_missing_include_qt54 into lp:ubuntu-system-settings

Proposed by Timo Jyrinki
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 1303
Merged at revision: 1312
Proposed branch: lp:~timo-jyrinki/ubuntu-system-settings/add_missing_include_qt54
Merge into: lp:ubuntu-system-settings
Diff against target: 11 lines (+1/-0)
1 file modified
plugins/about/storageabout.cpp (+1/-0)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-system-settings/add_missing_include_qt54
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+249623@code.launchpad.net

Commit message

Add a missing include to QSharedPointer needed to build with Qt 5.4. (LP: #1421607)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/about/storageabout.cpp'
2--- plugins/about/storageabout.cpp 2014-10-24 20:04:30 +0000
3+++ plugins/about/storageabout.cpp 2015-02-13 10:58:35 +0000
4@@ -32,6 +32,7 @@
5 #include <QJsonArray>
6 #include <QJsonDocument>
7 #include <QJsonObject>
8+#include <QtCore/QSharedPointer>
9 #include <QProcess>
10 #include <QVariant>
11 #include <hybris/properties/properties.h>

Subscribers

People subscribed via source and target branches