Merge lp:~michihenning/storage-framework/qt-cmake-fixes into lp:storage-framework/devel

[Michi Henning]

Get rid of the old qt5_use_modules macros.
Changed cmake files to build the local and remote libs in the qt/client
dir because we cannot add .moc files to OBJECT libraries on Vivid.
Added GENERATED property to generated files.
Adjusted indentation in a few places.
Fixed a bunch of clang warnings.
Added work-around for gcc 4.9 bug on Vivid.
Fixed build failure with boost::filesystem on Vivid.
Changed source package format back to 1.0 due to bug in Jenkins.

Get rid of the old qt5_use_modules macros.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:25
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/14/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/137/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/145
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/92
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/92
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/92
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/74/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/74/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/74/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/74/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/74/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/74/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/74/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/74/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/74/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:26
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/15/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/141/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/149
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/96
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/96
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/96
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/78/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/78/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/78/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/78/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/78/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/78/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/78/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/78/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/78/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:27
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/16/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/142/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/150
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/97
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/97
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/97
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/79/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/79/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/79/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/79/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/79/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/79/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/79/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/79/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/79/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:29
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/17/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/145/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/153
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/100
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/100
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/100
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/81/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/81/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/81/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/81/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/81/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/81/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/81/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/81/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/81/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/17/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:38
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/18/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/154/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/162
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/107
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/107
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/107
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/88/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/88/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/88/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/88/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/88/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/88/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/88/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/88/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/88/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/18/rebuild

review: Needs Fixing (continuous-integration)

[James Henstridge (jamesh)]

This mostly looks good. I noted a few problems though that I've noted with inline comments.

review: Needs Fixing

[James Henstridge (jamesh)]

Also, you've added libunity-api-dev to Build-Depends in debian/control. Do we actually need it? I don't see any of its headers included anywhere.

[lp:~michihenning/storage-framework/qt-cmake-fixes]

39. By Michi Henning on 2016-07-20

Fixed broken coverage in top-level cmake file. Simplified boost version check.

[Michi Henning (michihenning)]

We need unity-api because I'm using ResourcePtr. It's a build dependency only because ResourcePtr is a template.

I fixed the other two issues, thanks!

[James Henstridge (jamesh)]

Looks great.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-11 03:28:40 +0000
+++ CMakeLists.txt	2016-07-20 01:16:16 +0000
@@ -106,6 +106,7 @@
 find_package(Qt5Core REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(Qt5Network REQUIRED)
+find_package(Qt5Test REQUIRED)
 
 include(FindPkgConfig)
 pkg_check_modules(APPARMOR_DEPS REQUIRED libapparmor)
@@ -121,7 +122,7 @@
 
 enable_coverage_report(
     TARGETS
-        qt-client-lib-public
+        qt-client-lib-common
         storage-framework-qt-client
         storage-framework-qt-local-client
     FILTER

=== modified file 'debian/control'
--- debian/control	2016-07-12 02:22:05 +0000
+++ debian/control	2016-07-20 01:16:16 +0000
@@ -16,6 +16,7 @@
                libglib2.0-dev,
                libgtest-dev,
                libonline-accounts-qt-dev,
+               libunity-api-dev,
                qtbase5-dev,
                qtbase5-dev-tools,
 Homepage: https://launchpad.net/storage-framework

=== modified file 'debian/source/format'
--- debian/source/format	2016-07-12 02:22:05 +0000
+++ debian/source/format	2016-07-20 01:16:16 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+1.0

=== modified file 'include/unity/storage/provider/UploadJob.h'
--- include/unity/storage/provider/UploadJob.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/provider/UploadJob.h	2016-07-20 01:16:16 +0000
@@ -30,7 +30,7 @@
 namespace provider
 {
 
-class Item;
+struct Item;
 
 namespace internal
 {

=== modified file 'include/unity/storage/provider/internal/Handler.h'
--- include/unity/storage/provider/internal/Handler.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/provider/internal/Handler.h	2016-07-20 01:16:16 +0000
@@ -34,7 +34,7 @@
 namespace provider
 {
 
-class Context;
+struct Context;
 class ProviderBase;
 
 namespace internal

=== modified file 'include/unity/storage/qt/client/internal/boost_filesystem.h'
--- include/unity/storage/qt/client/internal/boost_filesystem.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/qt/client/internal/boost_filesystem.h	2016-07-20 01:16:16 +0000
@@ -20,7 +20,7 @@
 
 #include <boost/version.hpp>
 
-#if BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 & 1000 <= 55
+#if BOOST_VERSION < 105500
     #define BOOST_NO_CXX11_SCOPED_ENUMS
     #include <boost/filesystem.hpp>
     #undef BOOST_NO_CXX11_SCOPED_ENUMS

=== modified file 'include/unity/storage/qt/client/internal/local_client/AccountImpl.h'
--- include/unity/storage/qt/client/internal/local_client/AccountImpl.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/qt/client/internal/local_client/AccountImpl.h	2016-07-20 01:16:16 +0000
@@ -51,7 +51,6 @@
     QString owner_id_;                        // Immutable
     QString description_;                     // Immutable
     QVector<std::shared_ptr<Root>> roots_;    // Immutable
-    std::atomic_bool copy_in_progress_;
 };
 
 }  // namespace local_client

=== modified file 'include/unity/storage/qt/client/internal/local_client/ItemImpl.h'
--- include/unity/storage/qt/client/internal/local_client/ItemImpl.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/qt/client/internal/local_client/ItemImpl.h	2016-07-20 01:16:16 +0000
@@ -19,10 +19,9 @@
 #pragma once
 
 #include <unity/storage/common.h>
+#include <unity/storage/qt/client/internal/boost_filesystem.h>
 #include <unity/storage/qt/client/internal/ItemBase.h>
 
-#include <boost/filesystem.hpp>
-
 #include <mutex>
 
 namespace unity

=== modified file 'include/unity/storage/qt/client/internal/remote_client/FileImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/FileImpl.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/qt/client/internal/remote_client/FileImpl.h	2016-07-20 01:16:16 +0000
@@ -28,7 +28,7 @@
 namespace internal
 {
 
-class ItemMetadata;
+struct ItemMetadata;
 
 }  // namespace internal
 

=== modified file 'include/unity/storage/qt/client/internal/remote_client/Handler.h'
--- include/unity/storage/qt/client/internal/remote_client/Handler.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/qt/client/internal/remote_client/Handler.h	2016-07-20 01:16:16 +0000
@@ -44,8 +44,8 @@
 public:
     template<typename ... DBusArgs>
     Handler(QObject* parent,
-            QDBusPendingReply<DBusArgs...> const& reply,
-            std::function<void(decltype(reply) const&, QFutureInterface<T>&)> closure);
+            QDBusPendingReply<DBusArgs...>& reply,
+            std::function<void(decltype(reply)&, QFutureInterface<T>&)> closure);
 
     QFuture<T> future();
 
@@ -53,12 +53,23 @@
     QFutureInterface<T> qf_;
 };
 
+// TODO: HACK: The reply argument really should be passed by const reference, which also
+//             would make the explicit conversion of the call to QDBusPendingReply<QDBusArgs...>
+//             unnecessary. But this doesn't work with gcc 4.9: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60420
+//             Once we get rid of Vivid, this should be changed back to
+//
+//             Handler<T>::Handler(QObject* parent,
+//                                 QDBusPendingReply<DBusArgs...> const& reply,
+//                                 std::function<void(decltype(reply) const&, QFutureInterface<T>&)> closure)
+
 template<typename T>
 template<typename ... DBusArgs>
-Handler<T>::Handler(QObject* parent, QDBusPendingReply<DBusArgs...> const& reply, std::function<void(decltype(reply) const&, QFutureInterface<T>&)> closure)
+Handler<T>::Handler(QObject* parent,
+                    QDBusPendingReply<DBusArgs...>& reply,
+                    std::function<void(decltype(reply)&, QFutureInterface<T>&)> closure)
     : HandlerBase(parent,
                   reply,
-                  [this, closure](QDBusPendingCallWatcher const& call)
+                  [this, closure](QDBusPendingCallWatcher& call)
                       {
                           if (call.isError())
                           {
@@ -67,7 +78,9 @@
                               qf_.reportFinished();
                               return;
                           }
-                          closure(call, qf_);
+                          // TODO: See HACK above. Should just be closure(call, qf_);
+                          QDBusPendingReply<DBusArgs...> r = call;
+                          closure(r, qf_);
                       })
 {
     qf_.reportStarted();

=== modified file 'include/unity/storage/qt/client/internal/remote_client/HandlerBase.h'
--- include/unity/storage/qt/client/internal/remote_client/HandlerBase.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/qt/client/internal/remote_client/HandlerBase.h	2016-07-20 01:16:16 +0000
@@ -47,9 +47,15 @@
     Q_OBJECT
 
 public:
+    // TODO: HACK: gcc 4.9 bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60420
+    //             Once we get rid of Vivid, this should be changed back to
+    //
+    //             HandlerBase(QObject* parent,
+    //                         QDBusPendingCall const& call,
+    //                         std::function<void(QDBusPendingCallWatcher const&)> const& closure);
     HandlerBase(QObject* parent,
-                QDBusPendingCall const& call,
-                std::function<void(QDBusPendingCallWatcher const&)> closure);
+                QDBusPendingCall& call,
+                std::function<void(QDBusPendingCallWatcher&)> const& closure);
 
 public Q_SLOTS:
     void finished(QDBusPendingCallWatcher* call);
@@ -58,7 +64,7 @@
     QDBusPendingCallWatcher watcher_;
 
 private:
-    std::function<void(QDBusPendingCallWatcher const&)> closure_;
+    std::function<void(QDBusPendingCallWatcher&)> closure_;
 };
 
 }  // namespace remote_client

=== modified file 'include/unity/storage/qt/client/internal/remote_client/RootImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/RootImpl.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/qt/client/internal/remote_client/RootImpl.h	2016-07-20 01:16:16 +0000
@@ -28,7 +28,7 @@
 namespace internal
 {
 
-class ItemMetadata;
+struct ItemMetadata;
 
 }  // namespace internal
 

=== modified file 'src/provider/CMakeLists.txt'
--- src/provider/CMakeLists.txt	2016-07-11 03:28:40 +0000
+++ src/provider/CMakeLists.txt	2016-07-20 01:16:16 +0000
@@ -11,6 +11,8 @@
 set_source_files_properties(bus.xml PROPERTIES CLASSNAME BusInterface)
 qt5_add_dbus_interface(generated_files bus.xml businterface)
 
+set_source_files_properties(${generated_files} PROPERTIES GENERATED TRUE)
+
 add_library(storage-framework-provider SHARED
   DownloadJob.cpp
   ProviderBase.cpp
@@ -46,7 +48,6 @@
   SOVERSION ${SF_PROVIDER_SOVERSION}
   VERSION ${SF_PROVIDER_LIBVERSION}
 )
-qt5_use_modules(storage-framework-provider Core DBus Network)
 target_link_libraries(storage-framework-provider
   Qt5::Core
   Qt5::DBus

=== modified file 'src/provider/internal/dbusmarshal.cpp'
--- src/provider/internal/dbusmarshal.cpp	2016-07-12 02:22:05 +0000
+++ src/provider/internal/dbusmarshal.cpp	2016-07-20 01:16:16 +0000
@@ -51,7 +51,7 @@
     return argument;
 }
 
-QDBusArgument const& operator>>(QDBusArgument const& argument, Item& item)
+QDBusArgument const& operator>>(QDBusArgument const&, Item&)
 {
     throw std::runtime_error("Item decode not implemented");
 }
@@ -67,7 +67,7 @@
     return argument;
 }
 
-QDBusArgument const& operator>>(QDBusArgument const& argument, ItemList& items)
+QDBusArgument const& operator>>(QDBusArgument const&, ItemList&)
 {
     throw std::runtime_error("std::vector<Item> decode not implemented");
 }

=== modified file 'src/qt/client/CMakeLists.txt'
--- src/qt/client/CMakeLists.txt	2016-07-11 03:28:40 +0000
+++ src/qt/client/CMakeLists.txt	2016-07-20 01:16:16 +0000
@@ -1,4 +1,7 @@
-add_library(qt-client-lib-public OBJECT
+# Create an OBJECT library for the files that are used by both
+# local and remote client libraries, so we don't compile them twice.
+
+add_library(qt-client-lib-common OBJECT
     Account.cpp
     Downloader.cpp
     Exceptions.cpp
@@ -19,61 +22,95 @@
     ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/DownloaderBase.h
     ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/UploaderBase.h
 )
-target_include_directories(qt-client-lib-public PRIVATE
-  ${Qt5Core_INCLUDE_DIRS}
-  ${Qt5Network_INCLUDE_DIRS})
-set_target_properties(qt-client-lib-public PROPERTIES
-  AUTOMOC TRUE
-  POSITION_INDEPENDENT_CODE TRUE
-)
-
+target_include_directories(qt-client-lib-common PRIVATE
+    ${Qt5Network_INCLUDE_DIRS}
+)
+set_target_properties(qt-client-lib-common PROPERTIES
+    AUTOMOC TRUE
+    POSITION_INDEPENDENT_CODE TRUE
+)
+
+# We build both local and remote client libraries here instead
+# of creating OBJECT libraries for them because cmake 3.0.2 (which
+# is in the Vivid overlay) cannot handle .moc files in OBJECT libraries.
+
+# Descend into the child directories first. The CMakeLists.txt files
+# there set QT_CLIENT_LIB_LOCAL_SRC and QT_CLIENT_LIB_REMOTE_SRC.
 add_subdirectory(internal)
 
 # Build the local loopback client library
 add_library(storage-framework-qt-local-client SHARED
-  $<TARGET_OBJECTS:qt-client-lib-public>
-  $<TARGET_OBJECTS:qt-client-lib-local>)
-qt5_use_modules(storage-framework-qt-local-client Concurrent Core Network)
+    $<TARGET_OBJECTS:qt-client-lib-common>
+    ${QT_CLIENT_LIB_LOCAL_SRC}
+)
+target_include_directories(storage-framework-qt-local-client PRIVATE
+    ${GLIB_DEPS_INCLUDE_DIRS}
+    ${Qt5Core_INCLUDE_DIRS}
+    ${Qt5Network_INCLUDE_DIRS}
+    ${Qt5Concurrent_INCLUDE_DIRS}
+)
 set_target_properties(storage-framework-qt-local-client PROPERTIES
-  AUTOMOC TRUE
-  LINK_FLAGS "-Wl,--no-undefined"
-  OUTPUT_NAME "storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}"
-  SOVERSION ${SF_CLIENT_SOVERSION}
-  VERSION ${SF_CLIENT_LIBVERSION}
+    AUTOMOC TRUE
+    POSITION_INDEPENDENT_CODE TRUE
+    LINK_FLAGS "-Wl,--no-undefined"
+    OUTPUT_NAME "storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}"
+    SOVERSION ${SF_CLIENT_SOVERSION}
+    VERSION ${SF_CLIENT_LIBVERSION}
 )
 target_link_libraries(storage-framework-qt-local-client
     Qt5::Concurrent
     Qt5::Core
     Qt5::Network
     ${Boost_LIBRARIES}
-    ${GLIB_DEPS_LIBRARIES})
-
+    ${GLIB_DEPS_LIBRARIES}
+)
 install(
-  TARGETS storage-framework-qt-local-client
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    TARGETS storage-framework-qt-local-client
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 configure_file(
-  storage-framework-qt-local-client.pc.in
-  storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
+    storage-framework-qt-local-client.pc.in
+    storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
 )
 install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 
 # Build the remote client library
+set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES
+    CLASSNAME ProviderInterface
+    INCLUDE unity/storage/qt/client/internal/remote_client/dbusmarshal.h
+)
+
+qt5_add_dbus_interface(generated_files
+    ${CMAKE_SOURCE_DIR}/data/provider.xml
+    ProviderInterface
+)
+set_source_files_properties(${generated_files} PROPERTIES
+    COMPILE_FLAGS -Wno-ctor-dtor-privacy
+    GENERATED TRUE
+)
 
 add_library(storage-framework-qt-client SHARED
-    $<TARGET_OBJECTS:qt-client-lib-public>
-    $<TARGET_OBJECTS:qt-client-lib-remote>)
-qt5_use_modules(storage-framework-qt-client Core DBus Network)
+    $<TARGET_OBJECTS:qt-client-lib-common>
+    ${QT_CLIENT_LIB_REMOTE_SRC}
+    ${generated_files}
+)
+target_include_directories(storage-framework-qt-client PRIVATE
+    ${GLIB_DEPS_INCLUDE_DIRS}
+    ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
+    ${Qt5Core_INCLUDE_DIRS}
+    ${Qt5DBus_INCLUDE_DIRS}
+    ${Qt5Network_INCLUDE_DIRS}
+)
 set_target_properties(storage-framework-qt-client PROPERTIES
-  AUTOMOC TRUE
-  LINK_FLAGS "-Wl,--no-undefined"
-  OUTPUT_NAME "storage-framework-qt-client-${SF_CLIENT_API_VERSION}"
-  SOVERSION ${SF_CLIENT_SOVERSION}
-  VERSION ${SF_CLIENT_LIBVERSION}
+    AUTOMOC TRUE
+    LINK_FLAGS "-Wl,--no-undefined"
+    OUTPUT_NAME "storage-framework-qt-client-${SF_CLIENT_API_VERSION}"
+    SOVERSION ${SF_CLIENT_SOVERSION}
+    VERSION ${SF_CLIENT_LIBVERSION}
 )
 target_link_libraries(storage-framework-qt-client
     Qt5::Concurrent
@@ -81,18 +118,18 @@
     Qt5::DBus
     Qt5::Network
     ${Boost_LIBRARIES}
-    ${ONLINEACCOUNTS_DEPS_LDFLAGS})
-
+    ${ONLINEACCOUNTS_DEPS_LDFLAGS}
+)
 install(
-  TARGETS storage-framework-qt-client
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    TARGETS storage-framework-qt-client
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 configure_file(
-  storage-framework-qt-client.pc.in
-  storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
+    storage-framework-qt-client.pc.in
+    storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
 )
 install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )

=== modified file 'src/qt/client/internal/CMakeLists.txt'
--- src/qt/client/internal/CMakeLists.txt	2016-06-22 04:51:19 +0000
+++ src/qt/client/internal/CMakeLists.txt	2016-07-20 01:16:16 +0000
@@ -1,2 +1,5 @@
 add_subdirectory(local_client)
 add_subdirectory(remote_client)
+
+SET(QT_CLIENT_LIB_REMOTE_SRC ${QT_CLIENT_LIB_REMOTE_SRC} PARENT_SCOPE)
+SET(QT_CLIENT_LIB_LOCAL_SRC ${QT_CLIENT_LIB_LOCAL_SRC} PARENT_SCOPE)

=== modified file 'src/qt/client/internal/local_client/CMakeLists.txt'
--- src/qt/client/internal/local_client/CMakeLists.txt	2016-07-11 02:55:24 +0000
+++ src/qt/client/internal/local_client/CMakeLists.txt	2016-07-20 01:16:16 +0000
@@ -1,24 +1,16 @@
-add_library(qt-client-lib-local OBJECT
-    AccountImpl.cpp
-    DownloaderImpl.cpp
-    FileImpl.cpp
-    FolderImpl.cpp
-    ItemImpl.cpp
-    RootImpl.cpp
-    Runtime_create.cpp
-    RuntimeImpl.cpp
-    UploaderImpl.cpp
-    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h
-    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/UploaderImpl.h
-    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/RuntimeImpl.h
-    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/RuntimeBase.h
-)
-target_include_directories(qt-client-lib-local PRIVATE
-  ${GLIB_DEPS_INCLUDE_DIRS}
-  ${Qt5Core_INCLUDE_DIRS}
-  ${Qt5Network_INCLUDE_DIRS}
-  ${Qt5Concurrent_INCLUDE_DIRS})
-set_target_properties(qt-client-lib-local PROPERTIES
-  AUTOMOC TRUE
-  POSITION_INDEPENDENT_CODE TRUE
+set(QT_CLIENT_LIB_LOCAL_SRC
+        ${CMAKE_CURRENT_SOURCE_DIR}/AccountImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/DownloaderImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/FileImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/FolderImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/ItemImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/RootImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Runtime_create.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/RuntimeImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/UploaderImpl.cpp
+        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h
+        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/UploaderImpl.h
+        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/RuntimeImpl.h
+        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/RuntimeBase.h
+    PARENT_SCOPE
 )

=== modified file 'src/qt/client/internal/remote_client/CMakeLists.txt'
--- src/qt/client/internal/remote_client/CMakeLists.txt	2016-07-11 05:42:50 +0000
+++ src/qt/client/internal/remote_client/CMakeLists.txt	2016-07-20 01:16:16 +0000
@@ -1,36 +1,15 @@
-set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES
-  CLASSNAME ProviderInterface
-  INCLUDE unity/storage/qt/client/internal/remote_client/dbusmarshal.h)
-
-qt5_add_dbus_interface(generated_files
-    ${CMAKE_SOURCE_DIR}/data/provider.xml
-    ProviderInterface)
-set_source_files_properties(${generated_files} PROPERTIES COMPILE_FLAGS -Wno-ctor-dtor-privacy)
-
-add_library(qt-client-lib-remote OBJECT
-    AccountImpl.cpp
-    dbusmarshal.cpp
-    DownloaderImpl.cpp
-    FileImpl.cpp
-    FolderImpl.cpp
-    HandlerBase.cpp
-    ItemImpl.cpp
-    RootImpl.cpp
-    Runtime_create.cpp
-    RuntimeImpl.cpp
-    UploaderImpl.cpp
-    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/remote_client/HandlerBase.h
-    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/remote_client/RuntimeImpl.h
-    ${generated_files}
-)
-target_include_directories(qt-client-lib-remote PRIVATE
-  ${GLIB_DEPS_INCLUDE_DIRS}
-  ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
-  ${Qt5Core_INCLUDE_DIRS}
-  ${Qt5DBus_INCLUDE_DIRS}
-  ${Qt5Network_INCLUDE_DIRS}
-  )
-set_target_properties(qt-client-lib-remote PROPERTIES
-  AUTOMOC TRUE
-  POSITION_INDEPENDENT_CODE TRUE
-)
+set(QT_CLIENT_LIB_REMOTE_SRC
+        ${CMAKE_CURRENT_SOURCE_DIR}/AccountImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/dbusmarshal.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/DownloaderImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/FileImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/FolderImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/HandlerBase.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/ItemImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/RootImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Runtime_create.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/RuntimeImpl.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/UploaderImpl.cpp
+        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/remote_client/HandlerBase.h
+        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/remote_client/RuntimeImpl.h
+    PARENT_SCOPE)

=== modified file 'src/qt/client/internal/remote_client/FileImpl.cpp'
--- src/qt/client/internal/remote_client/FileImpl.cpp	2016-07-12 02:22:05 +0000
+++ src/qt/client/internal/remote_client/FileImpl.cpp	2016-07-20 01:16:16 +0000
@@ -91,8 +91,10 @@
         return make_exceptional_future<shared_ptr<Downloader>>(DeletedException());
     }
 
-    auto process_create_downloader_reply = [this](QDBusPendingReply<QString, QDBusUnixFileDescriptor> const& reply,
-                                                  QFutureInterface<std::shared_ptr<Downloader>>& qf)
+    auto reply = provider().Download(md_.item_id);
+
+    auto process_reply = [this](QDBusPendingReply<QString, QDBusUnixFileDescriptor> const& reply,
+                                QFutureInterface<std::shared_ptr<Downloader>>& qf)
     {
         auto download_id = reply.argumentAt<0>();
         auto fd = reply.argumentAt<1>();
@@ -108,9 +110,7 @@
         }
     };
 
-    auto handler = new Handler<shared_ptr<Downloader>>(this,
-                                                       provider().Download(md_.item_id),
-                                                       process_create_downloader_reply);
+    auto handler = new Handler<shared_ptr<Downloader>>(this, reply, process_reply);
     return handler->future();
 }
 

=== modified file 'src/qt/client/internal/remote_client/HandlerBase.cpp'
--- src/qt/client/internal/remote_client/HandlerBase.cpp	2016-07-12 02:22:05 +0000
+++ src/qt/client/internal/remote_client/HandlerBase.cpp	2016-07-20 01:16:16 +0000
@@ -41,8 +41,8 @@
 {
 
 HandlerBase::HandlerBase(QObject* parent,
-                         QDBusPendingCall const& call,
-                         function<void(QDBusPendingCallWatcher const&)> closure)
+                         QDBusPendingCall& call,
+                         function<void(QDBusPendingCallWatcher&)> const& closure)
     : QObject(parent)
     , watcher_(call)
     , closure_(closure)

=== modified file 'tests/local-client/CMakeLists.txt'
--- tests/local-client/CMakeLists.txt	2016-06-22 04:51:19 +0000
+++ tests/local-client/CMakeLists.txt	2016-07-20 01:16:16 +0000
@@ -4,9 +4,9 @@
 add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
 include_directories(${GLIB_DEPS_INCLUDE_DIRS})
 
-qt5_use_modules(local-client_test Test)
 target_link_libraries(local-client_test
     storage-framework-qt-local-client
+    Qt5::Test
     gtest
 )
 add_test(local-client local-client_test)

=== modified file 'tests/local-client/local-client_test.cpp'
--- tests/local-client/local-client_test.cpp	2016-07-12 02:22:05 +0000
+++ tests/local-client/local-client_test.cpp	2016-07-20 01:16:16 +0000
@@ -18,7 +18,8 @@
 
 #include <unity/storage/qt/client/client-api.h>
 
-#include <boost/filesystem.hpp>
+#include <unity/storage/qt/client/internal/boost_filesystem.h>
+
 #include <gtest/gtest.h>
 #include <QCoreApplication>
 #include <QFile>

=== modified file 'tests/remote-client/CMakeLists.txt'
--- tests/remote-client/CMakeLists.txt	2016-06-22 04:51:19 +0000
+++ tests/remote-client/CMakeLists.txt	2016-07-20 01:16:16 +0000
@@ -4,7 +4,6 @@
 add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
 include_directories(${GLIB_DEPS_INCLUDE_DIRS})
 
-qt5_use_modules(remote-client_test Test)
 target_link_libraries(remote-client_test
     storage-framework-qt-client
     Qt5::Network