Merge lp:~faenil/ubuntu-ui-toolkit/fix_expandables_units_tests_qt56 into lp:ubuntu-ui-toolkit

[Andrea Bernabei]

Qt5.6: Fix expandablescolumn.11 and expandables.11 unit tests

We were previously misusing mapToItem by not passing x/y parameters
and relying on JS to initialize them to 0.

Qt5.6 fixes QTBUG-41686 and requires x/y to be explicitly passed.

Qt5.6: Fix expandablescolumn.11 and expandables.11 unit tests

We were previously misusing mapToItem by not passing x/y parameters
and relying on JS to initialize them to 0.

Qt5.6 fixes QTBUG-41686 and requires x/y to be explicitly passed.

Unmerged revisions

=== modified file '.qmake.conf'
--- .qmake.conf	2016-07-25 14:02:18 +0000
+++ .qmake.conf	2016-09-17 11:46:32 +0000
@@ -15,13 +15,10 @@
 
 exists($$PWD/../qt.pro) {
     CONFIG += build_with_qt
-}
-
-*-g++* {
-    GCC4 = $$system( gcc -dumpversion | grep "^4.[0-9]" )
-    if (isEmpty(GCC4)) {
-        QMAKE_CXXFLAGS += -Wsuggest-override
-    }
+} else {
+    # When built as a Qt submodule, -Wsuggest-override breaks the build. That's
+    # fixed in Qt 5.6. See https://codereview.qt-project.org/#/c/169969/
+    gcc:greaterThan(QT_GCC_MAJOR_VERSION, 4): QMAKE_CXXFLAGS += -Wsuggest-override
 }
 
 # FIXME: Fix bug 1606247 and enable the UbuntuToolkit namespace.
 
=== added file 'CODING'
--- CODING	1970-01-01 00:00:00 +0000
+++ CODING	2016-09-17 11:46:32 +0000
@@ -0,0 +1,63 @@
+C++ coding style
+================
+
+The Ubuntu UI Toolkit follows the Qt conventions, see:
+
+  - https://wiki.qt.io/Coding_Conventions
+  - https://wiki.qt.io/Qt_Coding_Style
+
+On top of it we add the few clarifications listed below.
+
+
+Header inclusion
+----------------
+
+1/ When including Qt or UITK headers, always prefix with the project name. Use:
+
+    #include <QtCore/QMap>
+    #include <UbuntuMetrics/applicationmonitor.h>
+
+   not
+
+    #include <QMap>
+    #include <applicationmonitor.h>
+
+2/ For readability reasons and to avoid hidden dependencies, headers should be
+   included in ordered sections, separated by an empty line, as follows:
+
+    // The project's related header (for instance here for foo.cpp).
+    #include "foo.h"
+
+    // C standard library headers.
+    #include <sys/types.h>
+    #include <unistd.h>
+
+    // C++ standard library headers.
+    #include <functional>
+    #include <hash_map>
+    #include <vector>
+
+    // Qt and UITK headers. Try to first list QtCore and QtGui headers. Private
+    // headers come right after public headers of the same project.
+    #include <QtCore/QDebug>
+    #include <QtCore/QHash>
+    #include <QtCore/private/qobject_p.h>
+    #include <QtGui/QWindow>
+    #include <QtGui/private/qcolor_p.h>
+    #include <UbuntuMetrics/applicationmonitor.h>
+
+    // Other libraries headers.
+    #include <gst/gst.h>
+    #include <boost/call_traits.hpp>
+
+    // The project's headers.
+    #include "bar.h"
+    #include "baz_p.h"
+
+3/ For libraries, the "foo" inclusion variant must be used in C++
+   source files for the project's headers. The <Project/foo.h> and
+   <Project/private/foo_p.h> inclusion variant must be used for the
+   project's headers in private and public headers, wherever the
+   header is located in the source tree. That ensures the inclusion of
+   private headers by external projects (or by our unit tests) won't
+   break.
 
=== modified file 'debian/control'
--- debian/control	2016-08-22 05:35:24 +0000
+++ debian/control	2016-09-17 11:46:32 +0000
@@ -55,7 +55,7 @@
                qtsvg5-doc-html,
                qttools5-dev-tools,
                qtwebkit5-doc-html,
-               suru-icon-theme,
+               suru-icon-theme (>= 14.04+16.10.20160720),
                unity-action-doc,
                uuid-runtime,
                xvfb,
@@ -80,7 +80,7 @@
          qml-module-ubuntu-components-labs,
          qml-module-ubuntu-performancemetrics,
          qtdeclarative5-unity-action-plugin (>= 1.1.0),
-         suru-icon-theme,
+         suru-icon-theme (>= 14.04+16.10.20160720),
          ttf-ubuntu-font-family,
          ubuntu-ui-toolkit-theme (= ${binary:Version}),
          ${misc:Depends},
 
=== modified file 'debian/copyright'
--- debian/copyright	2016-03-04 11:59:46 +0000
+++ debian/copyright	2016-09-17 11:46:32 +0000
@@ -6,9 +6,10 @@
 Copyright: 2012-2013 Canonical Ltd.
 License: LGPL-3.0
 
-Files: modules/Ubuntu/Components/Themes/Ambiance/artwork/*
-       modules/Ubuntu/Components/artwork/*
-       modules/Ubuntu/Components/ListItems/artwork/*
+Files: src/imports/Components/artwork/*
+       src/imports/Components/Themes/Ambiance/artwork/*
+       src/imports/Components/Themes/SuruDark/artwork/*
+       src/imports/Components/Themes/SuruGradient/artwork/*
 Copyright: 2004-2013, Canonical Ltd.
 License: CC-BY-SA-3.0
  Unless otherwise indicated, artwork is available under the Creative
@@ -335,7 +336,7 @@
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Files: modules/Ubuntu/Components/tools/3rd_party/edtaa3func.c
+Files: src/UbuntuToolkit/tools/3rd_party/edtaa3func.c
 Copyright: 2009-2012, Stefan Gustavson <[e-mail]>
 License: MIT
 
 
=== modified file 'debian/rules'
--- debian/rules	2016-08-30 14:25:49 +0000
+++ debian/rules	2016-09-17 11:46:32 +0000
@@ -13,7 +13,7 @@
 
 # Skip tests on the archs they are known to be flaky  with current configuration
 testskip_architectures := powerpc arm64 ppc64el s390x
-testskip_series := yakkety xenial
+testskip_series := 
 
 override_dh_auto_configure:
 	qmake -r
 
=== modified file 'documentation/docs.sh'
--- documentation/docs.sh	2016-07-18 11:39:59 +0000
+++ documentation/docs.sh	2016-09-17 11:46:32 +0000
@@ -13,7 +13,15 @@
 # 
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
+
+# FIXME(loicm)
+# Since the new src/ layout (src/imports/ for QML modules and src/ for libs),
+# the parsing order of the source files has changed. qdoc first stores all the
+# file names and then does a sort (QMap iteration) which makes
+# ucmainviewbase.cpp parsed before MainView.qml (UbuntuToolkit is sorted before
+# imports ASCII-wise). The result is that qdoc is unable to link to properties
+# inherited from UCMainViewBase like applicationName, so constructs like that
+# don't work: \l MainView::applicationName...
 
 QDOC=$1
 QHELPGENERATOR=$2
 
=== modified file 'documentation/statesaving.qdoc'
--- documentation/statesaving.qdoc	2016-01-22 14:58:16 +0000
+++ documentation/statesaving.qdoc	2016-09-17 11:46:32 +0000
@@ -53,7 +53,7 @@
     for the application. However runtime application name change would require
     application restart.
 
-    Having these preconditions, we can deduct that \l MainView::applicationName
+    Having these preconditions, we can deduct that \l {MainView}'s applicationName
     property is one of the properties which cannot be serialized.
 
     \section1 IDs
 
=== modified file 'documentation/ubuntu-theming.qdoc'
--- documentation/ubuntu-theming.qdoc	2016-03-17 17:43:14 +0000
+++ documentation/ubuntu-theming.qdoc	2016-09-17 11:46:32 +0000
@@ -127,7 +127,7 @@
  * A typical example of such a style API is the PullToRefresh component's style:
  * \snippet Styles/1.2/PullToRefreshStyle.qml 0
  * The default style implementation can be found under Ubuntu.Components.Themes.Ambiance
- * theme \l {http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml}
+ * theme \l {http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/src/imports/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml}
  * {PullToRefreshStyle.qml}.
  *
  * Beside these, component styles may provide default values for colors, fonts, widths,
 
=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2016-06-21 14:21:46 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2016-09-17 11:46:32 +0000
@@ -4,36 +4,36 @@
 defines = Q_QDOC
 sourcedirs = ./
 headerdirs = ../include
-sourcedirs += ../src/Ubuntu/Components
-headerdirs += ../src/Ubuntu/Components/plugin
-sourcedirs += ../src/Ubuntu/UbuntuToolkit
-headerdirs += ../src/Ubuntu/UbuntuToolkit
-sourcedirs += ../src/Ubuntu/UbuntuGestures
-headerdirs += ../src/Ubuntu/UbuntuGestures
-sourcedirs += ../src/Ubuntu/Layouts
-headerdirs += ../src/Ubuntu/Layouts/plugin
-sourcedirs += ../src/Ubuntu/PerformanceMetrics
-headerdirs += ../src/Ubuntu/PerformanceMetrics/plugin
-sourcedirs += ../src/Ubuntu/Test
-headerdirs += ../src/Ubuntu/Test/plugin
+sourcedirs += ../src/imports/Components
+headerdirs += ../src/imports/Components/plugin
+sourcedirs += ../src/UbuntuToolkit
+headerdirs += ../src/UbuntuToolkit
+sourcedirs += ../src/UbuntuGestures
+headerdirs += ../src/UbuntuGestures
+sourcedirs += ../src/imports/Layouts
+headerdirs += ../src/imports/Layouts/plugin
+sourcedirs += ../src/imports/PerformanceMetrics
+headerdirs += ../src/imports/PerformanceMetrics/plugin
+sourcedirs += ../src/imports/Test
+headerdirs += ../src/imports/Test/plugin
 exampledirs += snippets
 exampledirs += ../examples
-exampledirs += ../src/Ubuntu/Components
-excludedirs += ../src/Ubuntu/Components/1.0
-excludedirs += ../src/Ubuntu/Components/1.1
-excludedirs += ../src/Ubuntu/Components/1.2
-excludedirs += ../src/Ubuntu/Components/ListItems/1.2
-excludedirs += ../src/Ubuntu/Components/Pickers/1.2
-excludedirs += ../src/Ubuntu/Components/Popups/1.2
-excludedirs += ../src/Ubuntu/Components/Themes/Ambiance
-excludedirs += ../src/Ubuntu/Components/Themes/SuruDark
+exampledirs += ../src/imports/Components
+excludedirs += ../src/imports/Components/1.0
+excludedirs += ../src/imports/Components/1.1
+excludedirs += ../src/imports/Components/1.2
+excludedirs += ../src/imports/Components/ListItems/1.2
+excludedirs += ../src/imports/Components/Pickers/1.2
+excludedirs += ../src/imports/Components/Popups/1.2
+excludedirs += ../src/imports/Components/Themes/Ambiance
+excludedirs += ../src/imports/Components/Themes/SuruDark
 excludedirs += ../documentation/autopilot-helpers/_build/html/_static
 imagedirs = images
 sources.fileextensions = "*.qml *.qdoc *.cpp *.js"
 headers.fileextensions = "*.h"
 # exclude qml files that have the component documented in a separate qdoc file
-excludefiles += $BLD/../src/Ubuntu/Components/1.3/PageWrapperUtils.js
-excludefiles += ../src/Ubuntu/UbuntuToolkit/asyncloader.cpp
+excludefiles += $BLD/../src/imports/Components/1.3/PageWrapperUtils.js
+excludefiles += ../src/UbuntuToolkit/asyncloader.cpp
 outputdir = $BLD/html
 outputformats = HTML
 version = 1.3
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml'
--- examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2015-04-25 08:18:45 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2016-09-17 11:46:32 +0000
@@ -56,13 +56,13 @@
         }
 
         TemplateRow {
-            title: i18n.tr("No label")
+            title: progressTypeFlip.indeterminate ? i18n.tr("Infinite") : i18n.tr("Standard")
 
             ProgressBar {
-                id: progressNoLabel
+                id: progressTypeFlip
                 objectName: "progressbar_nolabel"
-                width: parent.width
-                showProgressPercentage: false
+                anchors.verticalCenter: parent.verticalCenter
+                width: parent.width - (switchBox.width + label.width + 2 * parent.spacing)
 
                 SequentialAnimation on value {
                     loops: Animation.Infinite
@@ -74,6 +74,15 @@
                     PauseAnimation {duration: 1000}
                 }
             }
+            Switch {
+                id: switchBox
+                checked: progressTypeFlip.indeterminate
+                onTriggered: progressTypeFlip.indeterminate = !progressTypeFlip.indeterminate
+            }
+            Label {
+                id: label
+                text: progressTypeFlip.indeterminate ? i18n.tr("to standard") : i18n.tr("to infinite")
+            }
         }
     }
 
 
=== modified file 'features/ubuntu_qt_module.prf'
--- features/ubuntu_qt_module.prf	2016-06-17 13:42:23 +0000
+++ features/ubuntu_qt_module.prf	2016-09-17 11:46:32 +0000
@@ -1,14 +1,18 @@
-!build_with_qt: {
-    #enable autocreation of include directory
-    CONFIG += git_build
-}
+# Enables the copy of private and public headers to an include directory at the
+# root of the sources before compilation and the copy of the compiled libraries
+# after compilation. Must be set before loading qt_module.
+CONFIG += git_build
 
 load(qt_module)
 
+# Disable CMake config file creation. Must be set after loading qt_module.
 CONFIG -= create_cmake
 
-# when building against the system Qt we pick up the CXX_FLAGS for a release build
-# reset them to the default debug build flags
+# Common config options.
+CONFIG += dll no_keywords c++11
+
+# When building against the system Qt we pick up the CXX_FLAGS for a release
+# build reset them to the default debug build flags.
 !build_with_qt: {
     CONFIG(debug, debug|release)  {
         QMAKE_CFLAGS = $$QMAKE_CFLAGS_DEBUG
@@ -16,8 +20,9 @@
     }
 }
 
+# Make all warnings into errors.
 QMAKE_CXXFLAGS += -Werror
 
-#do not warn for deprecated declarations
+# Do not warn for deprecated declarations.
 QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
 DEFINES -= QT_DEPRECATED_WARNINGS
 
=== removed directory 'src/Ubuntu/Components/ListItems/artwork'
=== renamed directory 'src/Ubuntu/UbuntuGestures' => 'src/UbuntuGestures'
=== modified file 'src/UbuntuGestures/UbuntuGestures.pro'
--- src/Ubuntu/UbuntuGestures/UbuntuGestures.pro	2016-07-06 11:27:11 +0000
+++ src/UbuntuGestures/UbuntuGestures.pro	2016-09-17 11:46:32 +0000
@@ -1,40 +1,33 @@
-TEMPLATE=lib
-TARGET=UbuntuGestures
-
-QT *= core-private gui-private qml qml-private quick quick-private
-
-CONFIG += dll no_keywords c++11
-
-INCLUDEPATH+=$$PWD
+TARGET = UbuntuGestures
+QT = core-private gui-private qml-private quick-private
 
 DEFINES += UBUNTUGESTURES_LIBRARY
 
-load(qt_build_config)
+HEADERS += \
+    $$PWD/candidateinactivitytimer_p.h \
+    $$PWD/damper_p.h \
+    $$PWD/debughelpers_p.h \
+    $$PWD/pool_p.h \
+    $$PWD/timer_p.h \
+    $$PWD/timesource_p.h \
+    $$PWD/touchownershipevent_p.h \
+    $$PWD/touchregistry_p.h \
+    $$PWD/ubuntugesturesglobal.h \
+    $$PWD/ubuntugesturesmodule.h \
+    $$PWD/ucswipearea_p.h \
+    $$PWD/ucswipearea_p_p.h \
+    $$PWD/unownedtouchevent_p.h
+
+SOURCES += \
+    $$PWD/candidateinactivitytimer.cpp \
+    $$PWD/damper.cpp \
+    $$PWD/debughelpers.cpp \
+    $$PWD/timer.cpp \
+    $$PWD/timesource.cpp \
+    $$PWD/touchownershipevent.cpp \
+    $$PWD/touchregistry.cpp \
+    $$PWD/ubuntugesturesmodule.cpp \
+    $$PWD/ucswipearea.cpp \
+    $$PWD/unownedtouchevent.cpp
+
 load(ubuntu_qt_module)
-
-HEADERS += candidateinactivitytimer_p.h \
-           debughelpers_p.h \
-           timer_p.h \
-           timesource_p.h \
-           touchownershipevent_p.h \
-           touchregistry_p.h \
-           unownedtouchevent_p.h \
-           ubuntugesturesglobal.h \
-           pool_p.h \
-           ucswipearea_p.h \
-           ucswipearea_p_p.h \
-           damper_p.h \
-           ubuntugesturesmodule.h
-
-
-SOURCES += candidateinactivitytimer.cpp \
-           debughelpers.cpp \
-           timer.cpp \
-           timesource.cpp \
-           touchownershipevent.cpp \
-           touchregistry.cpp \
-           unownedtouchevent.cpp \
-           ucswipearea.cpp \
-           damper.cpp \
-           ubuntugesturesmodule.cpp
-
 
=== modified file 'src/UbuntuGestures/candidateinactivitytimer.cpp'
--- src/Ubuntu/UbuntuGestures/candidateinactivitytimer.cpp	2016-07-06 11:27:11 +0000
+++ src/UbuntuGestures/candidateinactivitytimer.cpp	2016-09-17 11:46:32 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <UbuntuGestures/private/candidateinactivitytimer_p.h>
+#include "candidateinactivitytimer_p.h"
 
 UG_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuGestures/candidateinactivitytimer_p.h'
--- src/Ubuntu/UbuntuGestures/candidateinactivitytimer_p.h	2016-08-09 07:12:07 +0000
+++ src/UbuntuGestures/candidateinactivitytimer_p.h	2016-09-17 11:46:32 +0000
@@ -14,15 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
-#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
-
-#include <QObject>
+#ifndef CANDIDATEINACTIVITYTIMER_P_H
+#define CANDIDATEINACTIVITYTIMER_P_H
+
+#include <QtCore/QObject>
+
+#include <UbuntuGestures/private/timer_p.h>
 
 class QQuickItem;
 
-#include <UbuntuGestures/private/timer_p.h>
-
 UG_NAMESPACE_BEGIN
 
 class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject {
@@ -48,4 +48,4 @@
 
 UG_NAMESPACE_END
 
-#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
+#endif // CANDIDATEINACTIVITYTIMER_P_H
 
=== modified file 'src/UbuntuGestures/damper.cpp'
--- src/Ubuntu/UbuntuGestures/damper.cpp	2015-12-17 15:23:26 +0000
+++ src/UbuntuGestures/damper.cpp	2016-09-17 11:46:32 +0000
@@ -15,7 +15,8 @@
  */
 
 #include "damper_p.h"
-#include <QDebug>
+
+#include <QtCore/QDebug>
 
 QDebug operator<<(QDebug dbg, const DampedPointF &p)
 {
 
=== modified file 'src/UbuntuGestures/damper_p.h'
--- src/Ubuntu/UbuntuGestures/damper_p.h	2015-12-17 15:23:26 +0000
+++ src/UbuntuGestures/damper_p.h	2016-09-17 11:46:32 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UBUNTU_GESTURES_DAMPER_H
-#define UBUNTU_GESTURES_DAMPER_H
+#ifndef DAMPER_P_H
+#define DAMPER_P_H
 
 #include <QtCore/QPointF>
 
@@ -86,4 +86,4 @@
 
 QDebug operator<<(QDebug dbg, const DampedPointF &p);
 
-#endif // UBUNTU_GESTURES_DAMPER_H
+#endif // DAMPER_P_H
 
=== modified file 'src/UbuntuGestures/debughelpers.cpp'
--- src/Ubuntu/UbuntuGestures/debughelpers.cpp	2016-07-06 11:27:11 +0000
+++ src/UbuntuGestures/debughelpers.cpp	2016-09-17 11:46:32 +0000
@@ -14,9 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <UbuntuGestures/private/debughelpers_p.h>
-#include <QTouchEvent>
-#include <QMouseEvent>
+#include "debughelpers_p.h"
+
+#include <QtGui/QMouseEvent>
+#include <QtGui/QTouchEvent>
 
 QString touchPointStateToString(Qt::TouchPointState state)
 {
 
=== modified file 'src/UbuntuGestures/debughelpers_p.h'
--- src/Ubuntu/UbuntuGestures/debughelpers_p.h	2016-08-09 07:12:07 +0000
+++ src/UbuntuGestures/debughelpers_p.h	2016-09-17 11:46:32 +0000
@@ -14,12 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UBUNTUGESTURES_DEBUG_HELPER_H
-#define UBUNTUGESTURES_DEBUG_HELPER_H
-
-#include <QString>
-
-#include "ubuntugesturesglobal.h"
+#ifndef DEBUGHELPERS_P_H
+#define DEBUGHELPERS_P_H
+
+#include <QtCore/QString>
 
 class QMouseEvent;
 class QTouchEvent;
@@ -28,4 +26,4 @@
 QString touchEventToString(const QTouchEvent *ev);
 QString mouseEventToString(const QMouseEvent *ev);
 
-#endif // UBUNTUGESTURES_DEBUG_HELPER_H
+#endif // DEBUGHELPERS_P_H
 
=== modified file 'src/UbuntuGestures/pool_p.h'
--- src/Ubuntu/UbuntuGestures/pool_p.h	2016-08-09 07:12:07 +0000
+++ src/UbuntuGestures/pool_p.h	2016-09-17 11:46:32 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UBUNTUGESTURES_POOL_H
-#define UBUNTUGESTURES_POOL_H
-
-#include <QVector>
-
-#include "ubuntugesturesglobal.h"
+#ifndef POOL_P_H
+#define POOL_P_H
+
+#include <QtCore/QVector>
+
+#include <UbuntuGestures/ubuntugesturesglobal.h>
 
 /*
   An object pool.
@@ -129,4 +129,4 @@
     int m_lastUsedIndex;
 };
 
-#endif // UBUNTUGESTURES_POOL_H
+#endif // POOL_P_H
 
=== modified file 'src/UbuntuGestures/timer.cpp'
--- src/Ubuntu/UbuntuGestures/timer.cpp	2016-07-25 14:02:18 +0000
+++ src/UbuntuGestures/timer.cpp	2016-09-17 11:46:32 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <UbuntuGestures/private/timer_p.h>
+#include "timer_p.h"
 
 UG_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuGestures/timer_p.h'
--- src/Ubuntu/UbuntuGestures/timer_p.h	2016-08-09 07:12:07 +0000
+++ src/UbuntuGestures/timer_p.h	2016-09-17 11:46:32 +0000
@@ -14,16 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UBUNTUGESTURES_TIMER_H
-#define UBUNTUGESTURES_TIMER_H
-
-#include "ubuntugesturesglobal.h"
+#ifndef TIMER_P_H
+#define TIMER_P_H
+
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtCore/QTimer>
+
+#include <UbuntuGestures/ubuntugesturesglobal.h>
 #include <UbuntuGestures/private/timesource_p.h>
 
-#include <QObject>
-#include <QPointer>
-#include <QTimer>
-
 UG_NAMESPACE_BEGIN
 
 /* Defines an interface for a Timer. */
@@ -114,4 +114,4 @@
 
 UG_NAMESPACE_END
 
-#endif // UBUNTUGESTURES_TIMER_H
+#endif // TIMER_P_H
 
=== modified file 'src/UbuntuGestures/timesource.cpp'
--- src/Ubuntu/UbuntuGestures/timesource.cpp	2016-07-25 14:02:18 +0000
+++ src/UbuntuGestures/timesource.cpp	2016-09-17 11:46:32 +0000
@@ -16,9 +16,9 @@
  * Authored by: Daniel d'Andrada <[e-mail]>
  */
 
-#include <UbuntuGestures/private/timesource_p.h>
+#include "timesource_p.h"
 
-#include <QElapsedTimer>
+#include <QtCore/QElapsedTimer>
 
 UG_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuGestures/timesource_p.h'
--- src/Ubuntu/UbuntuGestures/timesource_p.h	2016-08-09 07:12:07 +0000
+++ src/UbuntuGestures/timesource_p.h	2016-09-17 11:46:32 +0000
@@ -16,11 +16,12 @@
  * Authored by: Daniel d'Andrada <[e-mail]>
  */
 
-#ifndef UBUNTUGESTURES_TIMESOURCE_H
-#define UBUNTUGESTURES_TIMESOURCE_H
-
-#include "ubuntugesturesglobal.h"
-#include <QSharedPointer>
+#ifndef TIMESOURCE_P_H
+#define TIMESOURCE_P_H
+
+#include <QtCore/QSharedPointer>
+
+#include <UbuntuGestures/ubuntugesturesglobal.h>
 
 UG_NAMESPACE_BEGIN
 /*
@@ -59,4 +60,4 @@
 
 UG_NAMESPACE_END
 
-#endif // UBUNTUGESTURES_TIMESOURCE_H
+#endif // TIMESOURCE_P_H
 
=== modified file 'src/UbuntuGestures/touchownershipevent.cpp'
--- src/Ubuntu/UbuntuGestures/touchownershipevent.cpp	2016-07-06 11:27:11 +0000
+++ src/UbuntuGestures/touchownershipevent.cpp	2016-09-17 11:46:32 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <UbuntuGestures/private/touchownershipevent_p.h>
+#include "touchownershipevent_p.h"
 
 UG_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuGestures/touchownershipevent_p.h'
--- src/Ubuntu/UbuntuGestures/touchownershipevent_p.h	2016-08-09 07:12:07 +0000
+++ src/UbuntuGestures/touchownershipevent_p.h	2016-09-17 11:46:32 +0000
@@ -14,11 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UBUNTU_TOUCHOWNERSHIPEVENT_H
-#define UBUNTU_TOUCHOWNERSHIPEVENT_H
-
-#include <QEvent>
-#include "ubuntugesturesglobal.h"
+#ifndef TOUCHOWNERSHIPEVENT_P_H
+#define TOUCHOWNERSHIPEVENT_P_H
+
+#include <QtCore/QEvent>
+
+#include <UbuntuGestures/ubuntugesturesglobal.h>
 
 UG_NAMESPACE_BEGIN
 /*
@@ -50,4 +51,4 @@
 
 UG_NAMESPACE_END
 
-#endif // UBUNTU_TOUCHOWNERSHIPEVENT_H
+#endif // TOUCHOWNERSHIPEVENT_P_H
 
=== modified file 'src/UbuntuGestures/touchregistry.cpp'
--- src/Ubuntu/UbuntuGestures/touchregistry.cpp	2016-07-06 11:27:11 +0000
+++ src/UbuntuGestures/touchregistry.cpp	2016-09-17 11:46:32 +0000
@@ -14,21 +14,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <UbuntuGestures/private/touchregistry_p.h>
-
-#include <QCoreApplication>
-#include <QDebug>
-
-#include <private/qquickitem_p.h>
-
-#include <UbuntuGestures/private/candidateinactivitytimer_p.h>
-#include <UbuntuGestures/private/timer_p.h>
-#include <UbuntuGestures/private/touchownershipevent_p.h>
-#include <UbuntuGestures/private/unownedtouchevent_p.h>
+#include "touchregistry_p.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtQuick/private/qquickitem_p.h>
+
+#include "candidateinactivitytimer_p.h"
+#include "debughelpers_p.h"
+#include "timer_p.h"
+#include "touchownershipevent_p.h"
+#include "unownedtouchevent_p.h"
 
 Q_LOGGING_CATEGORY(ugTouchRegistry, "libubuntugestures.TouchRegistry", QtMsgType::QtWarningMsg)
 
-#include <UbuntuGestures/private/debughelpers_p.h>
 #define UG_DEBUG qCDebug(ugTouchRegistry) << "[TouchRegistry]"
 
 UG_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuGestures/touchregistry_p.h'
--- src/Ubuntu/UbuntuGestures/touchregistry_p.h	2016-08-09 07:12:07 +0000
+++ src/UbuntuGestures/touchregistry_p.h	2016-09-17 11:46:32 +0000
@@ -14,23 +14,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UNITY_TOUCHREGISTRY_H
-#define UNITY_TOUCHREGISTRY_H
+#ifndef TOUCHREGISTRY_P_H
+#define TOUCHREGISTRY_P_H
 
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtCore/QVector>
+#include <QtGui/QTouchEvent>
 #include <QtQuick/QQuickItem>
-#include <QObject>
-#include <QPointer>
-#include <QTouchEvent>
-#include <QVector>
 
-#include "ubuntugesturesglobal.h"
+#include <UbuntuGestures/ubuntugesturesglobal.h>
 #include <UbuntuGestures/private/candidateinactivitytimer_p.h>
 #include <UbuntuGestures/private/timer_p.h>
 #include <UbuntuGestures/private/pool_p.h>
 
-// logging
-#include <QtCore/QLoggingCategory>
-
 UG_FORWARD_DECLARE_CLASS(AbstractTimerFactory)
 
 /*
@@ -206,4 +204,4 @@
 
 Q_DECLARE_LOGGING_CATEGORY(ugTouchRegistry)
 
-#endif // UNITY_TOUCHREGISTRY_H
+#endif // TOUCHREGISTRY_P_H
 
=== modified file 'src/UbuntuGestures/ubuntugesturesmodule.cpp'
--- src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.cpp	2016-06-21 14:21:46 +0000
+++ src/UbuntuGestures/ubuntugesturesmodule.cpp	2016-09-17 11:46:32 +0000
@@ -16,10 +16,11 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
+#include <QtQml/QtQml>
 #include <QtQml/QQmlEngine>
-#include <QtQml>
+
 #include "ubuntugesturesmodule.h"
-#include <private/ucswipearea_p.h>
+#include "ucswipearea_p.h"
 
 UG_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuGestures/ubuntugesturesmodule.h'
--- src/Ubuntu/UbuntuGestures/ubuntugesturesmodule.h	2016-07-06 09:51:06 +0000
+++ src/UbuntuGestures/ubuntugesturesmodule.h	2016-09-17 11:46:32 +0000
@@ -19,7 +19,7 @@
 #ifndef UBUNTUGESTURESMODULE_H
 #define UBUNTUGESTURESMODULE_H
 
-#include <ubuntugesturesglobal.h>
+#include <UbuntuGestures/ubuntugesturesglobal.h>
 
 UG_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuGestures/ucswipearea.cpp'
--- src/Ubuntu/UbuntuGestures/ucswipearea.cpp	2016-07-25 14:02:18 +0000
+++ src/UbuntuGestures/ucswipearea.cpp	2016-09-17 11:46:32 +0000
@@ -12,22 +12,19 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include "ucswipearea_p_p.h"
 
-#include <QQuickWindow>
-#include <QtCore/qmath.h>
-#include <QScreen>
-#include <QDebug>
-
-#include <private/qquickwindow_p.h>
-
-// local
-#include <UbuntuGestures/private/touchownershipevent_p.h>
-#include <UbuntuGestures/private/touchregistry_p.h>
-#include <UbuntuGestures/private/unownedtouchevent_p.h>
+#include <QtCore/QDebug>
+#include <QtGui/QScreen>
+#include <QtCore/QtMath>
+#include <QtQuick/QQuickWindow>
+#include <QtQuick/private/qquickwindow_p.h>
+
+#include "touchownershipevent_p.h"
+#include "touchregistry_p.h"
+#include "unownedtouchevent_p.h"
 
 UG_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuGestures/ucswipearea_p.h'
--- src/Ubuntu/UbuntuGestures/ucswipearea_p.h	2016-07-06 11:27:11 +0000
+++ src/UbuntuGestures/ucswipearea_p.h	2016-09-17 11:46:32 +0000
@@ -12,22 +12,18 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
-#ifndef UCSWIPEAREA_H
-#define UCSWIPEAREA_H
+#ifndef UCSWIPEAREA_P_H
+#define UCSWIPEAREA_P_H
 
+#include <QtCore/QLoggingCategory>
 #include <QtQuick/QQuickItem>
-#include "ubuntugesturesglobal.h"
 
-// lib UbuntuGestures
+#include <UbuntuGestures/ubuntugesturesglobal.h>
 #include <UbuntuGestures/private/pool_p.h>
 #include <UbuntuGestures/private/timer_p.h>
 
-// logging
-#include <QtCore/QLoggingCategory>
-
 UG_NAMESPACE_BEGIN
 
 class TouchOwnershipEvent;
@@ -106,4 +102,4 @@
 Q_DECLARE_LOGGING_CATEGORY(ucSwipeArea)
 Q_DECLARE_LOGGING_CATEGORY(ucActiveTouchInfo)
 
-#endif // UCSWIPEAREA_H
+#endif // UCSWIPEAREA_P_H
 
=== modified file 'src/UbuntuGestures/ucswipearea_p_p.h'
--- src/Ubuntu/UbuntuGestures/ucswipearea_p_p.h	2016-07-25 14:02:18 +0000
+++ src/UbuntuGestures/ucswipearea_p_p.h	2016-09-17 11:46:32 +0000
@@ -12,16 +12,16 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
-#ifndef UCSWIPEAREAPRIVATE_H
-#define UCSWIPEAREAPRIVATE_H
-
-#include "ucswipearea_p.h"
+#ifndef UCSWIPEAREA_P_P_H
+#define UCSWIPEAREA_P_P_H
+
+#include <UbuntuGestures/private/ucswipearea_p.h>
+
 #include <QtQuick/private/qquickitem_p.h>
 
-#include "damper_p.h"
+#include <UbuntuGestures/private/damper_p.h>
 
 UG_NAMESPACE_BEGIN
 
@@ -175,4 +175,4 @@
 
 UG_NAMESPACE_END
 
-#endif // UCSWIPEAREAPRIVATE_H
+#endif // UCSWIPEAREA_P_P_H
 
=== modified file 'src/UbuntuGestures/unownedtouchevent.cpp'
--- src/Ubuntu/UbuntuGestures/unownedtouchevent.cpp	2016-07-06 11:27:11 +0000
+++ src/UbuntuGestures/unownedtouchevent.cpp	2016-09-17 11:46:32 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <UbuntuGestures/private/unownedtouchevent_p.h>
+#include "unownedtouchevent_p.h"
 
 UG_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuGestures/unownedtouchevent_p.h'
--- src/Ubuntu/UbuntuGestures/unownedtouchevent_p.h	2016-08-09 07:12:07 +0000
+++ src/UbuntuGestures/unownedtouchevent_p.h	2016-09-17 11:46:32 +0000
@@ -14,12 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UBUNTU_UNOWNEDTOUCHEVENT_H
-#define UBUNTU_UNOWNEDTOUCHEVENT_H
-
-#include <QTouchEvent>
-#include <QScopedPointer>
-#include "ubuntugesturesglobal.h"
+#ifndef UNOWNEDTOUCHEVENT_P_H
+#define UNOWNEDTOUCHEVENT_P_H
+
+#include <QtCore/QScopedPointer>
+#include <QtGui/QTouchEvent>
+
+#include <UbuntuGestures/ubuntugesturesglobal.h>
 
 UG_NAMESPACE_BEGIN
 /*
@@ -45,4 +46,4 @@
 
 UG_NAMESPACE_END
 
-#endif // UBUNTU_UNOWNEDTOUCHEVENT_H
+#endif // UNOWNEDTOUCHEVENT_P_H
 
=== renamed directory 'src/Ubuntu/UbuntuMetrics' => 'src/UbuntuMetrics'
=== modified file 'src/UbuntuMetrics/UbuntuMetrics.pro'
--- src/Ubuntu/UbuntuMetrics/UbuntuMetrics.pro	2016-08-04 22:54:21 +0000
+++ src/UbuntuMetrics/UbuntuMetrics.pro	2016-09-17 11:46:32 +0000
@@ -1,7 +1,5 @@
-TEMPLATE=lib
-TARGET=UbuntuMetrics
-QT += core-private gui-private quick-private
-CONFIG += dll no_keywords c++11
+TARGET = UbuntuMetrics
+QT = core-private gui-private quick-private
 LIBS += -ldl
 
 contains(QT_CONFIG, opengles2) {
@@ -12,30 +10,26 @@
 DEFINES += LTTNG_PLUGIN_INSTALL_PATH=\\\"$$[QT_INSTALL_PLUGINS]/ubuntu/metrics/libumlttng.so\\\"
 DEFINES += LTTNG_PLUGIN_BUILD_PATH=\\\"$$OUT_PWD/lttng/libumlttng.so\\\"
 
-load(qt_build_config)
-load(ubuntu_qt_module)
-
-PUBLIC_HEADERS = \
-    $$PWD/ubuntumetricsglobal.h \
-    $$PWD/events.h \
-    $$PWD/logger.h \
-    $$PWD/applicationmonitor.h
-
 HEADERS += \
-    $${PUBLIC_HEADERS} \
-    $$PWD/ubuntumetricsglobal_p.h \
+    $$PWD/applicationmonitor.h \
+    $$PWD/applicationmonitor_p.h \
+    $$PWD/bitmaptext_p.h \
     $$PWD/bitmaptextfont_p.h \
+    $$PWD/events.h \
     $$PWD/events_p.h \
+    $$PWD/gputimer_p.h \
+    $$PWD/logger.h \
     $$PWD/logger_p.h \
-    $$PWD/gputimer_p.h \
-    $$PWD/bitmaptext_p.h \
     $$PWD/overlay_p.h \
-    $$PWD/applicationmonitor_p.h
+    $$PWD/ubuntumetricsglobal.h \
+    $$PWD/ubuntumetricsglobal_p.h \
 
 SOURCES += \
+    $$PWD/applicationmonitor.cpp \
+    $$PWD/bitmaptext.cpp \
     $$PWD/events.cpp \
+    $$PWD/gputimer.cpp \
     $$PWD/logger.cpp \
-    $$PWD/gputimer.cpp \
-    $$PWD/bitmaptext.cpp \
-    $$PWD/overlay.cpp \
-    $$PWD/applicationmonitor.cpp
+    $$PWD/overlay.cpp
+
+load(ubuntu_qt_module)
 
=== modified file 'src/UbuntuMetrics/applicationmonitor.cpp'
--- src/Ubuntu/UbuntuMetrics/applicationmonitor.cpp	2016-08-22 06:18:26 +0000
+++ src/UbuntuMetrics/applicationmonitor.cpp	2016-09-17 11:46:32 +0000
@@ -16,6 +16,7 @@
 // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
 
 #include "applicationmonitor_p.h"
+
 #include <QtCore/QTimer>
 #include <QtGui/QGuiApplication>
 #include <QtQuick/QQuickWindow>
 
=== modified file 'src/UbuntuMetrics/applicationmonitor.h'
--- src/Ubuntu/UbuntuMetrics/applicationmonitor.h	2016-08-05 00:11:54 +0000
+++ src/UbuntuMetrics/applicationmonitor.h	2016-09-17 11:46:32 +0000
@@ -18,10 +18,11 @@
 #ifndef APPLICATIONMONITOR_H
 #define APPLICATIONMONITOR_H
 
-#include <UbuntuMetrics/ubuntumetricsglobal.h>
+#include <QtCore/QList>
+
 #include <UbuntuMetrics/logger.h>
 #include <UbuntuMetrics/events.h>
-#include <QtCore/QList>
+#include <UbuntuMetrics/ubuntumetricsglobal.h>
 
 class UMApplicationMonitorPrivate;
 
 
=== modified file 'src/UbuntuMetrics/applicationmonitor_p.h'
--- src/Ubuntu/UbuntuMetrics/applicationmonitor_p.h	2016-08-05 15:07:39 +0000
+++ src/UbuntuMetrics/applicationmonitor_p.h	2016-09-17 11:46:32 +0000
@@ -18,10 +18,8 @@
 #ifndef APPLICATIONMONITOR_P_H
 #define APPLICATIONMONITOR_P_H
 
-#include "applicationmonitor.h"
-#include "overlay_p.h"
-#include "gputimer_p.h"
-#include "ubuntumetricsglobal_p.h"
+#include <UbuntuMetrics/applicationmonitor.h>
+
 #include <QtCore/QTimer>
 #include <QtCore/QThread>
 #include <QtCore/QMutex>
@@ -30,6 +28,10 @@
 #include <QtCore/QRunnable>
 #include <QtCore/QAtomicInteger>
 
+#include <UbuntuMetrics/private/overlay_p.h>
+#include <UbuntuMetrics/private/gputimer_p.h>
+#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
+
 class LoggingThread;
 class WindowMonitor;
 class QQuickWindow;
 
=== modified file 'src/UbuntuMetrics/bitmaptext.cpp'
--- src/Ubuntu/UbuntuMetrics/bitmaptext.cpp	2016-08-19 03:35:49 +0000
+++ src/UbuntuMetrics/bitmaptext.cpp	2016-09-17 11:46:32 +0000
@@ -16,12 +16,14 @@
 // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
 
 #include <math.h>
+
+#include <QtCore/QtGlobal>
+#include <QtCore/QPoint>
+#include <QtCore/QSize>
+
 #include "bitmaptext_p.h"
 #include "bitmaptextfont_p.h"
 #include "ubuntumetricsglobal_p.h"
-#include <QtCore/QtGlobal>
-#include <QtCore/QSize>
-#include <QtCore/QPoint>
 
 static const GLchar* bitmapTextVertexShaderSource =
 #if !defined(QT_OPENGL_ES_2)
 
=== modified file 'src/UbuntuMetrics/bitmaptext_p.h'
--- src/Ubuntu/UbuntuMetrics/bitmaptext_p.h	2016-08-05 15:07:39 +0000
+++ src/UbuntuMetrics/bitmaptext_p.h	2016-09-17 11:46:32 +0000
@@ -18,9 +18,10 @@
 #ifndef BITMAPTEXT_P_H
 #define BITMAPTEXT_P_H
 
-#include "ubuntumetricsglobal_p.h"
 #include <QtGui/QOpenGLFunctions>
 
+#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
+
 // BitmapText renders a monospaced bitmap Latin-1 encoded text (128 characters)
 // stored in a single texture atlas using OpenGL. The font is generated by
 // bitmap-text-builder and stored in the bitmaptextfont_p.h header.
 
=== modified file 'src/UbuntuMetrics/events.cpp'
--- src/Ubuntu/UbuntuMetrics/events.cpp	2016-08-18 17:42:55 +0000
+++ src/UbuntuMetrics/events.cpp	2016-09-17 11:46:32 +0000
@@ -16,12 +16,15 @@
 // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
 
 #include "events_p.h"
-#include "ubuntumetricsglobal_p.h"
-#include <QtCore/QElapsedTimer>
+
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <cstdio>
+#include <stdio.h>
+
+#include <QtCore/QElapsedTimer>
+
+#include "ubuntumetricsglobal_p.h"
 
 const int bufferSize = 128;
 const int bufferAlignment = 64;
 
=== modified file 'src/UbuntuMetrics/events_p.h'
--- src/Ubuntu/UbuntuMetrics/events_p.h	2016-08-05 15:07:39 +0000
+++ src/UbuntuMetrics/events_p.h	2016-09-17 11:46:32 +0000
@@ -18,10 +18,13 @@
 #ifndef EVENTS_P_H
 #define EVENTS_P_H
 
-#include "events.h"
-#include "ubuntumetricsglobal_p.h"
+#include <UbuntuMetrics/events.h>
+
+#include <sys/times.h>
+
 #include <QtCore/QElapsedTimer>
-#include <sys/times.h>
+
+#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
 
 class UBUNTU_METRICS_PRIVATE_EXPORT EventUtilsPrivate
 {
 
=== modified file 'src/UbuntuMetrics/gputimer.cpp'
--- src/Ubuntu/UbuntuMetrics/gputimer.cpp	2016-07-26 13:41:18 +0000
+++ src/UbuntuMetrics/gputimer.cpp	2016-09-17 11:46:32 +0000
@@ -16,8 +16,10 @@
 // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
 
 #include "gputimer_p.h"
+
+#include <QtCore/QElapsedTimer>
+
 #include "ubuntumetricsglobal_p.h"
-#include <QtCore/QElapsedTimer>
 
 #if !defined(QT_OPENGL_ES) && !defined(GL_TIME_ELAPSED)
 #define GL_TIME_ELAPSED 0x88BF  // For GL_EXT_timer_query.
 
=== modified file 'src/UbuntuMetrics/gputimer_p.h'
--- src/Ubuntu/UbuntuMetrics/gputimer_p.h	2016-08-05 15:07:39 +0000
+++ src/UbuntuMetrics/gputimer_p.h	2016-09-17 11:46:32 +0000
@@ -18,13 +18,15 @@
 #ifndef GPUTIMER_P_H
 #define GPUTIMER_P_H
 
-#include "ubuntumetricsglobal_p.h"
 #include <QtGui/QOpenGLFunctions>
+
 #if defined(QT_OPENGL_ES)
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #endif
 
+#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
+
 // GPUTimer is used to measure the amount of time taken by the GPU to fully
 // complete a set of graphics commands. As opposed to a basic timer which would
 // determine the time taken by the graphics driver to push the graphics commands
 
=== modified file 'src/UbuntuMetrics/logger.cpp'
--- src/Ubuntu/UbuntuMetrics/logger.cpp	2016-08-06 00:54:30 +0000
+++ src/UbuntuMetrics/logger.cpp	2016-09-17 11:46:32 +0000
@@ -16,13 +16,14 @@
 // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
 
 #include "logger_p.h"
-#include "ubuntumetricsglobal_p.h"
-#include "events.h"
+
+#include <dlfcn.h>
+
 #include <QtCore/QDir>
 #include <QtCore/QTime>
 
-// LTTng shared object runtime loading.
-#include <dlfcn.h>
+#include "events.h"
+#include "ubuntumetricsglobal_p.h"
 #define TRACEPOINT_DEFINE
 #define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
 #include "lttng/lttng_p.h"
 
=== modified file 'src/UbuntuMetrics/logger.h'
--- src/Ubuntu/UbuntuMetrics/logger.h	2016-08-04 22:54:21 +0000
+++ src/UbuntuMetrics/logger.h	2016-09-17 11:46:32 +0000
@@ -18,8 +18,9 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
+#include <QtCore/QFile>
+
 #include <UbuntuMetrics/ubuntumetricsglobal.h>
-#include <QtCore/QFile>
 
 class UMEvent;
 class UMFileLoggerPrivate;
 
=== modified file 'src/UbuntuMetrics/logger_p.h'
--- src/Ubuntu/UbuntuMetrics/logger_p.h	2016-08-05 15:07:39 +0000
+++ src/UbuntuMetrics/logger_p.h	2016-09-17 11:46:32 +0000
@@ -18,12 +18,14 @@
 #ifndef LOGGER_P_H
 #define LOGGER_P_H
 
-#include "logger.h"
-#include "ubuntumetricsglobal_p.h"
-#include "events.h"
+#include <UbuntuMetrics/logger.h>
+
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 
+#include <UbuntuMetrics/events.h>
+#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
+
 class UBUNTU_METRICS_PRIVATE_EXPORT UMFileLoggerPrivate
 {
 public:
 
=== modified file 'src/UbuntuMetrics/overlay.cpp'
--- src/Ubuntu/UbuntuMetrics/overlay.cpp	2016-07-26 13:41:18 +0000
+++ src/UbuntuMetrics/overlay.cpp	2016-09-17 11:46:32 +0000
@@ -16,11 +16,14 @@
 // along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
 
 #include "overlay_p.h"
-#include "ubuntumetricsglobal_p.h"
+
+#include <unistd.h>
+#include <fcntl.h>
+
 #include <QtCore/QSysInfo>
 #include <QtGui/QGuiApplication>
-#include <unistd.h>
-#include <fcntl.h>
+
+#include "ubuntumetricsglobal_p.h"
 
 static const QPointF position = QPointF(5.0f, 5.0f);
 static const float opacity = 0.85f;
 
=== modified file 'src/UbuntuMetrics/overlay_p.h'
--- src/Ubuntu/UbuntuMetrics/overlay_p.h	2016-08-05 15:07:39 +0000
+++ src/UbuntuMetrics/overlay_p.h	2016-09-17 11:46:32 +0000
@@ -18,11 +18,12 @@
 #ifndef OVERLAY_P_H
 #define OVERLAY_P_H
 
-#include "ubuntumetricsglobal_p.h"
-#include "bitmaptext_p.h"
-#include "events.h"
 #include <QtCore/QSize>
 
+#include <UbuntuMetrics/events.h>
+#include <UbuntuMetrics/private/bitmaptext_p.h>
+#include <UbuntuMetrics/private/ubuntumetricsglobal_p.h>
+
 #if !defined QT_NO_DEBUG
 class QOpenGLContext;
 #endif
 
=== modified file 'src/UbuntuMetrics/ubuntumetricsglobal.h'
--- src/Ubuntu/UbuntuMetrics/ubuntumetricsglobal.h	2016-07-22 10:47:24 +0000
+++ src/UbuntuMetrics/ubuntumetricsglobal.h	2016-09-17 11:46:32 +0000
@@ -18,7 +18,7 @@
 #ifndef UBUNTUMETRICSGLOBAL_H
 #define UBUNTUMETRICSGLOBAL_H
 
-#include <QtCore/qglobal.h>
+#include <QtCore/QtGlobal>
 
 #if defined(QT_BUILD_UBUNTUMETRICS_LIB)
 #define UBUNTU_METRICS_EXPORT Q_DECL_EXPORT
 
=== modified file 'src/UbuntuMetrics/ubuntumetricsglobal_p.h'
--- src/Ubuntu/UbuntuMetrics/ubuntumetricsglobal_p.h	2016-08-04 16:50:30 +0000
+++ src/UbuntuMetrics/ubuntumetricsglobal_p.h	2016-09-17 11:46:32 +0000
@@ -18,7 +18,7 @@
 #ifndef UBUNTUMETRICSGLOBAL_P_H
 #define UBUNTUMETRICSGLOBAL_P_H
 
-#include "ubuntumetricsglobal.h"
+#include <UbuntuMetrics/ubuntumetricsglobal.h>
 
 // Logging macros, debug macros are compiled out for release builds.
 #define LOG(...) qDebug(__VA_ARGS__)
 
=== renamed directory 'src/Ubuntu/UbuntuToolkit' => 'src/UbuntuToolkit'
=== modified file 'src/UbuntuToolkit/UbuntuToolkit.pro'
--- src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro	2016-08-26 12:03:35 +0000
+++ src/UbuntuToolkit/UbuntuToolkit.pro	2016-09-17 11:46:32 +0000
@@ -1,255 +1,231 @@
-TEMPLATE=lib
-TARGET=UbuntuToolkit
-
-QT *= core-private gui-private qml qml-private quick quick-private testlib
+TARGET = UbuntuToolkit
+QT = core-private gui-private qml-private quick-private testlib dbus svg organizer \
+     UbuntuGestures-private UbuntuMetrics
 
 unix {
     CONFIG += link_pkgconfig
     PKGCONFIG += gio-2.0 dbus-1 libnih libnih-dbus
 }
-QT *= dbus svg UbuntuGestures UbuntuGestures_private UbuntuMetrics
-
-# QOrganizer for Alarm API
-QT *= organizer
 
 !contains(QT_ARCH, arm) {
     DEFINES += UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
     LIBS += -lX11 -lxcb -lXi
-
     SOURCES += mousetouchadaptor_x11.cpp
 }
 
-CONFIG += dll no_keywords c++11
-
-INCLUDEPATH+=$$PWD
-
 DEFINES += UBUNTUTOOLKIT_LIBRARY
-#comment in the following line to disable traces
-#DEFINES += QT_NO_DEBUG_OUTPUT
-DEFINES += QT_USE_QSTRINGBUILDER
-
-load(qt_build_config)
-load(ubuntu_qt_module)
-
-QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
-DEFINES -= QT_DEPRECATED_WARNINGS
-DEFINES -= QT_ASCII_CAST_WARNINGS
-
-HEADERS += \
-    colorutils_p.h \
-    ubuntutoolkitglobal.h \
-    tree_p.h \
-    asyncloader_p.h \
-    asyncloader_p_p.h \
-    mousetouchadaptor_p.h \
-    mousetouchadaptor_p_p.h \
-    propertychange_p.h \
-    ubuntutoolkitmodule.h \
-    splitview_p.h \
-    splitview_p_p.h \
-    privates/splitviewhandler_p_p.h \
-    menu_p_p.h \
-    menubar_p_p.h \
-    menu_p.h \
-    menubar_p.h \
-    menugroup_p.h
-
-SOURCES += \ 
-    colorutils.cpp \
-    tree.cpp \
-    asyncloader.cpp \
-    mousetouchadaptor.cpp \
-    propertychange.cpp \
-    ubuntutoolkitmodule.cpp \
-    splitview.cpp \
-    privates/splitviewhandler.cpp \
-    splitviewlayout.cpp \
-    menu.cpp \
-    menubar.cpp \
-    menugroup.cpp
-
-HEADERS += \
-    uctheme_p.h \
-    i18n_p.h \
-    listener_p.h \
-    ucscalingimageprovider_p.h \
-    ucunits_p.h \
-    ucqquickimageextension_p.h \
-    quickutils_p.h \
-    ucubuntushapetextures_p.h \
-    ucubuntushape_p.h \
-    ucubuntushapeoverlay_p.h \
-    ucproportionalshape_p.h \
-    inversemouseareatype_p.h \
-    qquickclipboard_p.h \
-    qquickmimedata_p.h \
-    qquickclipboard_p_p.h \
-    ucubuntuanimation_p.h \
-    ucfontutils_p.h \
-    ucapplication_p.h \
-    ucarguments_p.h \
-    ucargument_p.h \
-    ucalarm_p.h \
-    ucalarm_p_p.h \
-    alarmmanager_p_p.h \
-    alarmmanager_p.h \
-    ucalarmmodel_p.h \
-    unitythemeiconprovider_p.h \
-    adapters/alarmsadapter_p.h \
-    ucstatesaver_p.h \
-    sortbehavior_p.h \
-    filterbehavior_p.h \
-    sortfiltermodel_p.h \
-    statesaverbackend_p.h \
-    ucstatesaver_p_p.h \
-    ucurihandler_p.h \
-    ucinversemouse_p.h \
-    ucmouse_p.h \
-    unixsignalhandler_p.h \
-    ucstyleditembase_p.h \
-    ucstyleditembase_p_p.h \
-    ucaction_p.h \
-    ucactioncontext_p.h \
-    ucactionmanager_p.h \
-    adapters/actionsproxy_p.h \
-    adapters/dbuspropertywatcher_p.h \
-    uclistitem_p.h \
-    uclistitem_p_p.h \
-    uclistitemactions_p.h \
-    uclistitemactions_p_p.h \
-    uclistitemstyle_p.h \
-    ucserviceproperties_p.h \
-    ucserviceproperties_p_p.h \
-    privates/listitemdragarea_p.h \
-    privates/listitemdraghandler_p.h \
-    privates/listitemselection_p.h \
-    ucdeprecatedtheme_p.h \
-    ucdefaulttheme_p.h \
-    ucstylehints_p.h \
-    ucslotslayout_p.h \
-    ucslotslayout_p_p.h \
-    livetimer_p.h \
-    livetimer_p_p.h \
-    timeutils_p.h \
-    ucactionitem_p.h \
-    ucactionitem_p_p.h \
-    uchaptics_p.h \
-    ucabstractbutton_p.h \
-    ucabstractbutton_p_p.h \
-    ucmargins_p.h \
-    ucthemingextension_p.h \
-    ucheader_p.h \
-    uclabel_p.h \
-    uclistitemlayout_p.h \
-    privates/threelabelsslot_p.h \
-    ucimportversionchecker_p.h \
-    ucbottomedgehint_p.h \
-    ucbottomedgehint_p_p.h \
-    ucmathutils_p.h \
-    ucbottomedge_p.h \
-    ucbottomedge_p_p.h \
-    ucbottomedgestyle_p.h \
-    ucbottomedgeregion_p.h \
-    ucpagetreenode_p.h \
-    ucpagetreenode_p_p.h \
-    ucmainviewbase_p.h \
-    ucmainviewbase_p_p.h \
-    ucperformancemonitor_p.h \
-    privates/listviewextensions_p.h \
-    privates/frame_p.h \
-    privates/ucpagewrapper_p.h \
-    privates/ucpagewrapper_p_p.h \
-    privates/ucpagewrapperincubator_p.h \
-    privates/appheaderbase_p.h \
-    label_p.h \
-    ucbottomedgeregion_p_p.h \
-    privates/ucscrollbarutils_p.h \
-    actionlist_p.h \
-    exclusivegroup_p.h
+
+# Uncomment to compile out qDebug() calls.
+# DEFINES += QT_NO_DEBUG_OUTPUT
+
+HEADERS += \
+    $$PWD/actionlist_p.h \
+    $$PWD/adapters/actionsproxy_p.h \
+    $$PWD/adapters/alarmsadapter_p.h \
+    $$PWD/adapters/dbuspropertywatcher_p.h \
+    $$PWD/alarmmanager_p.h \
+    $$PWD/alarmmanager_p_p.h \
+    $$PWD/asyncloader_p.h \
+    $$PWD/asyncloader_p_p.h \
+    $$PWD/colorutils_p.h \
+    $$PWD/exclusivegroup_p.h \
+    $$PWD/filterbehavior_p.h \
+    $$PWD/i18n_p.h \
+    $$PWD/inversemouseareatype_p.h \
+    $$PWD/label_p.h \
+    $$PWD/listener_p.h \
+    $$PWD/livetimer_p.h \
+    $$PWD/livetimer_p_p.h \
+    $$PWD/menu_p.h \
+    $$PWD/menu_p_p.h \
+    $$PWD/menubar_p.h \
+    $$PWD/menubar_p_p.h \
+    $$PWD/menugroup_p.h \
+    $$PWD/mousetouchadaptor_p.h \
+    $$PWD/mousetouchadaptor_p_p.h \
+    $$PWD/privates/appheaderbase_p.h \
+    $$PWD/privates/frame_p.h \
+    $$PWD/privates/listitemdragarea_p.h \
+    $$PWD/privates/listitemdraghandler_p.h \
+    $$PWD/privates/listitemselection_p.h \
+    $$PWD/privates/listviewextensions_p.h \
+    $$PWD/privates/splitviewhandler_p.h \
+    $$PWD/privates/threelabelsslot_p.h \
+    $$PWD/privates/ucpagewrapper_p.h \
+    $$PWD/privates/ucpagewrapper_p_p.h \
+    $$PWD/privates/ucpagewrapperincubator_p.h \
+    $$PWD/privates/ucscrollbarutils_p.h \
+    $$PWD/propertychange_p.h \
+    $$PWD/qquickclipboard_p.h \
+    $$PWD/qquickclipboard_p_p.h \
+    $$PWD/qquickmimedata_p.h \
+    $$PWD/quickutils_p.h \
+    $$PWD/sortbehavior_p.h \
+    $$PWD/sortfiltermodel_p.h \
+    $$PWD/splitview_p.h \
+    $$PWD/splitview_p_p.h \
+    $$PWD/statesaverbackend_p.h \
+    $$PWD/timeutils_p.h \
+    $$PWD/tree_p.h \
+    $$PWD/ubuntutoolkitglobal.h \
+    $$PWD/ubuntutoolkitmodule.h \
+    $$PWD/ucabstractbutton_p.h \
+    $$PWD/ucabstractbutton_p_p.h \
+    $$PWD/ucaction_p.h \
+    $$PWD/ucactioncontext_p.h \
+    $$PWD/ucactionitem_p.h \
+    $$PWD/ucactionitem_p_p.h \
+    $$PWD/ucactionmanager_p.h \
+    $$PWD/ucalarm_p.h \
+    $$PWD/ucalarm_p_p.h \
+    $$PWD/ucalarmmodel_p.h \
+    $$PWD/ucapplication_p.h \
+    $$PWD/ucargument_p.h \
+    $$PWD/ucarguments_p.h \
+    $$PWD/ucbottomedge_p.h \
+    $$PWD/ucbottomedge_p_p.h \
+    $$PWD/ucbottomedgehint_p.h \
+    $$PWD/ucbottomedgehint_p_p.h \
+    $$PWD/ucbottomedgeregion_p.h \
+    $$PWD/ucbottomedgeregion_p_p.h \
+    $$PWD/ucbottomedgestyle_p.h \
+    $$PWD/ucdefaulttheme_p.h \
+    $$PWD/ucdeprecatedtheme_p.h \
+    $$PWD/ucfontutils_p.h \
+    $$PWD/uchaptics_p.h \
+    $$PWD/ucheader_p.h \
+    $$PWD/ucimportversionchecker_p.h \
+    $$PWD/ucinversemouse_p.h \
+    $$PWD/uclabel_p.h \
+    $$PWD/uclistitem_p.h \
+    $$PWD/uclistitem_p_p.h \
+    $$PWD/uclistitemactions_p.h \
+    $$PWD/uclistitemactions_p_p.h \
+    $$PWD/uclistitemlayout_p.h \
+    $$PWD/uclistitemstyle_p.h \
+    $$PWD/ucmainviewbase_p.h \
+    $$PWD/ucmainviewbase_p_p.h \
+    $$PWD/ucmargins_p.h \
+    $$PWD/ucmathutils_p.h \
+    $$PWD/ucmouse_p.h \
+    $$PWD/ucpagetreenode_p.h \
+    $$PWD/ucpagetreenode_p_p.h \
+    $$PWD/ucperformancemonitor_p.h \
+    $$PWD/ucproportionalshape_p.h \
+    $$PWD/ucqquickimageextension_p.h \
+    $$PWD/ucscalingimageprovider_p.h \
+    $$PWD/ucserviceproperties_p.h \
+    $$PWD/ucserviceproperties_p_p.h \
+    $$PWD/ucslotslayout_p.h \
+    $$PWD/ucslotslayout_p_p.h \
+    $$PWD/ucstatesaver_p.h \
+    $$PWD/ucstatesaver_p_p.h \
+    $$PWD/ucstyleditembase_p.h \
+    $$PWD/ucstyleditembase_p_p.h \
+    $$PWD/ucstylehints_p.h \
+    $$PWD/uctheme_p.h \
+    $$PWD/ucthemingextension_p.h \
+    $$PWD/ucubuntuanimation_p.h \
+    $$PWD/ucubuntushape_p.h \
+    $$PWD/ucubuntushapeoverlay_p.h \
+    $$PWD/ucubuntushapetextures_p.h \
+    $$PWD/ucunits_p.h \
+    $$PWD/ucurihandler_p.h \
+    $$PWD/unitythemeiconprovider_p.h \
+    $$PWD/unixsignalhandler_p.h
 
 SOURCES += \
-    uctheme.cpp \
-    i18n.cpp \
-    listener.cpp \
-    ucscalingimageprovider.cpp \
-    ucunits.cpp \
-    ucqquickimageextension.cpp \
-    quickutils.cpp \
-    ucubuntushapetextures.cpp \
-    ucubuntushape.cpp \
-    ucubuntushapeoverlay.cpp \
-    ucproportionalshape.cpp \
-    inversemouseareatype.cpp \
-    qquickclipboard.cpp \
-    qquickmimedata.cpp \
-    ucubuntuanimation.cpp \
-    ucfontutils.cpp \
-    ucapplication.cpp \
-    ucarguments.cpp \
-    ucargument.cpp \
-    ucalarm.cpp \
-    alarmmanager_p.cpp \
-    ucalarmmodel.cpp \
-    unitythemeiconprovider.cpp \
-    ucstatesaver.cpp \
-    sortbehavior.cpp \
-    filterbehavior.cpp \
-    sortfiltermodel.cpp \
-    statesaverbackend_p.cpp \
-    ucurihandler.cpp \
-    ucmousefilters.cpp \
-    unixsignalhandler_p.cpp \
-    ucstyleditembase.cpp \
-    ucaction.cpp \
-    ucactioncontext.cpp \
-    ucactionmanager.cpp \
-    adapters/actionsproxy_p.cpp \
-    adapters/dbuspropertywatcher_p.cpp \
-    uclistitem.cpp \
-    uclistitemactions.cpp \
-    uclistitemstyle.cpp \
-    ucviewitemsattached.cpp \
-    ucserviceproperties.cpp \
-    privates/listitemdragarea.cpp \
-    privates/listitemdraghandler.cpp \
-    privates/listitemexpansion.cpp \
-    privates/listitemselection.cpp \
-    ucdeprecatedtheme.cpp \
-    ucdefaulttheme.cpp \
-    ucstylehints.cpp \
-    ucslotslayout.cpp \
-    livetimer.cpp \
-    livetimer_p.cpp \
-    ucactionitem.cpp \
-    uchaptics.cpp \
-    ucabstractbutton.cpp \
-    ucthemingextension.cpp \
-    ucheader.cpp \
-    uclabel.cpp \
-    uclistitemlayout.cpp \
-    privates/threelabelsslot_p.cpp \
-    ucimportversionchecker_p.cpp \
-    ucbottomedgehint.cpp \
-    ucmathutils.cpp \
-    ucbottomedge.cpp \
-    ucbottomedgestyle.cpp \
-    ucbottomedgeregion.cpp \
-    ucpagetreenode.cpp \
-    ucmainviewbase.cpp \
-    ucperformancemonitor.cpp \
-    privates/listviewextensions.cpp \
-    privates/frame.cpp \
-    privates/ucpagewrapper.cpp \
-    privates/ucpagewrapperincubator.cpp \
-    privates/appheaderbase.cpp \
-    privates/ucscrollbarutils.cpp \
-    actionlist.cpp \
-    exclusivegroup.cpp
-
-# adapters
-SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
-
-#resources
+    $$PWD/actionlist.cpp \
+    $$PWD/adapters/actionsproxy_p.cpp \
+    $$PWD/adapters/alarmsadapter_organizer.cpp \
+    $$PWD/adapters/dbuspropertywatcher_p.cpp \
+    $$PWD/alarmmanager_p.cpp \
+    $$PWD/asyncloader.cpp \
+    $$PWD/colorutils.cpp \
+    $$PWD/exclusivegroup.cpp \
+    $$PWD/filterbehavior.cpp \
+    $$PWD/i18n.cpp \
+    $$PWD/inversemouseareatype.cpp \
+    $$PWD/listener.cpp \
+    $$PWD/livetimer.cpp \
+    $$PWD/livetimer_p.cpp \
+    $$PWD/menu.cpp \
+    $$PWD/menubar.cpp \
+    $$PWD/menugroup.cpp \
+    $$PWD/mousetouchadaptor.cpp \
+    $$PWD/privates/appheaderbase.cpp \
+    $$PWD/privates/frame.cpp \
+    $$PWD/privates/listitemdragarea.cpp \
+    $$PWD/privates/listitemdraghandler.cpp \
+    $$PWD/privates/listitemexpansion.cpp \
+    $$PWD/privates/listitemselection.cpp \
+    $$PWD/privates/listviewextensions.cpp \
+    $$PWD/privates/splitviewhandler.cpp \
+    $$PWD/privates/threelabelsslot_p.cpp \
+    $$PWD/privates/ucpagewrapper.cpp \
+    $$PWD/privates/ucpagewrapperincubator.cpp \
+    $$PWD/privates/ucscrollbarutils.cpp \
+    $$PWD/propertychange.cpp \
+    $$PWD/qquickclipboard.cpp \
+    $$PWD/qquickmimedata.cpp \
+    $$PWD/quickutils.cpp \
+    $$PWD/sortbehavior.cpp \
+    $$PWD/sortfiltermodel.cpp \
+    $$PWD/splitview.cpp \
+    $$PWD/splitviewlayout.cpp \
+    $$PWD/statesaverbackend_p.cpp \
+    $$PWD/tree.cpp \
+    $$PWD/ubuntutoolkitmodule.cpp \
+    $$PWD/ucabstractbutton.cpp \
+    $$PWD/ucaction.cpp \
+    $$PWD/ucactioncontext.cpp \
+    $$PWD/ucactionitem.cpp \
+    $$PWD/ucactionmanager.cpp \
+    $$PWD/ucalarm.cpp \
+    $$PWD/ucalarmmodel.cpp \
+    $$PWD/ucapplication.cpp \
+    $$PWD/ucargument.cpp \
+    $$PWD/ucarguments.cpp \
+    $$PWD/ucbottomedge.cpp \
+    $$PWD/ucbottomedgehint.cpp \
+    $$PWD/ucbottomedgeregion.cpp \
+    $$PWD/ucbottomedgestyle.cpp \
+    $$PWD/ucdefaulttheme.cpp \
+    $$PWD/ucdeprecatedtheme.cpp \
+    $$PWD/ucfontutils.cpp \
+    $$PWD/uchaptics.cpp \
+    $$PWD/ucheader.cpp \
+    $$PWD/ucimportversionchecker_p.cpp \
+    $$PWD/uclabel.cpp \
+    $$PWD/uclistitem.cpp \
+    $$PWD/uclistitemactions.cpp \
+    $$PWD/uclistitemlayout.cpp \
+    $$PWD/uclistitemstyle.cpp \
+    $$PWD/ucmainviewbase.cpp \
+    $$PWD/ucmathutils.cpp \
+    $$PWD/ucmousefilters.cpp \
+    $$PWD/ucpagetreenode.cpp \
+    $$PWD/ucperformancemonitor.cpp \
+    $$PWD/ucproportionalshape.cpp \
+    $$PWD/ucqquickimageextension.cpp \
+    $$PWD/ucscalingimageprovider.cpp \
+    $$PWD/ucserviceproperties.cpp \
+    $$PWD/ucslotslayout.cpp \
+    $$PWD/ucstatesaver.cpp \
+    $$PWD/ucstyleditembase.cpp \
+    $$PWD/ucstylehints.cpp \
+    $$PWD/uctheme.cpp \
+    $$PWD/ucthemingextension.cpp \
+    $$PWD/ucubuntuanimation.cpp \
+    $$PWD/ucubuntushape.cpp \
+    $$PWD/ucubuntushapeoverlay.cpp \
+    $$PWD/ucubuntushapetextures.cpp \
+    $$PWD/ucunits.cpp \
+    $$PWD/ucurihandler.cpp \
+    $$PWD/ucviewitemsattached.cpp \
+    $$PWD/unitythemeiconprovider.cpp \
+    $$PWD/unixsignalhandler_p.cpp
+
 RESOURCES += \
     $$PWD/resources.qrc
 
@@ -262,3 +238,8 @@
     $$PWD/shaders/shapeoverlay_no_dfdy.frag \
     $$PWD/privates/shaders/frame.vert \
     $$PWD/privates/shaders/frame.frag
+
+load(ubuntu_qt_module)
+
+# Remove the ASCII cast warnings added by qt_module.
+DEFINES -= QT_ASCII_CAST_WARNINGS
 
=== modified file 'src/UbuntuToolkit/actionlist.cpp'
--- src/Ubuntu/UbuntuToolkit/actionlist.cpp	2016-09-15 15:10:46 +0000
+++ src/UbuntuToolkit/actionlist.cpp	2016-09-17 11:46:32 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "actionlist_p.h"
+
 #include "ucaction_p.h"
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/actionlist_p.h'
--- src/Ubuntu/UbuntuToolkit/actionlist_p.h	2016-09-15 15:10:46 +0000
+++ src/UbuntuToolkit/actionlist_p.h	2016-09-17 11:46:32 +0000
@@ -14,12 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ACTIONLIST_H
-#define ACTIONLIST_H
+#ifndef ACTIONLIST_P_H
+#define ACTIONLIST_P_H
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtQml/QQmlListProperty>
-#include "ubuntutoolkitglobal.h"
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -58,4 +59,4 @@
 
 UT_NAMESPACE_END
 
-#endif // ACTIONLIST_H
+#endif // ACTIONLIST_P_H
 
=== modified file 'src/UbuntuToolkit/adapters/actionsproxy_p.cpp'
--- src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/adapters/actionsproxy_p.cpp	2016-09-17 11:46:32 +0000
@@ -14,11 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "actionsproxy_p.h"
+#include "adapters/actionsproxy_p.h"
+
+#include <QtCore/QDebug>
+
 #include "ucactioncontext_p.h"
 
-#include <QDebug>
-
 Q_LOGGING_CATEGORY(ucActionProxy, "ubuntu.components.ActionProxy", QtMsgType::QtWarningMsg)
 
 #define AP_TRACE(params) qCDebug(ucActionProxy) << params
 
=== modified file 'src/UbuntuToolkit/adapters/actionsproxy_p.h'
--- src/Ubuntu/UbuntuToolkit/adapters/actionsproxy_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/adapters/actionsproxy_p.h	2016-09-17 11:46:32 +0000
@@ -20,7 +20,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QSet>
 #include <QtCore/QPointer>
-#include "ucaction_p.h"
+
+#include <UbuntuToolkit/private/ucaction_p.h>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp'
--- src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp	2016-09-17 11:46:32 +0000
@@ -16,11 +16,7 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#include "ucalarm_p.h"
-#include "ucalarm_p_p.h"
-#include "alarmmanager_p_p.h"
-#include "alarmsadapter_p.h"
-#include <qorganizertodooccurrence.h>
+#include "adapters/alarmsadapter_p.h"
 
 #include <QtCore/QFile>
 #include <QtCore/QDir>
@@ -30,6 +26,10 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
 #include <QtCore/QDebug>
+#include <QtOrganizer/QtOrganizer>
+
+#include "alarmmanager_p_p.h"
+#include "ucalarm_p_p.h"
 
 #define ALARM_DATABASE          "%1/alarms.json"
 /*
 
=== modified file 'src/UbuntuToolkit/adapters/alarmsadapter_p.h'
--- src/Ubuntu/UbuntuToolkit/adapters/alarmsadapter_p.h	2016-07-07 15:33:34 +0000
+++ src/UbuntuToolkit/adapters/alarmsadapter_p.h	2016-09-17 11:46:32 +0000
@@ -19,13 +19,14 @@
 #ifndef ALARMSADAPTER_P_H
 #define ALARMSADAPTER_P_H
 
-#include "private/ucalarm_p_p.h"
-#include "private/alarmmanager_p_p.h"
+#include <QtOrganizer/QOrganizerManager>
+#include <QtOrganizer/QOrganizerAbstractRequest>
+#include <QtOrganizer/QOrganizerItemFetchRequest>
+#include <QtOrganizer/QOrganizerTodo>
 
-#include <qorganizer.h>
-#include <qorganizermanager.h>
-#include <qorganizertodo.h>
-#include <ubuntutoolkitglobal.h>
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
+#include <UbuntuToolkit/private/ucalarm_p_p.h>
+#include <UbuntuToolkit/private/alarmmanager_p_p.h>
 
 QTORGANIZER_USE_NAMESPACE
 
 
=== modified file 'src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp'
--- src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp	2016-09-17 11:46:32 +0000
@@ -14,12 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "dbuspropertywatcher_p.h"
+#include "adapters/dbuspropertywatcher_p.h"
+
+#include <sys/types.h>
+#include <unistd.h>
+
 #include <QtDBus/QDBusReply>
-#include <unistd.h>
-#include <sys/types.h>
+#include <QtQml/QQmlInfo>
+
 #include "i18n_p.h"
-#include <QtQml/QQmlInfo>
 
 #define DYNAMIC_PROPERTY    "__q_property"
 
 
=== modified file 'src/UbuntuToolkit/adapters/dbuspropertywatcher_p.h'
--- src/Ubuntu/UbuntuToolkit/adapters/dbuspropertywatcher_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/adapters/dbuspropertywatcher_p.h	2016-09-17 11:46:32 +0000
@@ -22,7 +22,7 @@
 #include <QtDBus/QDBusServiceWatcher>
 #include <QtDBus/QDBusInterface>
 
-#include "ucserviceproperties_p_p.h"
+#include <UbuntuToolkit/private/ucserviceproperties_p_p.h>
 
 class QDBusPendingCallWatcher;
 
 
=== modified file 'src/UbuntuToolkit/alarmmanager_p.cpp'
--- src/Ubuntu/UbuntuToolkit/alarmmanager_p.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/alarmmanager_p.cpp	2016-09-17 11:46:32 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "alarmmanager_p_p.h"
+
 #include "ucalarm_p_p.h"
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/alarmmanager_p.h'
--- src/Ubuntu/UbuntuToolkit/alarmmanager_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/alarmmanager_p.h	2016-09-17 11:46:32 +0000
@@ -16,14 +16,14 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef ALARMMANAGER_H
-#define ALARMMANAGER_H
+#ifndef ALARMMANAGER_P_H
+#define ALARMMANAGER_P_H
 
 #include <QtCore/QObject>
+#include <QtCore/QSet>
 #include <QtQml/QQmlListProperty>
-#include <QtCore/QSet>
 
-#include "ucalarm_p.h"
+#include <UbuntuToolkit/private/ucalarm_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -126,4 +126,4 @@
 
 UT_NAMESPACE_END
 
-#endif // ALARMMANAGER_H
+#endif // ALARMMANAGER_P_H
 
=== modified file 'src/UbuntuToolkit/alarmmanager_p_p.h'
--- src/Ubuntu/UbuntuToolkit/alarmmanager_p_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/alarmmanager_p_p.h	2016-09-17 11:46:32 +0000
@@ -16,13 +16,15 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef ALARMMANAGER_P_H
-#define ALARMMANAGER_P_H
-
-#include "ucalarm_p.h"
-#include "alarmmanager_p.h"
+#ifndef ALARMMANAGER_P_P_H
+#define ALARMMANAGER_P_P_H
+
+#include <UbuntuToolkit/private/alarmmanager_p.h>
+
 #include <QtCore/QUrl>
 
+#include <UbuntuToolkit/private/ucalarm_p.h>
+
 UT_NAMESPACE_BEGIN
 
 class UBUNTUTOOLKIT_EXPORT AlarmManagerPrivate
@@ -61,4 +63,4 @@
 
 UT_NAMESPACE_END
 
-#endif // ALARMMANAGER_P_H
+#endif // ALARMMANAGER_P_P_H
 
=== modified file 'src/UbuntuToolkit/asyncloader_p.h'
--- src/Ubuntu/UbuntuToolkit/asyncloader_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/asyncloader_p.h	2016-09-17 11:46:32 +0000
@@ -16,11 +16,12 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef ASYNCLOADER_H
-#define ASYNCLOADER_H
+#ifndef ASYNCLOADER_P_H
+#define ASYNCLOADER_P_H
 
 #include <QtQml/QQmlComponent>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQuickItem;
 class QQmlContext;
@@ -60,4 +61,4 @@
 
 UT_NAMESPACE_END
 
-#endif // ASYNCLOADER_H
+#endif // ASYNCLOADER_P_H
 
=== modified file 'src/UbuntuToolkit/asyncloader_p_p.h'
--- src/Ubuntu/UbuntuToolkit/asyncloader_p_p.h	2016-07-07 15:33:34 +0000
+++ src/UbuntuToolkit/asyncloader_p_p.h	2016-09-17 11:46:32 +0000
@@ -16,14 +16,15 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef ASYNCLOADER_P_H
-#define ASYNCLOADER_P_H
+#ifndef ASYNCLOADER_P_P_H
+#define ASYNCLOADER_P_P_H
+
+#include <UbuntuToolkit/private/asyncloader_p.h>
 
 #include <QtCore/private/qobject_p.h>
 #include <QtQml/QQmlIncubator>
-#include <ubuntutoolkitglobal.h>
-#include <UbuntuToolkit/private/asyncloader_p.h>
-#include <UbuntuToolkit/private/asyncloader_p_p.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -52,4 +53,4 @@
 
 UT_NAMESPACE_END
 
-#endif // ASYNCLOADER_P_H
+#endif // ASYNCLOADER_P_P_H
 
=== modified file 'src/UbuntuToolkit/colorutils.cpp'
--- src/Ubuntu/UbuntuToolkit/colorutils.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/colorutils.cpp	2016-09-17 11:46:32 +0000
@@ -15,7 +15,8 @@
  */
 
 #include "colorutils_p.h"
-#include <QColor>
+
+#include <QtGui/QColor>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/colorutils_p.h'
--- src/Ubuntu/UbuntuToolkit/colorutils_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/colorutils_p.h	2016-09-17 11:46:32 +0000
@@ -13,11 +13,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef COLORUTILS_H
-#define COLORUTILS_H
-
-#include <QObject>
-#include "ubuntutoolkitglobal.h"
+
+#ifndef COLORUTILS_P_H
+#define COLORUTILS_P_H
+
+#include <QtCore/QObject>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -31,4 +33,4 @@
 
 UT_NAMESPACE_END
 
-#endif // COLORUTILS_H
+#endif // COLORUTILS_P_H
 
=== modified file 'src/UbuntuToolkit/exclusivegroup.cpp'
--- src/Ubuntu/UbuntuToolkit/exclusivegroup.cpp	2016-07-18 14:54:46 +0000
+++ src/UbuntuToolkit/exclusivegroup.cpp	2016-09-17 11:46:32 +0000
@@ -12,14 +12,14 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include "exclusivegroup_p.h"
+
+#include <QtCore/QSignalMapper>
+
 #include "ucaction_p.h"
 
-#include <QSignalMapper>
-
 #define CHECKED_PROPERTY "checked"
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/exclusivegroup_p.h'
--- src/Ubuntu/UbuntuToolkit/exclusivegroup_p.h	2016-08-22 08:23:50 +0000
+++ src/UbuntuToolkit/exclusivegroup_p.h	2016-09-17 11:46:32 +0000
@@ -12,17 +12,16 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
-#ifndef EXCLUSIVEGROUP_H
-#define EXCLUSIVEGROUP_H
-
-#include "actionlist_p.h"
-#include "ubuntutoolkitglobal.h"
-
-#include <QMetaMethod>
-#include <QPointer>
+#ifndef EXCLUSIVEGROUP_P_H
+#define EXCLUSIVEGROUP_P_H
+
+#include <QtCore/QMetaMethod>
+#include <QtCore/QPointer>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
+#include <UbuntuToolkit/private/actionlist_p.h>
 
 class QSignalMapper;
 
@@ -59,4 +58,4 @@
 
 UT_NAMESPACE_END
 
-#endif // EXCLUSIVEGROUP_H
+#endif // EXCLUSIVEGROUP_P_H
 
=== modified file 'src/UbuntuToolkit/filterbehavior_p.h'
--- src/Ubuntu/UbuntuToolkit/filterbehavior_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/filterbehavior_p.h	2016-09-17 11:46:32 +0000
@@ -17,11 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FILTERBEHAVIOR_H
-#define FILTERBEHAVIOR_H
-
-#include <QSortFilterProxyModel>
-#include <ubuntutoolkitglobal.h>
+#ifndef FILTERBEHAVIOR_P_H
+#define FILTERBEHAVIOR_P_H
+
+#include <QtCore/QSortFilterProxyModel>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -50,4 +51,4 @@
 
 UT_NAMESPACE_END
 
-#endif // FILTERBEHAVIOR_H
+#endif // FILTERBEHAVIOR_P_H
 
=== modified file 'src/UbuntuToolkit/i18n.cpp'
--- src/Ubuntu/UbuntuToolkit/i18n.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/i18n.cpp	2016-09-17 11:46:32 +0000
@@ -17,18 +17,19 @@
  */
 
 #include "i18n_p.h"
-#include "timeutils_p.h"
-#include <QtCore/QDir>
 
 namespace C {
 #include <libintl.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 }
-
 #include <stdlib.h>
 #include <locale.h>
 
+#include <QtCore/QDir>
+
+#include "timeutils_p.h"
+
 UT_NAMESPACE_BEGIN
 /*!
  * \qmltype i18n
 
=== modified file 'src/UbuntuToolkit/i18n_p.h'
--- src/Ubuntu/UbuntuToolkit/i18n_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/i18n_p.h	2016-09-17 11:46:32 +0000
@@ -16,11 +16,12 @@
  * Author: Tim Peeters <[e-mail]>
  */
 
-#ifndef UBUNTU_COMPONENTS_I18N_H
-#define UBUNTU_COMPONENTS_I18N_H
+#ifndef I18N_P_H
+#define I18N_P_H
 
 #include <QtCore/QObject>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQmlContext;
 class QQmlEngine;
@@ -80,4 +81,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UBUNTU_COMPONENTS_I18N_H
+#endif // I18N_P_H
 
=== modified file 'src/UbuntuToolkit/inversemouseareatype.cpp'
--- src/Ubuntu/UbuntuToolkit/inversemouseareatype.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/inversemouseareatype.cpp	2016-09-17 11:46:32 +0000
@@ -15,7 +15,9 @@
  */
 
 #include "inversemouseareatype_p.h"
+
 #include <QtGui/QGuiApplication>
+
 #include "quickutils_p.h"
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/inversemouseareatype_p.h'
--- src/Ubuntu/UbuntuToolkit/inversemouseareatype_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/inversemouseareatype_p.h	2016-09-17 11:46:32 +0000
@@ -13,12 +13,14 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef INVERSEMOUSEAREATYPE_H
-#define INVERSEMOUSEAREATYPE_H
-
-#include <private/qquickmousearea_p.h>
+
+#ifndef INVERSEMOUSEAREATYPE_P_H
+#define INVERSEMOUSEAREATYPE_P_H
+
 #include <QtCore/QPointer>
-#include <ubuntutoolkitglobal.h>
+#include <QtQuick/private/qquickmousearea_p.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQuickItem;
 
@@ -73,4 +75,4 @@
 
 UT_NAMESPACE_END
 
-#endif // INVERSEMOUSEAREATYPE_H
+#endif // INVERSEMOUSEAREATYPE_P_H
 
=== modified file 'src/UbuntuToolkit/label_p.h'
--- src/Ubuntu/UbuntuToolkit/label_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/label_p.h	2016-09-17 11:46:32 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LABEL_P
-#define LABEL_P
+#ifndef LABEL_P_H
+#define LABEL_P_H
 
 #include "uclabel_p.h"
 
@@ -59,4 +59,4 @@
 
 UT_NAMESPACE_END
 
-#endif // LABEL_P
+#endif // LABEL_P_H
 
=== modified file 'src/UbuntuToolkit/listener.cpp'
--- src/Ubuntu/UbuntuToolkit/listener.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/listener.cpp	2016-09-17 11:46:32 +0000
@@ -16,7 +16,7 @@
 
 #include "listener_p.h"
 
-#include <QQmlContext>
+#include <QtQml/QQmlContext>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/listener_p.h'
--- src/Ubuntu/UbuntuToolkit/listener_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/listener_p.h	2016-09-17 11:46:32 +0000
@@ -14,11 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UBUNTU_COMPONENTS_LISTENER_H
-#define UBUNTU_COMPONENTS_LISTENER_H
+#ifndef LISTENER_P_H
+#define LISTENER_P_H
 
 #include <QtCore/QObject>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQmlContext;
 
@@ -36,4 +37,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UBUNTU_COMPONENTS_PLUGIN_H
+#endif // LISTENER_P_H
 
=== modified file 'src/UbuntuToolkit/livetimer_p.cpp'
--- src/Ubuntu/UbuntuToolkit/livetimer_p.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/livetimer_p.cpp	2016-09-17 11:46:32 +0000
@@ -15,10 +15,11 @@
  */
 
 #include "livetimer_p_p.h"
+
+#include <QtDBus/QDBusConnection>
+
 #include "timeutils_p.h"
 
-#include <QDBusConnection>
-
 UT_NAMESPACE_BEGIN
 
 SharedLiveTimer::SharedLiveTimer(QObject* parent)
 
=== modified file 'src/UbuntuToolkit/livetimer_p.h'
--- src/Ubuntu/UbuntuToolkit/livetimer_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/livetimer_p.h	2016-09-17 11:46:32 +0000
@@ -14,12 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIVETIMER_H
-#define LIVETIMER_H
-
-#include <QObject>
-#include <QDateTime>
-#include <ubuntutoolkitglobal.h>
+#ifndef LIVETIMER_P_H
+#define LIVETIMER_P_H
+
+#include <QtCore/QDateTime>
+#include <QtCore/QObject>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -70,4 +71,4 @@
 
 UT_NAMESPACE_END
 
-#endif // LIVETIMER_H
+#endif // LIVETIMER_P_H
 
=== modified file 'src/UbuntuToolkit/livetimer_p_p.h'
--- src/Ubuntu/UbuntuToolkit/livetimer_p_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/livetimer_p_p.h	2016-09-17 11:46:32 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LIVETIMER_P_H
-#define LIVETIMER_P_H
-
-#include "livetimer_p.h"
-
-#include <QTimer>
+#ifndef LIVETIMER_P_P_H
+#define LIVETIMER_P_P_H
+
+#include <UbuntuToolkit/private/livetimer_p.h>
+
+#include <QtCore/QTimer>
 
 UT_NAMESPACE_BEGIN
 
@@ -59,4 +59,4 @@
 
 UT_NAMESPACE_END
 
-#endif // LIVETIMER_P_H
+#endif // LIVETIMER_P_P_H
 
=== modified file 'src/UbuntuToolkit/menu.cpp'
--- src/Ubuntu/UbuntuToolkit/menu.cpp	2016-08-25 14:06:06 +0000
+++ src/UbuntuToolkit/menu.cpp	2016-09-17 11:46:32 +0000
@@ -14,23 +14,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "menu_p.h"
 #include "menu_p_p.h"
+
+#include <functional>
+
+#include <QtCore/QPointer>
+#include <QtCore/QLoggingCategory>
+#include <QtGui/qpa/qplatformtheme.h>
+#include <QtGui/qpa/qplatformmenu.h>
+#include <QtGui/private/qguiapplication_p.h>
+#include <QtQuick/QQuickItem>
+#include <QtQuick/private/qquickitem_p.h>
+
 #include "menubar_p.h"
 #include "actionlist_p.h"
 #include "menugroup_p.h"
 
-// Qt
-#include <QPointer>
-#include <QQuickItem>
-#include <QLoggingCategory>
-#include <QtGui/qpa/qplatformtheme.h>
-#include <QtGui/qpa/qplatformmenu.h>
-#include <private/qguiapplication_p.h>
-#include <private/qquickitem_p.h>
-
-#include <functional>
-
 Q_LOGGING_CATEGORY(ucMenu, "ubuntu.components.Menu", QtMsgType::QtWarningMsg)
 
 UT_NAMESPACE_BEGIN
@@ -350,8 +349,6 @@
     : UCAction(parent)
     , d_ptr(new MenuPrivate(this))
 {
-    Q_D(Menu);
-
     connect(this, SIGNAL(enabledChanged()), this, SLOT(_q_updateEnabled()));
     connect(this, SIGNAL(textChanged()), this, SLOT(_q_updateText()));
     connect(this, SIGNAL(iconNameChanged()), this, SLOT(_q_updateIcon()));
 
=== modified file 'src/UbuntuToolkit/menu_p.h'
--- src/Ubuntu/UbuntuToolkit/menu_p.h	2016-08-25 14:06:06 +0000
+++ src/UbuntuToolkit/menu_p.h	2016-09-17 11:46:32 +0000
@@ -12,18 +12,17 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MENU_P_H
 #define MENU_P_H
 
-#include <QQmlListProperty>
-#include <QLoggingCategory>
-#include <QPointer>
-#include <ubuntutoolkitglobal.h>
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QPointer>
+#include <QtQml/QQmlListProperty>
 
-#include "ucaction_p.h"
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
+#include <UbuntuToolkit/private/ucaction_p.h>
 
 Q_DECLARE_LOGGING_CATEGORY(ucMenu);
 
 
=== modified file 'src/UbuntuToolkit/menu_p_p.h'
--- src/Ubuntu/UbuntuToolkit/menu_p_p.h	2016-08-25 14:06:06 +0000
+++ src/UbuntuToolkit/menu_p_p.h	2016-09-17 11:46:32 +0000
@@ -12,14 +12,14 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MENU_P_P_H
 #define MENU_P_P_H
 
-#include "menu_p.h"
-#include <ubuntutoolkitglobal.h>
+#include <UbuntuToolkit/private/menu_p.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QObject;
 class QQmlComponent;
 
=== modified file 'src/UbuntuToolkit/menubar.cpp'
--- src/Ubuntu/UbuntuToolkit/menubar.cpp	2016-08-25 14:06:06 +0000
+++ src/UbuntuToolkit/menubar.cpp	2016-09-17 11:46:32 +0000
@@ -12,19 +12,16 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
-#include "menubar_p.h"
 #include "menubar_p_p.h"
 
-// Qt
-#include <QQuickItem>
-#include <QQuickWindow>
-#include <QLoggingCategory>
-#include <private/qguiapplication_p.h>
+#include <QtCore/QLoggingCategory>
+#include <QtQuick/QQuickItem>
+#include <QtQuick/QQuickWindow>
 #include <QtGui/qpa/qplatformtheme.h>
 #include <QtGui/qpa/qplatformmenu.h>
+#include <QtGui/private/qguiapplication_p.h>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/menubar_p.h'
--- src/Ubuntu/UbuntuToolkit/menubar_p.h	2016-08-25 14:06:06 +0000
+++ src/UbuntuToolkit/menubar_p.h	2016-09-17 11:46:32 +0000
@@ -12,16 +12,15 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MENUBAR_P_H
 #define MENUBAR_P_H
 
-#include "menu_p.h"
-#include <ubuntutoolkitglobal.h>
+#include <QtQml/QQmlParserStatus>
 
-#include <QQmlParserStatus>
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
+#include <UbuntuToolkit/private/menu_p.h>
 
 class QPlatformMenuBar;
 
 
=== modified file 'src/UbuntuToolkit/menubar_p_p.h'
--- src/Ubuntu/UbuntuToolkit/menubar_p_p.h	2016-08-25 14:06:06 +0000
+++ src/UbuntuToolkit/menubar_p_p.h	2016-09-17 11:46:32 +0000
@@ -12,14 +12,14 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef MENUBAR_P_P_H
 #define MENUBAR_P_P_H
 
-#include "menubar_p.h"
-#include <ubuntutoolkitglobal.h>
+#include <UbuntuToolkit/private/menubar_p.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QPlatformMenuBar;
 
 
=== modified file 'src/UbuntuToolkit/menugroup.cpp'
--- src/Ubuntu/UbuntuToolkit/menugroup.cpp	2016-08-25 14:06:06 +0000
+++ src/UbuntuToolkit/menugroup.cpp	2016-09-17 11:46:32 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "menugroup_p.h"
+
 #include "actionlist_p.h"
 #include "ucaction_p.h"
 
 
=== modified file 'src/UbuntuToolkit/menugroup_p.h'
--- src/Ubuntu/UbuntuToolkit/menugroup_p.h	2016-08-25 14:06:06 +0000
+++ src/UbuntuToolkit/menugroup_p.h	2016-09-17 11:46:32 +0000
@@ -17,11 +17,11 @@
 #ifndef MENUGROUP_P_H
 #define MENUGROUP_P_H
 
-#include <ubuntutoolkitglobal.h>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
+#include <QtQml/QQmlListProperty>
 
-#include <QObject>
-#include <QVector>
-#include <QQmlListProperty>
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/mousetouchadaptor.cpp'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor.cpp	2016-07-07 07:56:34 +0000
+++ src/UbuntuToolkit/mousetouchadaptor.cpp	2016-09-17 11:46:32 +0000
@@ -19,12 +19,11 @@
 
 #include "mousetouchadaptor_p_p.h"
 
-#include <qpa/qplatformnativeinterface.h>
-#include <qpa/qwindowsysteminterface.h>
-
-#include <QCoreApplication>
-#include <QMouseEvent>
-#include <QTest>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QMouseEvent>
+#include <QtGui/qpa/qplatformnativeinterface.h>
+#include <QtGui/qpa/qwindowsysteminterface.h>
 
 #ifdef UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
     #define ENABLE_TOUCH_EMULATION
 
=== modified file 'src/UbuntuToolkit/mousetouchadaptor_p.h'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p.h	2016-07-07 18:17:56 +0000
+++ src/UbuntuToolkit/mousetouchadaptor_p.h	2016-09-17 11:46:32 +0000
@@ -17,13 +17,13 @@
  *              Zsombor Egri <[e-mail]>
  */
 
-#ifndef MOUSE_TOUCH_ADAPTOR_H
-#define MOUSE_TOUCH_ADAPTOR_H
-
-#include "ubuntutoolkitglobal.h"
+#ifndef MOUSETOUCHADAPTOR_P_H
+#define MOUSETOUCHADAPTOR_P_H
 
 #include <QtCore/QObject>
 
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
+
 class QMouseEvent;
 class QTouchDevice;
 class QQmlEngine;
@@ -60,4 +60,4 @@
 
 UT_NAMESPACE_END
 
-#endif // MOUSE_TOUCH_ADAPTOR_H
+#endif // MOUSETOUCHADAPTOR_P_H
 
=== modified file 'src/UbuntuToolkit/mousetouchadaptor_p_p.h'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_p_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/mousetouchadaptor_p_p.h	2016-09-17 11:46:32 +0000
@@ -16,13 +16,15 @@
  * Authored by: Zsombor Egri <[e-mail]>
  */
 
-#ifndef MOUSETOUCHADAPTOR_P
-#define MOUSETOUCHADAPTOR_P
-
-#include "mousetouchadaptor_p.h"
+#ifndef MOUSETOUCHADAPTOR_P_P_H
+#define MOUSETOUCHADAPTOR_P_P_H
+
+#include <UbuntuToolkit/private/mousetouchadaptor_p.h>
+
+#include <QtCore/QAbstractNativeEventFilter>
 #include <QtCore/private/qobject_p.h>
-#include <QtCore/QAbstractNativeEventFilter>
-#include <QWindow>
+#include <QtGui/QWindow>
+
 #include <xcb/xcb.h>
 
 UT_NAMESPACE_BEGIN
@@ -73,5 +75,4 @@
 
 UT_NAMESPACE_END
 
-#endif // MOUSETOUCHADAPTOR_P
-
+#endif // MOUSETOUCHADAPTOR_P_P_H
 
=== modified file 'src/UbuntuToolkit/mousetouchadaptor_x11.cpp'
--- src/Ubuntu/UbuntuToolkit/mousetouchadaptor_x11.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/mousetouchadaptor_x11.cpp	2016-09-17 11:46:32 +0000
@@ -55,11 +55,10 @@
 
 #include "mousetouchadaptor_p_p.h"
 
-#include <qpa/qplatformnativeinterface.h>
-
-#include <QCoreApplication>
-#include <QMouseEvent>
-#include <QTest>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QMouseEvent>
+#include <QtGui/qpa/qplatformnativeinterface.h>
+#include <QtTest/qtesttouch.h>
 
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/XI2proto.h>
 
=== modified file 'src/UbuntuToolkit/privates/appheaderbase.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/appheaderbase.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/appheaderbase.cpp	2016-09-17 11:46:32 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "appheaderbase_p.h"
+
 #include "ucstyleditembase_p_p.h"
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/privates/appheaderbase_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/appheaderbase_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/appheaderbase_p.h	2016-09-17 11:46:32 +0000
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef APPHEADERBASE_H
-#define APPHEADERBASE_H
+#ifndef APPHEADERBASE_P_H
+#define APPHEADERBASE_P_H
 
-#include "ucheader_p.h"
+#include <UbuntuToolkit/private/ucheader_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -62,4 +62,4 @@
 
 UT_NAMESPACE_END
 
-#endif // APPHEADERBASE_H
+#endif // APPHEADERBASE_P_H
 
=== modified file 'src/UbuntuToolkit/privates/frame.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/frame.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/frame.cpp	2016-09-17 11:46:32 +0000
@@ -16,11 +16,13 @@
  * Author: Loïc Molinari <[e-mail]>
  */
 
-#include "frame_p.h"
-#include "textures_p.h"
+#include "privates/frame_p.h"
+
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLFunctions>
 
+#include "privates/textures_p.h"
+
 UT_NAMESPACE_BEGIN
 
 const QRgb defaultColor = qRgba(255, 255, 255, 255);
 
=== modified file 'src/UbuntuToolkit/privates/frame_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/frame_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/frame_p.h	2016-09-17 11:46:32 +0000
@@ -16,13 +16,14 @@
  * Author: Loïc Molinari <[e-mail]>
  */
 
-#ifndef FRAME_H
-#define FRAME_H
+#ifndef FRAME_P_H
+#define FRAME_P_H
 
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QSGMaterial>
 #include <QtQuick/QSGNode>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -101,4 +102,4 @@
 
 UT_NAMESPACE_END
 
-#endif  // FRAME_H
+#endif  // FRAME_P_H
 
=== modified file 'src/UbuntuToolkit/privates/listitemdragarea.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/listitemdragarea.cpp	2016-08-14 09:06:34 +0000
+++ src/UbuntuToolkit/privates/listitemdragarea.cpp	2016-09-17 11:46:32 +0000
@@ -15,15 +15,17 @@
  */
 
 #include "listitemdragarea_p.h"
-#include "listitemdraghandler_p.h"
-#include "uclistitem_p_p.h"
-#include "ucunits_p.h"
-#include "i18n_p.h"
+
 #include <QtCore/QtMath>
 #include <QtQml/QQmlInfo>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickflickable_p.h>
 
+#include "privates/listitemdraghandler_p.h"
+#include "uclistitem_p_p.h"
+#include "ucunits_p.h"
+#include "i18n_p.h"
+
 #define IMPLICIT_DRAG_WIDTH_GU  5
 #define DRAG_SCROLL_TIMEOUT     15
 
 
=== modified file 'src/UbuntuToolkit/privates/listitemdragarea_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/listitemdragarea_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/listitemdragarea_p.h	2016-09-17 11:46:32 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LISTITEMDRAGAREA_H
-#define LISTITEMDRAGAREA_H
+#ifndef LISTITEMDRAGAREA_P_H
+#define LISTITEMDRAGAREA_P_H
 
-#include <ubuntutoolkitglobal.h>
-#include "uclistitem_p.h"
 #include <QtCore/QBasicTimer>
 #include <QtCore/QPointer>
 
+#include <UbuntuToolkit/private/uclistitem_p.h>
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
+
 class QQuickFlickable;
 
 UT_NAMESPACE_BEGIN
@@ -58,4 +59,4 @@
 
 UT_NAMESPACE_END
 
-#endif // LISTITEMDRAGAREA_H
+#endif // LISTITEMDRAGAREA_P_H
 
=== modified file 'src/UbuntuToolkit/privates/listitemdraghandler.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/listitemdraghandler.cpp	2016-09-17 11:46:32 +0000
@@ -14,11 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "listitemdraghandler_p.h"
-#include "uclistitem_p.h"
+#include "privates/listitemdraghandler_p.h"
+
+#include <QtQuick/private/qquickanimation_p.h>
+
 #include "uclistitem_p_p.h"
-#include <propertychange_p.h>
-#include <QtQuick/private/qquickanimation_p.h>
+#include "propertychange_p.h"
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/privates/listitemdraghandler_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/listitemdraghandler_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/listitemdraghandler_p.h	2016-09-17 11:46:32 +0000
@@ -14,13 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LISTITEMDRAGHANDLER_H
-#define LISTITEMDRAGHANDLER_H
+#ifndef LISTITEMDRAGHANDLER_P_H
+#define LISTITEMDRAGHANDLER_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
 #include <QtCore/QPointF>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -49,4 +50,4 @@
 
 UT_NAMESPACE_END
 
-#endif // LISTITEMDRAGHANDLER_H
+#endif // LISTITEMDRAGHANDLER_P_H
 
=== modified file 'src/UbuntuToolkit/privates/listitemselection.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/listitemselection.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/listitemselection.cpp	2016-09-17 11:46:32 +0000
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "listitemselection_p.h"
+#include "privates/listitemselection_p.h"
+
 #include "uclistitem_p_p.h"
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/privates/listitemselection_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/listitemselection_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/listitemselection_p.h	2016-09-17 11:46:32 +0000
@@ -14,12 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LISTITEMSELECTION_H
-#define LISTITEMSELECTION_H
+#ifndef LISTITEMSELECTION_P_H
+#define LISTITEMSELECTION_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -58,4 +59,4 @@
 
 UT_NAMESPACE_END
 
-#endif // LISTITEMSELECTION_H
+#endif // LISTITEMSELECTION_P_H
 
=== modified file 'src/UbuntuToolkit/privates/listviewextensions.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp	2016-08-01 13:19:05 +0000
+++ src/UbuntuToolkit/privates/listviewextensions.cpp	2016-09-17 11:46:32 +0000
@@ -16,19 +16,24 @@
  * Author Zsombor Egri <[e-mail]>
  */
 
-#include "listviewextensions_p.h"
-#include "uclistitem_p_p.h"
-#include "quickutils_p.h"
+#include "privates/listviewextensions_p.h"
+
 #include <QtQuick/QQuickItem>
 #include <QtQuick/private/qquickflickable_p.h>
 #include <QtQuick/private/qquickitemview_p.h> // for QQuickItemView::BottomToTop
 
+#include "uclistitem_p_p.h"
+#include "quickutils_p.h"
+
 UT_NAMESPACE_BEGIN
 
 ListViewProxy::ListViewProxy(QQuickFlickable *listView, QObject *parent)
     : QObject(parent)
     , listView(listView)
+    , _currentItem(Q_NULLPTR)
 {
+    connect(listView, SIGNAL(currentItemChanged()), this, SLOT(onCurrentItemChanged()), Qt::DirectConnection);
+    onCurrentItemChanged();
 }
 ListViewProxy::~ListViewProxy()
 {
@@ -51,7 +56,7 @@
 
 QQuickItem *ListViewProxy::currentItem()
 {
-    return listView->property("currentItem").value<QQuickItem*>();
+    return _currentItem;
 }
 
 int ListViewProxy::currentIndex()
@@ -100,7 +105,7 @@
 
 void ListViewProxy::setKeyNavigationForListView(bool value)
 {
-    UCListItem *listItem = qobject_cast<UCListItem*>(currentItem());
+    UCListItem *listItem = qobject_cast<UCListItem*>(_currentItem);
     if (listItem) {
         UCListItemPrivate::get(listItem)->setListViewKeyNavigation(value);
         listItem->update();
@@ -114,8 +119,7 @@
         case Qt::TabFocusReason:
         case Qt::BacktabFocusReason:
         {
-            QQuickItem *currentItem = this->currentItem();
-            if (!currentItem && count() > 0) {
+            if (!_currentItem && count() > 0) {
                 // set the first one to be the focus
                 setCurrentIndex(0);
                 setKeyNavigationForListView(true);
@@ -135,25 +139,22 @@
     int key = event->key();
     Qt::Orientation orientation = this->orientation();
 
-    if ((orientation == Qt::Vertical && key != Qt::Key_Up && key != Qt::Key_Down)
-        || (orientation == Qt::Horizontal && key != Qt::Key_Left && key != Qt::Key_Right)) {
-        return false;
-    }
-    // effectiveLayoutDirection takes into account effectiveLayoutMirror and layoutDirection.
-    bool isRtl = (Qt::RightToLeft == listView->property("effectiveLayoutDirection").toInt());
-    bool isBtt = (QQuickItemView::BottomToTop == listView->property("verticalLayoutDirection").toInt());
-    bool forwards = (isBtt ? key == Qt::Key_Up : key == Qt::Key_Down) || (isRtl ? key == Qt::Key_Left : key == Qt::Key_Right);
-    int oldIndex = this->currentIndex();
-    int currentIndex = this->currentIndex();
-    int count = this->count();
-
-    if (currentIndex >= 0 && count > 0) {
-        currentIndex = qBound<int>(0, forwards ? currentIndex + 1 : currentIndex - 1, count - 1);
-        setCurrentIndex(currentIndex);
-        setKeyNavigationForListView(true);
-    }
-
-    return (oldIndex != currentIndex);
+    if ((orientation == Qt::Vertical && (key == Qt::Key_Up || key == Qt::Key_Down))
+        || (orientation == Qt::Horizontal && (key == Qt::Key_Left || key == Qt::Key_Right))) {
+        keyNavigation = true;
+    }
+
+    return false;
+}
+
+void ListViewProxy::onCurrentItemChanged()
+{
+    setKeyNavigationForListView(false);
+    _currentItem = listView->property("currentItem").value<QQuickItem*>();
+    if (_currentItem && _currentItem->isEnabled()) {
+        setKeyNavigationForListView(keyNavigation);
+        keyNavigation = false;
+    }
 }
 
 UT_NAMESPACE_END
 
=== modified file 'src/UbuntuToolkit/privates/listviewextensions_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/listviewextensions_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/listviewextensions_p.h	2016-09-17 11:46:32 +0000
@@ -16,11 +16,13 @@
  * Author Zsombor Egri <[e-mail]>
  */
 
-#ifndef LISTVIEWEXTENSIONS_H
-#define LISTVIEWEXTENSIONS_H
+#ifndef LISTVIEWEXTENSIONS_P_H
+#define LISTVIEWEXTENSIONS_P_H
 
 #include <QtCore/QObject>
-#include <ubuntutoolkitglobal.h>
+#include <QtCore/QPointer>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQuickFlickable;
 class QQuickItem;
@@ -56,11 +58,14 @@
     bool focusInEvent(QFocusEvent *event);
     bool keyPressEvent(QKeyEvent *event);
     void setKeyNavigationForListView(bool value);
+    Q_SLOT void onCurrentItemChanged();
 private:
     QQuickFlickable *listView;
+    QPointer<QQuickItem> _currentItem;
     bool isEventFilter:1;
+    bool keyNavigation:1;
 };
 
 UT_NAMESPACE_END
 
-#endif // LISTVIEWEXTENSIONS_H
+#endif // LISTVIEWEXTENSIONS_P_H
 
=== modified file 'src/UbuntuToolkit/privates/splitviewhandler.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/splitviewhandler.cpp	2016-08-26 05:40:23 +0000
+++ src/UbuntuToolkit/privates/splitviewhandler.cpp	2016-09-17 11:46:32 +0000
@@ -16,13 +16,15 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#include "splitviewhandler_p_p.h"
+#include "privates/splitviewhandler_p.h"
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlInfo>
 #include <QtQuick/private/qquickanchors_p.h>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickevents_p_p.h>
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlInfo>
-#include <splitview_p_p.h>
+
+#include "splitview_p_p.h"
 
 UT_NAMESPACE_BEGIN
 
 
=== renamed file 'src/Ubuntu/UbuntuToolkit/privates/splitviewhandler_p_p.h' => 'src/UbuntuToolkit/privates/splitviewhandler_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/splitviewhandler_p_p.h	2016-08-26 05:40:23 +0000
+++ src/UbuntuToolkit/privates/splitviewhandler_p.h	2016-09-17 11:46:32 +0000
@@ -16,13 +16,14 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef SPLITVIEWHANDLER_H
-#define SPLITVIEWHANDLER_H
+#ifndef SPLITVIEWHANDLER_P_H
+#define SPLITVIEWHANDLER_P_H
 
+#include <QtCore/QPointer>
 #include <QtQuick/QQuickItem>
-#include <QtCore/QPointer>
 #include <QtQuick/private/qquickmousearea_p.h>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -49,4 +50,4 @@
 
 UT_NAMESPACE_END
 
-#endif // SPLITVIEWHANDLER_H
+#endif // SPLITVIEWHANDLER_P_H
 
=== modified file 'src/UbuntuToolkit/privates/threelabelsslot_p.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp	2016-07-18 17:18:13 +0000
+++ src/UbuntuToolkit/privates/threelabelsslot_p.cpp	2016-09-17 11:46:32 +0000
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "threelabelsslot_p.h"
+#include "privates/threelabelsslot_p.h"
+
 #include "label_p.h"
 #include "ucunits_p.h"
 #include "ucfontutils_p.h"
 
=== modified file 'src/UbuntuToolkit/privates/threelabelsslot_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.h	2016-06-21 13:16:07 +0000
+++ src/UbuntuToolkit/privates/threelabelsslot_p.h	2016-09-17 11:46:32 +0000
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef THREELABELSSLOT_H
-#define THREELABELSSLOT_H
-
-#include <QQuickItem>
-#include <private/qquickitem_p.h>
-#include <ubuntutoolkitglobal.h>
+#ifndef THREELABELSSLOT_P_H
+#define THREELABELSSLOT_P_H
+
+#include <QtQuick/private/qquickitem_p.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 //The padding between title and the string below it (i.e. subtitle, or
 //summary, when subtitle is empty)
@@ -89,4 +89,4 @@
 
 UT_NAMESPACE_END
 
-#endif // THREELABELSSLOT_H
+#endif // THREELABELSSLOT_P_H
 
=== modified file 'src/UbuntuToolkit/privates/ucpagewrapper.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp	2016-08-08 11:51:22 +0000
+++ src/UbuntuToolkit/privates/ucpagewrapper.cpp	2016-09-17 11:46:32 +0000
@@ -14,11 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ucpagewrapper_p_p.h"
-#include "ucpagewrapperincubator_p.h"
-
-#include <QQmlEngine>
-#include <QQmlContext>
+#include "privates/ucpagewrapper_p_p.h"
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlContext>
+
+#include "privates/ucpagewrapperincubator_p.h"
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/privates/ucpagewrapper_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/ucpagewrapper_p.h	2016-09-17 11:46:32 +0000
@@ -14,11 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UCPAGEWRAPPER_H
-#define UCPAGEWRAPPER_H
+#ifndef UCPAGEWRAPPER_P_H
+#define UCPAGEWRAPPER_P_H
 
-#include <ubuntutoolkitglobal.h>
-#include "ucpagetreenode_p.h"
+#include <UbuntuToolkit/private/ucpagetreenode_p.h>
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/privates/ucpagewrapper_p_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper_p_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/privates/ucpagewrapper_p_p.h	2016-09-17 11:46:32 +0000
@@ -14,12 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UCPAGEWRAPPER_P_H
-#define UCPAGEWRAPPER_P_H
-
-#include <ubuntutoolkitglobal.h>
-#include "ucpagetreenode_p_p.h"
-#include "ucpagewrapper_p.h"
+#ifndef UCPAGEWRAPPER_P_P_H
+#define UCPAGEWRAPPER_P_P_H
+
+#include <UbuntuToolkit/private/ucpagewrapper_p.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
+#include <UbuntuToolkit/private/ucpagetreenode_p_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -80,4 +81,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCPAGEWRAPPER_P_H
+#endif // UCPAGEWRAPPER_P_P_H
 
=== modified file 'src/UbuntuToolkit/privates/ucpagewrapperincubator.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator.cpp	2016-06-17 11:26:12 +0000
+++ src/UbuntuToolkit/privates/ucpagewrapperincubator.cpp	2016-09-17 11:46:32 +0000
@@ -14,9 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ucpagewrapperincubator_p.h"
-#include <QVariantMap>
-#include <QQmlInfo>
+#include "privates/ucpagewrapperincubator_p.h"
+
+#include <QtCore/QVariantMap>
+#include <QtQml/QQmlInfo>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/privates/ucpagewrapperincubator_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/ucpagewrapperincubator_p.h	2016-06-17 11:26:12 +0000
+++ src/UbuntuToolkit/privates/ucpagewrapperincubator_p.h	2016-09-17 11:46:32 +0000
@@ -14,14 +14,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UCPAGEWRAPPERINCUBATOR_H
-#define UCPAGEWRAPPERINCUBATOR_H
-
-#include <QObject>
-#include <QQmlIncubator>
-#include <QJSValue>
-#include <QVariant>
-#include <ubuntutoolkitglobal.h>
+#ifndef UCPAGEWRAPPERINCUBATOR_P_H
+#define UCPAGEWRAPPERINCUBATOR_P_H
+
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
+#include <QtQml/QQmlIncubator>
+#include <QtQml/QJSValue>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -61,4 +62,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCPAGEWRAPPERINCUBATOR_H
+#endif // UCPAGEWRAPPERINCUBATOR_P_H
 
=== modified file 'src/UbuntuToolkit/privates/ucscrollbarutils.cpp'
--- src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils.cpp	2016-08-01 13:48:02 +0000
+++ src/UbuntuToolkit/privates/ucscrollbarutils.cpp	2016-09-17 11:46:32 +0000
@@ -16,7 +16,8 @@
  * Author: Andrea Bernabei <[e-mail]>
  */
 
-#include "ucscrollbarutils_p.h"
+#include "privates/ucscrollbarutils_p.h"
+
 #include <QtQuick/private/qquickitem_p.h>
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/privates/ucscrollbarutils_p.h'
--- src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils_p.h	2016-08-01 13:48:02 +0000
+++ src/UbuntuToolkit/privates/ucscrollbarutils_p.h	2016-09-17 11:46:32 +0000
@@ -16,11 +16,12 @@
  * Author: Andrea Bernabei <[e-mail]>
  */
 
-#ifndef UCSCROLLBARUTILS_H
-#define UCSCROLLBARUTILS_H
-
-#include <QObject>
-#include <ubuntutoolkitglobal.h>
+#ifndef UCSCROLLBARUTILS_P_H
+#define UCSCROLLBARUTILS_P_H
+
+#include <QtCore/QObject>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQuickItem;
 
@@ -38,4 +39,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCSCROLLBARUTILS_H
+#endif // UCSCROLLBARUTILS_P_H
 
=== modified file 'src/UbuntuToolkit/propertychange_p.h'
--- src/Ubuntu/UbuntuToolkit/propertychange_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/propertychange_p.h	2016-09-17 11:46:32 +0000
@@ -17,14 +17,14 @@
 #ifndef PROPERTYCHANGE_P_H
 #define PROPERTYCHANGE_P_H
 
+#include <QtCore/QObject>
 #include <QtCore/QVariant>
-#include <QtCore/QObject>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#include <QtCore/QExplicitlySharedDataPointer>
+#endif
 #include <QtQml/QQmlProperty>
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
-#include <QtCore/QExplicitlySharedDataPointer>
-#endif
-#include <ubuntutoolkitglobal.h>
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQmlAbstractBinding;
 
 
=== modified file 'src/UbuntuToolkit/qquickclipboard.cpp'
--- src/Ubuntu/UbuntuToolkit/qquickclipboard.cpp	2016-07-07 18:17:56 +0000
+++ src/UbuntuToolkit/qquickclipboard.cpp	2016-09-17 11:46:32 +0000
@@ -16,10 +16,11 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
+#include "qquickclipboard_p_p.h"
+
 #include <QtGui/QClipboard>
 #include <QtGui/QGuiApplication>
 
-#include "qquickclipboard_p_p.h"
 #include "qquickmimedata_p.h"
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/qquickclipboard_p.h'
--- src/Ubuntu/UbuntuToolkit/qquickclipboard_p.h	2016-07-07 18:17:56 +0000
+++ src/UbuntuToolkit/qquickclipboard_p.h	2016-09-17 11:46:32 +0000
@@ -16,13 +16,14 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef QQUICKCLIPBOARD_H
-#define QQUICKCLIPBOARD_H
+#ifndef QQUICKCLIPBOARD_P_H
+#define QQUICKCLIPBOARD_P_H
 
 #include <QtCore/QObject>
 #include <QtQml/QJSEngine>
 #include <QtQml/QQmlEngine>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQmlEngine;
 class QJSEngine;
@@ -60,4 +61,4 @@
 
 UT_NAMESPACE_END
 
-#endif // QQUICKCLIPBOARD_H
+#endif // QQUICKCLIPBOARD_P_H
 
=== modified file 'src/UbuntuToolkit/qquickclipboard_p_p.h'
--- src/Ubuntu/UbuntuToolkit/qquickclipboard_p_p.h	2016-07-07 18:17:56 +0000
+++ src/UbuntuToolkit/qquickclipboard_p_p.h	2016-09-17 11:46:32 +0000
@@ -16,12 +16,13 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef QQUICKCLIPBOARD_P_H
-#define QQUICKCLIPBOARD_P_H
-
-#include "qquickclipboard_p.h"
+#ifndef QQUICKCLIPBOARD_P_P_H
+#define QQUICKCLIPBOARD_P_P_H
+
+#include <UbuntuToolkit/private/qquickclipboard_p.h>
+
+#include <QtCore/private/qobject_p.h>
 #include <QtGui/QClipboard>
-#include <QtCore/private/qobject_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -41,4 +42,4 @@
 
 UT_NAMESPACE_END
 
-#endif // QQUICKCLIPBOARD_P_H
+#endif // QQUICKCLIPBOARD_P_P_H
 
=== modified file 'src/UbuntuToolkit/qquickmimedata.cpp'
--- src/Ubuntu/UbuntuToolkit/qquickmimedata.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/qquickmimedata.cpp	2016-09-17 11:46:32 +0000
@@ -16,14 +16,14 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#include <QtGui/QClipboard>
-#include <QtGui/QGuiApplication>
+#include "qquickmimedata_p.h"
+
 #include <QtCore/QMimeData>
 #include <QtCore/QMimeDatabase>
 #include <QtCore/QMimeType>
-#include "qquickmimedata_p.h"
-
-#include <QDebug>
+#include <QtCore/QDebug>
+#include <QtGui/QClipboard>
+#include <QtGui/QGuiApplication>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/qquickmimedata_p.h'
--- src/Ubuntu/UbuntuToolkit/qquickmimedata_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/qquickmimedata_p.h	2016-09-17 11:46:32 +0000
@@ -16,14 +16,15 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef QQUICKMIMEDATA_H
-#define QQUICKMIMEDATA_H
+#ifndef QQUICKMIMEDATA_P_H
+#define QQUICKMIMEDATA_P_H
 
 #include <QtCore/QMimeData>
 #include <QtCore/QStringList>
+#include <QtCore/QUrl>
 #include <QtGui/QColor>
-#include <QtCore/QUrl>
-#include "qquickclipboard_p.h"
+
+#include <UbuntuToolkit/private/qquickclipboard_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -74,4 +75,4 @@
 
 UT_NAMESPACE_END
 
-#endif // QQUICKMIMEDATA_H
+#endif // QQUICKMIMEDATA_P_H
 
=== modified file 'src/UbuntuToolkit/quickutils.cpp'
--- src/Ubuntu/UbuntuToolkit/quickutils.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/quickutils.cpp	2016-09-17 11:46:32 +0000
@@ -12,23 +12,21 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #include "quickutils_p.h"
 
-#include <QGuiApplication>
-#include <QtQuick/QQuickView>
-#include <QtQuick/QQuickItem>
-#include <QtQml/QQmlContext>
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QAbstractProxyModel>
+#include <QtGui/QGuiApplication>
+#include <QtQml/QQmlContext>
 #include <QtQml/QQmlPropertyMap>
 #include <QtQml/QQmlInfo>
 #include <QtQml/QQmlEngine>
-
-#include <private/qquicktextinput_p.h>
-#include <private/qquicktextedit_p.h>
+#include <QtQuick/QQuickView>
+#include <QtQuick/QQuickItem>
+#include <QtQuick/private/qquicktextinput_p.h>
+#include <QtQuick/private/qquicktextedit_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -36,6 +34,7 @@
 
 QuickUtils::QuickUtils(QObject *parent) :
     QObject(parent),
+    m_rootWindow(0),
     m_rootView(0),
     m_mouseAttached(false),
     m_keyboardAttached(false)
@@ -86,7 +85,7 @@
     // make sure we have the m_rootView updated
     lookupQuickView();
     if (!object) {
-        return (m_rootView) ? m_rootView->rootObject() : 0;
+        return m_rootView ? m_rootView->rootObject() : (m_rootWindow ? m_rootWindow->contentItem() : 0);
     }
 
     QQuickItem *item = qobject_cast<QQuickItem*>(object);
@@ -175,9 +174,10 @@
  */
 void QuickUtils::lookupQuickView()
 {
-    if (m_rootView)
+    if (m_rootWindow)
         return;
     Q_FOREACH (QWindow *w, QGuiApplication::topLevelWindows()) {
+        m_rootWindow = qobject_cast<QQuickWindow*>(w);
         m_rootView = qobject_cast<QQuickView*>(w);
         if (m_rootView) {
             // connect in case we get the root object changed
 
=== modified file 'src/UbuntuToolkit/quickutils_p.h'
--- src/Ubuntu/UbuntuToolkit/quickutils_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/quickutils_p.h	2016-09-17 11:46:32 +0000
@@ -12,7 +12,6 @@
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
 #ifndef QUICKUTILS_P_H
@@ -21,7 +20,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
 #include <QtQuick/QQuickView>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQuickItem;
 class QQmlEngine;
@@ -85,6 +85,7 @@
 
 private:
     explicit QuickUtils(QObject *parent = 0);
+    QPointer<QQuickWindow> m_rootWindow;
     QPointer<QQuickView> m_rootView;
     QStringList m_omitIM;
     bool m_mouseAttached;
 
=== modified file 'src/UbuntuToolkit/sortbehavior_p.h'
--- src/Ubuntu/UbuntuToolkit/sortbehavior_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/sortbehavior_p.h	2016-09-17 11:46:32 +0000
@@ -17,11 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SORTBEHAVIOR_H
-#define SORTBEHAVIOR_H
-
-#include <QSortFilterProxyModel>
-#include <ubuntutoolkitglobal.h>
+#ifndef SORTBEHAVIOR_P_H
+#define SORTBEHAVIOR_P_H
+
+#include <QtCore/QSortFilterProxyModel>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -50,4 +51,4 @@
 
 UT_NAMESPACE_END
 
-#endif // SORTBEHAVIOR_H
+#endif // SORTBEHAVIOR_P_H
 
=== modified file 'src/UbuntuToolkit/sortfiltermodel_p.h'
--- src/Ubuntu/UbuntuToolkit/sortfiltermodel_p.h	2016-08-16 08:43:28 +0000
+++ src/UbuntuToolkit/sortfiltermodel_p.h	2016-09-17 11:46:32 +0000
@@ -18,12 +18,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef QSORTFILTERPROXYMODELQML_H
-#define QSORTFILTERPROXYMODELQML_H
-
-#include <QSortFilterProxyModel>
-#include "sortbehavior_p.h"
-#include "filterbehavior_p.h"
+#ifndef SORTFILTERMODEL_P_H
+#define SORTFILTERMODEL_P_H
+
+#include <QtCore/QSortFilterProxyModel>
+
+#include <UbuntuToolkit/private/sortbehavior_p.h>
+#include <UbuntuToolkit/private/filterbehavior_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -73,4 +74,4 @@
 
 UT_NAMESPACE_END
 
-#endif // QSORTFILTERPROXYMODELQML_H
+#endif // SORTFILTERMODEL_P_H
 
=== modified file 'src/UbuntuToolkit/splitview.cpp'
--- src/Ubuntu/UbuntuToolkit/splitview.cpp	2016-08-11 14:47:05 +0000
+++ src/UbuntuToolkit/splitview.cpp	2016-09-17 11:46:32 +0000
@@ -16,16 +16,15 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
+#include "splitview_p_p.h"
+
+#include <QtQml/QQmlInfo>
+#include <QtQuick/private/qquickanchors_p.h>
 #include <QtQuick/private/qquickitem_p.h>
-#include <QtQuick/private/qquickanchors_p.h>
-#include <QtQml/QQmlInfo>
 
-#include "splitview_p.h"
-#include "splitview_p_p.h"
 #include "ucunits_p.h"
 #include "ucpagetreenode_p.h"
-
-#include "privates/splitviewhandler_p_p.h"
+#include "privates/splitviewhandler_p.h"
 
 #define DEFAULT_SPACING_DP      4
 
 
=== modified file 'src/UbuntuToolkit/splitview_p.h'
--- src/Ubuntu/UbuntuToolkit/splitview_p.h	2016-08-09 13:23:04 +0000
+++ src/UbuntuToolkit/splitview_p.h	2016-09-17 11:46:32 +0000
@@ -21,7 +21,7 @@
 
 #include <QtQuick/private/qquickpositioners_p.h>
 
-#include "ubuntutoolkitglobal.h"
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/splitview_p_p.h'
--- src/Ubuntu/UbuntuToolkit/splitview_p_p.h	2016-08-10 07:34:04 +0000
+++ src/UbuntuToolkit/splitview_p_p.h	2016-09-17 11:46:32 +0000
@@ -19,7 +19,8 @@
 #ifndef SPLITVIEW_P_P_H
 #define SPLITVIEW_P_P_H
 
-#include "splitview_p.h"
+#include <UbuntuToolkit/private/splitview_p.h>
+
 #include <QtCore/private/qobject_p.h>
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/splitviewlayout.cpp'
--- src/Ubuntu/UbuntuToolkit/splitviewlayout.cpp	2016-08-11 14:07:52 +0000
+++ src/UbuntuToolkit/splitviewlayout.cpp	2016-09-17 11:46:32 +0000
@@ -15,12 +15,12 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
+#include "splitview_p_p.h"
+
+#include <QtQuick/private/qquickanchors_p.h>
 #include <QtQuick/private/qquickitem_p.h>
-#include <QtQuick/private/qquickanchors_p.h>
 #include <QtQml/QQmlInfo>
 
-#include "splitview_p.h"
-#include "splitview_p_p.h"
 #include "ucmathutils_p.h"
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/statesaverbackend_p.cpp'
--- src/Ubuntu/UbuntuToolkit/statesaverbackend_p.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/statesaverbackend_p.cpp	2016-09-17 11:46:32 +0000
@@ -17,18 +17,19 @@
  */
 
 #include "statesaverbackend_p.h"
-#include "ucapplication_p.h"
-#include <QtQml/QQmlContext>
-#include <QtQml/QQmlProperty>
-#include <QtQml/qqmlinfo.h>
-#include <QtQml/qqml.h>
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
+#include <QtCore/QStandardPaths>
 #include <QtCore/QStringList>
+#include <QtQml/QtQml>
+#include <QtQml/QQmlContext>
+#include <QtQml/QQmlInfo>
+#include <QtQml/QQmlProperty>
+
 #include "i18n_p.h"
 #include "quickutils_p.h"
-#include <QtCore/QStandardPaths>
-
+#include "ucapplication_p.h"
 #include "unixsignalhandler_p.h"
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/statesaverbackend_p.h'
--- src/Ubuntu/UbuntuToolkit/statesaverbackend_p.h	2016-07-06 09:51:06 +0000
+++ src/UbuntuToolkit/statesaverbackend_p.h	2016-09-17 11:46:32 +0000
@@ -20,12 +20,13 @@
 #define STATESAVERBACKEND_P_H
 
 #include <QtCore/QObject>
-#include <QtCore/QSettings>
 #include <QtCore/QPointer>
 #include <QtCore/QSet>
+#include <QtCore/QSettings>
+#include <QtCore/QStack>
 #include <QtCore/QTimer>
-#include <QtCore/QStack>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/timeutils_p.h'
--- src/Ubuntu/UbuntuToolkit/timeutils_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/timeutils_p.h	2016-09-17 11:46:32 +0000
@@ -17,12 +17,12 @@
 #ifndef TIMEUTILS_P_H
 #define TIMEUTILS_P_H
 
-#include "livetimer_p.h"
+#include <QtCore/QDateTime>
+#include <QtCore/QLocale>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 
-#include <QDateTime>
-#include <QLocale>
-#include <QObject>
-#include <QTimer>
+#include <UbuntuToolkit/private/livetimer_p.h>
 
 UT_NAMESPACE_BEGIN
 
 
=== renamed directory 'src/Ubuntu/Components/tools' => 'src/UbuntuToolkit/tools'
=== modified file 'src/UbuntuToolkit/tree.cpp'
--- src/Ubuntu/UbuntuToolkit/tree.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/tree.cpp	2016-09-17 11:46:32 +0000
@@ -16,8 +16,8 @@
 
 #include "tree_p.h"
 
-#include <private/qobject_p.h>
-#include <QQmlEngine>
+#include <QtCore/private/qobject_p.h>
+#include <QtQml/QQmlEngine>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/tree_p.h'
--- src/Ubuntu/UbuntuToolkit/tree_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/tree_p.h	2016-09-17 11:46:32 +0000
@@ -14,12 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TREE_H
-#define TREE_H
-
-#include <QObject>
-#include <QVariant>
-#include "ubuntutoolkitglobal.h"
+#ifndef TREE_P_H
+#define TREE_P_H
+
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -45,4 +46,4 @@
 
 UT_NAMESPACE_END
 
-#endif // TREE_H
+#endif // TREE_P_H
 
=== modified file 'src/UbuntuToolkit/ubuntutoolkitglobal.h'
--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitglobal.h	2016-07-08 14:28:48 +0000
+++ src/UbuntuToolkit/ubuntutoolkitglobal.h	2016-09-17 11:46:32 +0000
@@ -13,6 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef UBUNTUTOOLKITGLOBAL_H
 #define UBUNTUTOOLKITGLOBAL_H
 
@@ -54,4 +55,3 @@
 #endif
 
 #endif // UBUNTUTOOLKITGLOBAL_H
-
 
=== modified file 'src/UbuntuToolkit/ubuntutoolkitmodule.cpp'
--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-08-26 12:03:35 +0000
+++ src/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-09-17 11:46:32 +0000
@@ -17,91 +17,89 @@
  */
 
 #include "ubuntutoolkitmodule.h"
+
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <stdexcept>
+
+#include <QtQml/QQmlContext>
 #include <QtQml/QQmlEngine>
-#include <QtQml/QQmlContext>
 #include <QtQml/QQmlExtensionPlugin>
 #include <QtQuick/private/qquickimagebase_p.h>
-#include <QDBusConnection>
+#include <QtDBus/QDBusConnection>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QScreen>
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdexcept>
-
-#include <ucunits_p.h>
-#include <quickutils_p.h>
-#include <i18n_p.h>
-#include <ucapplication_p.h>
-#include <ucfontutils_p.h>
-#include <uctheme_p.h>
-#include <ucdeprecatedtheme_p.h>
-#include <listener_p.h>
-#include <ucfontutils_p.h>
-#include <ucmathutils_p.h>
-#include <ucmargins_p.h>
-#include <ucmainviewbase_p.h>
-#include <ucabstractbutton_p.h>
-#include <ucaction_p.h>
-#include <ucactioncontext_p.h>
-#include <ucactionitem_p.h>
-#include <ucactionmanager_p.h>
-#include <ucalarm_p.h>
-#include <ucalarmmodel_p.h>
-#include <ucarguments_p.h>
-#include <ucargument_p.h>
-#include <ucbottomedgehint_p.h>
-#include <ucbottomedgeregion_p.h>
-#include <ucbottomedge_p.h>
-#include <uchaptics_p.h>
-#include <ucheader_p.h>
-#include <ucinversemouse_p.h>
-#include <ucmouse_p.h>
-#include <uclistitem_p.h>
-#include <uclistitemactions_p.h>
-#include <uclistitemlayout_p.h>
-#include <uclabel_p.h>
-#include <ucpagetreenode_p.h>
-#include <ucperformancemonitor_p.h>
-#include <ucproportionalshape_p.h>
-#include <ucscalingimageprovider_p.h>
-#include <ucserviceproperties_p.h>
-#include <ucslotslayout_p.h>
-#include <ucstatesaver_p.h>
-#include <ucstyleditembase_p.h>
-#include <ucstylehints_p.h>
-#include <uctheme_p.h>
-#include <ucubuntuanimation_p.h>
-#include <ucubuntushapeoverlay_p.h>
-#include <ucubuntushape_p.h>
-#include <ucurihandler_p.h>
-#include <ucqquickimageextension_p.h>
-#include <inversemouseareatype_p.h>
-#include <qquickclipboard_p.h>
-#include <qquickmimedata_p.h>
-#include <colorutils_p.h>
-#include <tree_p.h>
-#include <unitythemeiconprovider_p.h>
-#include <sortbehavior_p.h>
-#include <sortfiltermodel_p.h>
-#include <livetimer_p.h>
-#include <privates/frame_p.h>
-#include <privates/ucpagewrapper_p.h>
-#include <privates/appheaderbase_p.h>
-#include <privates/ucscrollbarutils_p.h>
-#include <actionlist_p.h>
-#include <exclusivegroup_p.h>
-#include <menu_p.h>
-#include <menubar_p.h>
-#include <menugroup_p.h>
-
-#include <splitview_p.h>
-
-// styles
-#include <ucbottomedgestyle_p.h>
-
 #include <UbuntuMetrics/applicationmonitor.h>
 
+#include "actionlist_p.h"
+#include "colorutils_p.h"
+#include "exclusivegroup_p.h"
+#include "i18n_p.h"
+#include "inversemouseareatype_p.h"
+#include "listener_p.h"
+#include "livetimer_p.h"
+#include "menu_p.h"
+#include "menubar_p.h"
+#include "menugroup_p.h"
+#include "privates/appheaderbase_p.h"
+#include "privates/frame_p.h"
+#include "privates/ucpagewrapper_p.h"
+#include "privates/ucscrollbarutils_p.h"
+#include "qquickclipboard_p.h"
+#include "qquickmimedata_p.h"
+#include "quickutils_p.h"
+#include "sortbehavior_p.h"
+#include "sortfiltermodel_p.h"
+#include "splitview_p.h"
+#include "tree_p.h"
+#include "ucabstractbutton_p.h"
+#include "ucaction_p.h"
+#include "ucactioncontext_p.h"
+#include "ucactionitem_p.h"
+#include "ucactionmanager_p.h"
+#include "ucalarm_p.h"
+#include "ucalarmmodel_p.h"
+#include "ucapplication_p.h"
+#include "ucargument_p.h"
+#include "ucarguments_p.h"
+#include "ucbottomedge_p.h"
+#include "ucbottomedgehint_p.h"
+#include "ucbottomedgeregion_p.h"
+#include "ucbottomedgestyle_p.h"
+#include "ucdeprecatedtheme_p.h"
+#include "ucfontutils_p.h"
+#include "ucfontutils_p.h"
+#include "uchaptics_p.h"
+#include "ucheader_p.h"
+#include "ucinversemouse_p.h"
+#include "uclabel_p.h"
+#include "uclistitem_p.h"
+#include "uclistitemactions_p.h"
+#include "uclistitemlayout_p.h"
+#include "ucmainviewbase_p.h"
+#include "ucmargins_p.h"
+#include "ucmathutils_p.h"
+#include "ucmouse_p.h"
+#include "ucpagetreenode_p.h"
+#include "ucperformancemonitor_p.h"
+#include "ucproportionalshape_p.h"
+#include "ucqquickimageextension_p.h"
+#include "ucscalingimageprovider_p.h"
+#include "ucserviceproperties_p.h"
+#include "ucslotslayout_p.h"
+#include "ucstatesaver_p.h"
+#include "ucstyleditembase_p.h"
+#include "ucstylehints_p.h"
+#include "uctheme_p.h"
+#include "uctheme_p.h"
+#include "ucubuntuanimation_p.h"
+#include "ucubuntushape_p.h"
+#include "ucubuntushapeoverlay_p.h"
+#include "ucunits_p.h"
+#include "ucurihandler_p.h"
+#include "unitythemeiconprovider_p.h"
+
 UT_NAMESPACE_BEGIN
 
 const char *EngineProperty("__ubuntu_toolkit_plugin_data");
 
=== modified file 'src/UbuntuToolkit/ubuntutoolkitmodule.h'
--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h	2016-07-06 09:51:06 +0000
+++ src/UbuntuToolkit/ubuntutoolkitmodule.h	2016-09-17 11:46:32 +0000
@@ -20,10 +20,11 @@
 #define UBUNTUTOOLKITMODULE_H
 
 #include <QtCore/QObject>
+#include <QtQml/QtQml>
+#include <QtQml/QJSEngine>
 #include <QtQml/QQmlEngine>
-#include <QtQml/QJSEngine>
-#include <qqml.h>
-#include <ubuntutoolkitglobal.h>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQmlEngine;
 class QWindow;
 
=== modified file 'src/UbuntuToolkit/ucabstractbutton.cpp'
--- src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp	2016-08-17 10:06:06 +0000
+++ src/UbuntuToolkit/ucabstractbutton.cpp	2016-09-17 11:46:32 +0000
@@ -15,12 +15,14 @@
  */
 
 #include "ucabstractbutton_p_p.h"
+
+#include <QtQml/private/qqmlglobal_p.h>
+#include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquickmousearea_p.h>
+
+#include "ucaction_p.h"
 #include "uchaptics_p.h"
 #include "ucunits_p.h"
-#include "ucaction_p.h"
-#include <QtQuick/private/qquickitem_p.h>
-#include <QtQuick/private/qquickmousearea_p.h>
-#include <QtQml/private/qqmlglobal_p.h>
 
 #define MIN_SENSING_WIDTH_GU    4
 #define MIN_SENSING_HEIGHT_GU   4
 
=== modified file 'src/UbuntuToolkit/ucabstractbutton_p.h'
--- src/Ubuntu/UbuntuToolkit/ucabstractbutton_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucabstractbutton_p.h	2016-09-17 11:46:32 +0000
@@ -14,13 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UCABSTRACTBUTTON_H
-#define UCABSTRACTBUTTON_H
+#ifndef UCABSTRACTBUTTON_P_H
+#define UCABSTRACTBUTTON_P_H
 
-#include "ucactionitem_p.h"
-#include "ucmargins_p.h"
 #include <QtQuick/private/qquickevents_p_p.h>
 
+#include <UbuntuToolkit/private/ucactionitem_p.h>
+#include <UbuntuToolkit/private/ucmargins_p.h>
+
 class QQuickMouseArea;
 class QQuickMouseEvent;
 
@@ -84,4 +85,4 @@
 
 QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCMargins))
 
-#endif // UCABSTRACTBUTTON_H
+#endif // UCABSTRACTBUTTON_P_H
 
=== modified file 'src/UbuntuToolkit/ucabstractbutton_p_p.h'
--- src/Ubuntu/UbuntuToolkit/ucabstractbutton_p_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucabstractbutton_p_p.h	2016-09-17 11:46:32 +0000
@@ -14,11 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UCABSTRACTBUTTON_P
-#define UCABSTRACTBUTTON_P
-
-#include "ucabstractbutton_p.h"
-#include "ucactionitem_p_p.h"
+#ifndef UCABSTRACTBUTTON_P_P_H
+#define UCABSTRACTBUTTON_P_P_H
+
+#include <UbuntuToolkit/private/ucabstractbutton_p.h>
+
+#include <UbuntuToolkit/private/ucactionitem_p_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -54,4 +55,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCABSTRACTBUTTON_P
+#endif // UCABSTRACTBUTTON_P_P_H
 
=== modified file 'src/UbuntuToolkit/ucaction.cpp'
--- src/Ubuntu/UbuntuToolkit/ucaction.cpp	2016-08-25 14:00:43 +0000
+++ src/UbuntuToolkit/ucaction.cpp	2016-09-17 11:46:32 +0000
@@ -15,15 +15,16 @@
  */
 
 #include "ucaction_p.h"
+
+#include <QtCore/QtDebug>
+#include <QtGui/private/qguiapplication_p.h>
+#include <QtQml/QQmlInfo>
+#include <QtQuick/QQuickItem>
+#include <QtQuick/QQuickWindow>
+
+#include "exclusivegroup_p.h"
 #include "quickutils_p.h"
 #include "ucactioncontext_p.h"
-#include "exclusivegroup_p.h"
-
-#include <QtDebug>
-#include <QtQml/QQmlInfo>
-#include <QtQuick/qquickitem.h>
-#include <QtQuick/qquickwindow.h>
-#include <private/qguiapplication_p.h>
 
 Q_LOGGING_CATEGORY(ucAction, "ubuntu.components.Action", QtMsgType::QtWarningMsg)
 
@@ -364,6 +365,14 @@
     if (m_iconSource == url) {
         return;
     }
+    if (url.isEmpty() && m_factoryIconSource) {
+        // Prevent overriding iconSource when it is a binding to a property with
+        //  an empty value at initialization, and the value of iconName is initialized
+        //  before iconSource is initialized which would cause first iconSource to be set,
+        //  and after that iconSource to be reset to the empty value of the binding.
+        //  Fixes bug #1616858.
+        return;
+    }
     m_iconSource = url;
     m_factoryIconSource = false;
     Q_EMIT iconSourceChanged();
 
=== modified file 'src/UbuntuToolkit/ucaction_p.h'
--- src/Ubuntu/UbuntuToolkit/ucaction_p.h	2016-08-25 14:00:43 +0000
+++ src/UbuntuToolkit/ucaction_p.h	2016-09-17 11:46:32 +0000
@@ -14,17 +14,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UCACTION_H
-#define UCACTION_H
+#ifndef UCACTION_P_H
+#define UCACTION_P_H
 
 #include <QtCore/QObject>
+#include <QtCore/QUrl>
 #include <QtCore/QVariant>
-#include <QtCore/QUrl>
 #include <QtGui/QKeySequence>
-#include <QtQml>
+#include <QtQml/QtQml>
 #include <QtQml/QQmlListProperty>
 #include <QtQml/private/qpodvector_p.h>
-#include "ubuntutoolkitglobal.h"
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQmlComponent;
 class QQuickItem;
@@ -191,4 +192,4 @@
 
 QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCAction))
 
-#endif // UCACTION_H
+#endif // UCACTION_P_H
 
=== modified file 'src/UbuntuToolkit/ucactioncontext.cpp'
--- src/Ubuntu/UbuntuToolkit/ucactioncontext.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucactioncontext.cpp	2016-09-17 11:46:32 +0000
@@ -15,9 +15,11 @@
  */
 
 #include "ucactioncontext_p.h"
+
+#include <QtQuick/QQuickItem>
+
+#include "adapters/actionsproxy_p.h"
 #include "ucaction_p.h"
-#include "adapters/actionsproxy_p.h"
-#include <QtQuick/QQuickItem>
 
 Q_LOGGING_CATEGORY(ucActionContext, "ubuntu.components.ActionContext", QtMsgType::QtWarningMsg)
 
 
=== modified file 'src/UbuntuToolkit/ucactioncontext_p.h'
--- src/Ubuntu/UbuntuToolkit/ucactioncontext_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucactioncontext_p.h	2016-09-17 11:46:32 +0000
@@ -14,15 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UCACTIONCONTEXT_H
-#define UCACTIONCONTEXT_H
+#ifndef UCACTIONCONTEXT_P_H
+#define UCACTIONCONTEXT_P_H
 
 #include <QtCore/QObject>
+#include <QtCore/QSet>
+#include <QtQml/QtQml>
 #include <QtQml/QQmlListProperty>
 #include <QtQml/QQmlParserStatus>
-#include <QtCore/QSet>
-#include <QtQml>
-#include "ubuntutoolkitglobal.h"
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQuickItem;
 
@@ -111,4 +112,4 @@
 QML_DECLARE_TYPE(UT_PREPEND_NAMESPACE(UCActionContext))
 QML_DECLARE_TYPEINFO(UT_PREPEND_NAMESPACE(UCActionContext), QML_HAS_ATTACHED_PROPERTIES)
 
-#endif // UCACTIONCONTEXT_H
+#endif // UCACTIONCONTEXT_P_H
 
=== modified file 'src/UbuntuToolkit/ucactionitem.cpp'
--- src/Ubuntu/UbuntuToolkit/ucactionitem.cpp	2016-07-07 08:42:42 +0000
+++ src/UbuntuToolkit/ucactionitem.cpp	2016-09-17 11:46:32 +0000
@@ -15,12 +15,14 @@
  */
 
 #include "ucactionitem_p_p.h"
-#include "ucaction_p.h"
-#include "ucstyleditembase_p_p.h"
+
 #define foreach Q_FOREACH
 #include <QtQml/private/qqmlbinding_p.h>
 #undef foreach
 
+#include "ucaction_p.h"
+#include "ucstyleditembase_p_p.h"
+
 UT_NAMESPACE_BEGIN
 
 UCActionItemPrivate::UCActionItemPrivate()
 
=== modified file 'src/UbuntuToolkit/ucactionitem_p.h'
--- src/Ubuntu/UbuntuToolkit/ucactionitem_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucactionitem_p.h	2016-09-17 11:46:32 +0000
@@ -13,10 +13,11 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef UCACTIONITEM_H
-#define UCACTIONITEM_H
-
-#include "ucstyleditembase_p.h"
+
+#ifndef UCACTIONITEM_P_H
+#define UCACTIONITEM_P_H
+
+#include <UbuntuToolkit/private/ucstyleditembase_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -79,4 +80,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCACTIONITEM_H
+#endif // UCACTIONITEM_P_H
 
=== modified file 'src/UbuntuToolkit/ucactionitem_p_p.h'
--- src/Ubuntu/UbuntuToolkit/ucactionitem_p_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucactionitem_p_p.h	2016-09-17 11:46:32 +0000
@@ -16,11 +16,12 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCACTIONITEM_P
-#define UCACTIONITEM_P
-
-#include "ucactionitem_p.h"
-#include "ucstyleditembase_p_p.h"
+#ifndef UCACTIONITEM_P_P_H
+#define UCACTIONITEM_P_P_H
+
+#include <UbuntuToolkit/private/ucactionitem_p.h>
+
+#include <UbuntuToolkit/private/ucstyleditembase_p_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -61,5 +62,5 @@
 
 UT_NAMESPACE_END
 
-#endif // UCACTIONITEM_P
+#endif // UCACTIONITEM_P_P_H
 
 
=== modified file 'src/UbuntuToolkit/ucactionmanager.cpp'
--- src/Ubuntu/UbuntuToolkit/ucactionmanager.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucactionmanager.cpp	2016-09-17 11:46:32 +0000
@@ -15,9 +15,10 @@
  */
 
 #include "ucactionmanager_p.h"
+
 #include "adapters/actionsproxy_p.h"
+#include "ucaction_p.h"
 #include "ucactioncontext_p.h"
-#include "ucaction_p.h"
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/ucactionmanager_p.h'
--- src/Ubuntu/UbuntuToolkit/ucactionmanager_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucactionmanager_p.h	2016-09-17 11:46:32 +0000
@@ -14,13 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UCACTIONMANAGER_H
-#define UCACTIONMANAGER_H
+#ifndef UCACTIONMANAGER_P_H
+#define UCACTIONMANAGER_P_H
 
 #include <QtCore/QObject>
 #include <QtQml/QQmlListProperty>
 #include <QtQml/QQmlParserStatus>
-#include "ubuntutoolkitglobal.h"
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -65,4 +66,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCACTIONMANAGER_H
+#endif // UCACTIONMANAGER_P_H
 
=== modified file 'src/UbuntuToolkit/ucalarm.cpp'
--- src/Ubuntu/UbuntuToolkit/ucalarm.cpp	2016-07-07 07:56:34 +0000
+++ src/UbuntuToolkit/ucalarm.cpp	2016-09-17 11:46:32 +0000
@@ -17,9 +17,11 @@
  */
 
 #include "ucalarm_p_p.h"
+
+#include <QtQml/QQmlInfo>
+
 #include "alarmmanager_p_p.h"
 #include "i18n_p.h"
-#include <QtQml/QQmlInfo>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/ucalarm_p.h'
--- src/Ubuntu/UbuntuToolkit/ucalarm_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucalarm_p.h	2016-09-17 11:46:32 +0000
@@ -16,13 +16,14 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCALARM_H
-#define UCALARM_H
+#ifndef UCALARM_P_H
+#define UCALARM_P_H
 
+#include <QtCore/QDateTime>
 #include <QtCore/QObject>
-#include <QtCore/QDateTime>
 #include <QtCore/QUrl>
-#include "ubuntutoolkitglobal.h"
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -143,4 +144,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UUALARM_H
+#endif // UUALARM_P_H
 
=== modified file 'src/UbuntuToolkit/ucalarm_p_p.h'
--- src/Ubuntu/UbuntuToolkit/ucalarm_p_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucalarm_p_p.h	2016-09-17 11:46:32 +0000
@@ -16,15 +16,17 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCALARM_P_H
-#define UCALARM_P_H
-
-#include "ucalarm_p.h"
-#include "alarmmanager_p_p.h"
+#ifndef UCALARM_P_P_H
+#define UCALARM_P_P_H
+
+#include <UbuntuToolkit/private/ucalarm_p.h>
+
 #include <QtCore/QDateTime>
 #include <QtCore/QPointer>
 #include <QtQml/QQmlListProperty>
 
+#include <UbuntuToolkit/private/alarmmanager_p_p.h>
+
 UT_NAMESPACE_BEGIN
 
 class UBUNTUTOOLKIT_EXPORT UCAlarmPrivate
 
=== modified file 'src/UbuntuToolkit/ucalarmmodel.cpp'
--- src/Ubuntu/UbuntuToolkit/ucalarmmodel.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucalarmmodel.cpp	2016-09-17 11:46:32 +0000
@@ -17,11 +17,13 @@
  */
 
 #include "ucalarmmodel_p.h"
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlInfo>
+#include <QtQml/QQmlPropertyMap>
+
+#include "alarmmanager_p_p.h"
 #include "ucalarm_p_p.h"
-#include "alarmmanager_p_p.h"
-#include <QtQml/QQmlPropertyMap>
-#include <QtQml/QQmlInfo>
-#include <QtQml/QQmlEngine>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/ucalarmmodel_p.h'
--- src/Ubuntu/UbuntuToolkit/ucalarmmodel_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucalarmmodel_p.h	2016-09-17 11:46:32 +0000
@@ -16,12 +16,13 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCALARMSMODEL_H
-#define UCALARMSMODEL_H
+#ifndef UCALARMSMODEL_P_H
+#define UCALARMSMODEL_P_H
 
 #include <QtCore/QAbstractListModel>
 #include <QtQml/QQmlParserStatus>
-#include "ucalarm_p_p.h"
+
+#include <UbuntuToolkit/private/ucalarm_p_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -72,4 +73,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCALARMSMODEL_H
+#endif // UCALARMSMODEL_P_H
 
=== modified file 'src/UbuntuToolkit/ucapplication.cpp'
--- src/Ubuntu/UbuntuToolkit/ucapplication.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucapplication.cpp	2016-09-17 11:46:32 +0000
@@ -19,11 +19,11 @@
 #include "ucapplication_p.h"
 
 #include <QtCore/QCoreApplication>
-#include <QDebug>
+#include <QtCore/QDebug>
+#include <QtCore/QStandardPaths>
+#include <QtGui/QGuiApplication>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlEngine>
-#include <QtCore/QStandardPaths>
-#include <QtGui/QGuiApplication>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/ucapplication_p.h'
--- src/Ubuntu/UbuntuToolkit/ucapplication_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucapplication_p.h	2016-09-17 11:46:32 +0000
@@ -16,11 +16,12 @@
  * Author: Christian Dywan <[e-mail]>
  */
 
-#ifndef UBUNTU_COMPONENTS_APPLICATION_H
-#define UBUNTU_COMPONENTS_APPLICATION_H
+#ifndef UCAPPLICATION_P_H
+#define UCAPPLICATION_P_H
 
 #include <QtCore/QObject>
-#include "ubuntutoolkitglobal.h"
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQmlContext;
 class QQmlEngine;
@@ -70,4 +71,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UBUNTU_COMPONENTS_I18N_H
+#endif // UCAPPLICATION_P_H
 
=== modified file 'src/UbuntuToolkit/ucargument_p.h'
--- src/Ubuntu/UbuntuToolkit/ucargument_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucargument_p.h	2016-09-17 11:46:32 +0000
@@ -16,13 +16,14 @@
  * Author: Florian Boucault <[e-mail]>
  */
 
-#ifndef UCARGUMENT_H
-#define UCARGUMENT_H
+#ifndef UCARGUMENT_P_H
+#define UCARGUMENT_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
-#include "ubuntutoolkitglobal.h"
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -75,4 +76,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCARGUMENT_H
+#endif // UCARGUMENT_P_H
 
=== modified file 'src/UbuntuToolkit/ucarguments.cpp'
--- src/Ubuntu/UbuntuToolkit/ucarguments.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucarguments.cpp	2016-09-17 11:46:32 +0000
@@ -17,13 +17,15 @@
  */
 
 #include "ucarguments_p.h"
-#include "i18n_p.h"
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
+#include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
-#include <QtCore/QFileInfo>
+#include <QtQml/QtQml>
 #include <QtQml/QQmlProperty>
-#include <QtQml/qqml.h>
+
+#include "i18n_p.h"
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/ucarguments_p.h'
--- src/Ubuntu/UbuntuToolkit/ucarguments_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucarguments_p.h	2016-09-17 11:46:32 +0000
@@ -16,17 +16,18 @@
  * Author: Florian Boucault <[e-mail]>
  */
 
-#ifndef UCARGUMENTS_H
-#define UCARGUMENTS_H
+#ifndef UCARGUMENTS_P_H
+#define UCARGUMENTS_P_H
 
-#include "ucargument_p.h"
+#include <QtCore/QHash>
+#include <QtCore/QList>
 #include <QtCore/QObject>
-#include <QtCore/QList>
 #include <QtCore/QStringList>
-#include <QtCore/QHash>
-#include <QtQml/QQmlPropertyMap>
 #include <QtQml/QQmlListProperty>
 #include <QtQml/QQmlParserStatus>
+#include <QtQml/QQmlPropertyMap>
+
+#include <UbuntuToolkit/private/ucargument_p.h>
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/ucbottomedge.cpp'
--- src/Ubuntu/UbuntuToolkit/ucbottomedge.cpp	2016-08-14 09:06:34 +0000
+++ src/UbuntuToolkit/ucbottomedge.cpp	2016-09-17 11:46:32 +0000
@@ -17,24 +17,25 @@
  */
 
 #include "ucbottomedge_p_p.h"
+
+#include <QtCore/QtMath>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
+#include <QtGui/QStyleHints>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlProperty>
+#include <QtQuick/private/qquickanimation_p.h>
+#include <QtQuick/private/qquickflickable_p.h>
+#include <QtQuick/private/qquickitem_p.h>
+#include <UbuntuGestures/private/ucswipearea_p_p.h>
+
 #include "ucbottomedgestyle_p.h"
 #include "ucbottomedgeregion_p_p.h"
 #include "ucbottomedgehint_p_p.h"
 #include "ucstyleditembase_p_p.h"
-#include <QtCore/QtMath>
-#include <QtQml/QQmlEngine>
-#include <QtGui/QScreen>
-#include <QtQml/QQmlProperty>
-#include <QtGui/QGuiApplication>
-#include <QtGui/QStyleHints>
-#include <QtQuick/private/qquickitem_p.h>
-#include <QtQuick/private/qquickflickable_p.h>
-
 #include "ucheader_p.h"
 #include "ucaction_p.h"
 #include "quickutils_p.h"
-#include "private/ucswipearea_p_p.h"
-#include <QtQuick/private/qquickanimation_p.h>
 
 Q_LOGGING_CATEGORY(ucBottomEdge, "ubuntu.components.BottomEdge", QtMsgType::QtWarningMsg)
 
 
=== modified file 'src/UbuntuToolkit/ucbottomedge_p.h'
--- src/Ubuntu/UbuntuToolkit/ucbottomedge_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucbottomedge_p.h	2016-09-17 11:46:32 +0000
@@ -16,13 +16,14 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCBOTTOMEDGE_H
-#define UCBOTTOMEDGE_H
+#ifndef UCBOTTOMEDGE_P_H
+#define UCBOTTOMEDGE_P_H
 
-#include "ucstyleditembase_p.h"
+#include <QtCore/QLoggingCategory>
 #include <QtCore/QPointer>
 #include <QtQuick/private/qquickitemchangelistener_p.h>
-#include <QtCore/QLoggingCategory>
+
+#include <UbuntuToolkit/private/ucstyleditembase_p.h>
 
 class QQuickAbstractAnimation;
 
@@ -129,4 +130,4 @@
 
 #define LOG     qCDebug(ucBottomEdge) << "[BottomEdge]"
 
-#endif // UCBOTTOMEDGE_H
+#endif // UCBOTTOMEDGE_P_H
 
=== modified file 'src/UbuntuToolkit/ucbottomedge_p_p.h'
--- src/Ubuntu/UbuntuToolkit/ucbottomedge_p_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucbottomedge_p_p.h	2016-09-17 11:46:32 +0000
@@ -16,12 +16,13 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCBOTTOMEDGE_P_H
-#define UCBOTTOMEDGE_P_H
-
-#include "ucbottomedge_p.h"
-#include "ucstyleditembase_p_p.h"
-#include "ucaction_p.h"
+#ifndef UCBOTTOMEDGE_P_P_H
+#define UCBOTTOMEDGE_P_P_H
+
+#include <UbuntuToolkit/private/ucbottomedge_p.h>
+
+#include <UbuntuToolkit/private/ucstyleditembase_p_p.h>
+#include <UbuntuToolkit/private/ucaction_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -116,4 +117,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCBOTTOMEDGE_P_H
+#endif // UCBOTTOMEDGE_P_P_H
 
=== modified file 'src/UbuntuToolkit/ucbottomedgehint.cpp'
--- src/Ubuntu/UbuntuToolkit/ucbottomedgehint.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucbottomedgehint.cpp	2016-09-17 11:46:32 +0000
@@ -17,14 +17,16 @@
  */
 
 #include "ucbottomedgehint_p_p.h"
+
+#include <QtQml/private/qqmlproperty_p.h>
+#include <QtQuick/private/qquickflickable_p.h>
+#include <UbuntuGestures/private/ucswipearea_p_p.h>
+
+#include "propertychange_p.h"
+#include "quickutils_p.h"
+#include "ucaction_p.h"
 #include "ucstyleditembase_p_p.h"
-#include "quickutils_p.h"
 #include "ucunits_p.h"
-#include "ucaction_p.h"
-#include "private/ucswipearea_p_p.h"
-#include <propertychange_p.h>
-#include <QtQml/private/qqmlproperty_p.h>
-#include <QtQuick/private/qquickflickable_p.h>
 
 #define SWIPE_AREA_HEIGHT_GU    3
 
 
=== modified file 'src/UbuntuToolkit/ucbottomedgehint_p.h'
--- src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucbottomedgehint_p.h	2016-09-17 11:46:32 +0000
@@ -16,11 +16,12 @@
  * Authors: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCBOTTOMEDGEHINT_H
-#define UCBOTTOMEDGEHINT_H
-
-#include "ucactionitem_p.h"
-#include <ubuntugesturesglobal.h>
+#ifndef UCBOTTOMEDGEHINT_P_H
+#define UCBOTTOMEDGEHINT_P_H
+
+#include <UbuntuGestures/ubuntugesturesglobal.h>
+
+#include <UbuntuToolkit/private/ucactionitem_p.h>
 
 class QQuickFlickable;
 UG_FORWARD_DECLARE_CLASS(UCSwipeArea)
@@ -102,4 +103,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCBOTTOMEDGEHINT_H
+#endif // UCBOTTOMEDGEHINT_P_H
 
=== modified file 'src/UbuntuToolkit/ucbottomedgehint_p_p.h'
--- src/Ubuntu/UbuntuToolkit/ucbottomedgehint_p_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucbottomedgehint_p_p.h	2016-09-17 11:46:32 +0000
@@ -16,12 +16,12 @@
  * Authors: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCBOTTOMEDGEHINT_P
-#define UCBOTTOMEDGEHINT_P
-
-#include "ucbottomedgehint_p.h"
-#include "ucactionitem_p_p.h"
-#include <ubuntugesturesglobal.h>
+#ifndef UCBOTTOMEDGEHINT_P_P_H
+#define UCBOTTOMEDGEHINT_P_P_H
+
+#include <UbuntuToolkit/private/ucbottomedgehint_p.h>
+
+#include <UbuntuToolkit/private/ucactionitem_p_p.h>
 
 UG_FORWARD_DECLARE_CLASS(UCSwipeArea)
 
@@ -50,4 +50,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCBOTTOMEDGEHINT_P
+#endif // UCBOTTOMEDGEHINT_P_P_H
 
=== modified file 'src/UbuntuToolkit/ucbottomedgeregion.cpp'
--- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp	2016-07-19 18:12:33 +0000
+++ src/UbuntuToolkit/ucbottomedgeregion.cpp	2016-09-17 11:46:32 +0000
@@ -16,11 +16,12 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#include "ucbottomedge_p_p.h"
 #include "ucbottomedgeregion_p_p.h"
-#include <propertychange_p.h>
+
 #include <QtQml/private/qqmlproperty_p.h>
 
+#include "propertychange_p.h"
+#include "ucbottomedge_p_p.h"
 
 UT_NAMESPACE_BEGIN
 
 
=== modified file 'src/UbuntuToolkit/ucbottomedgeregion_p.h'
--- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucbottomedgeregion_p.h	2016-09-17 11:46:32 +0000
@@ -16,15 +16,16 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCBOTTOMEDGEREGION_H
-#define UCBOTTOMEDGEREGION_H
+#ifndef UCBOTTOMEDGEREGION_P_H
+#define UCBOTTOMEDGEREGION_P_H
 
 #include <QtCore/QObject>
-#include <QtQml/QQmlParserStatus>
+#include <QtCore/QPointer>
 #include <QtCore/QUrl>
-#include <QtCore/QPointer>
 #include <QtQml/QQmlIncubator>
-#include <ubuntutoolkitglobal.h>
+#include <QtQml/QQmlParserStatus>
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQmlComponent;
 
@@ -85,4 +86,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCBOTTOMEDGEREGION_H
+#endif // UCBOTTOMEDGEREGION_P_H
 
=== modified file 'src/UbuntuToolkit/ucbottomedgeregion_p_p.h'
--- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion_p_p.h	2016-07-07 15:33:34 +0000
+++ src/UbuntuToolkit/ucbottomedgeregion_p_p.h	2016-09-17 11:46:32 +0000
@@ -16,12 +16,14 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCBOTTOMEDGEREGION_P
-#define UCBOTTOMEDGEREGION_P
-
-#include "ucbottomedgeregion_p.h"
+#ifndef UCBOTTOMEDGEREGION_P_P_H
+#define UCBOTTOMEDGEREGION_P_P_H
+
+#include <UbuntuToolkit/private/ucbottomedgeregion_p.h>
+
+#include <QtCore/private/qobject_p.h>
+
 #include <UbuntuToolkit/private/asyncloader_p_p.h>
-#include <QtCore/private/qobject_p.h>
 
 UT_NAMESPACE_BEGIN
 
@@ -82,4 +84,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCBOTTOMEDGEREGION_P
+#endif // UCBOTTOMEDGEREGION_P_P_H
 
=== modified file 'src/UbuntuToolkit/ucbottomedgestyle.cpp'
--- src/Ubuntu/UbuntuToolkit/ucbottomedgestyle.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucbottomedgestyle.cpp	2016-09-17 11:46:32 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "ucbottomedgestyle_p.h"
+
 #include "ucbottomedge_p_p.h"
 
 UT_NAMESPACE_BEGIN
 
=== modified file 'src/UbuntuToolkit/ucbottomedgestyle_p.h'
--- src/Ubuntu/UbuntuToolkit/ucbottomedgestyle_p.h	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucbottomedgestyle_p.h	2016-09-17 11:46:32 +0000
@@ -16,11 +16,12 @@
  * Author: Zsombor Egri <[e-mail]>
  */
 
-#ifndef UCBOTTOMEDGESTYLE_H
-#define UCBOTTOMEDGESTYLE_H
+#ifndef UCBOTTOMEDGESTYLE_P_H
+#define UCBOTTOMEDGESTYLE_P_H
 
 #include <QtQuick/QQuickItem>
-#include "ubuntutoolkitglobal.h"
+
+#include <UbuntuToolkit/ubuntutoolkitglobal.h>
 
 class QQuickItem;
 class QQuickAbstractAnimation;
@@ -63,4 +64,4 @@
 
 UT_NAMESPACE_END
 
-#endif // UCBOTTOMEDGESTYLE_H
+#endif // UCBOTTOMEDGESTYLE_P_H
 
=== modified file 'src/UbuntuToolkit/ucdefaulttheme.cpp'
--- src/Ubuntu/UbuntuToolkit/ucdefaulttheme.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucdefaulttheme.cpp	2016-09-17 11:46:32 +0000
@@ -18,13 +18,14 @@
  */
 
 #include "ucdefaulttheme_p.h"
-#include "uctheme_p.h"
 
-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QStandardPaths>