Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2

.eslintrc.js

@@ -36,6 +36,7 @@ module.exports = {
         "GlobalServices": false,
         "GooglePoly": false,
         "Graphics": false,
+        "HifiAbout": false,
         "HMD": false,
         "LaserPointers": false,
         "location": true,

CMakeLists.txt

@@ -7,6 +7,11 @@ else()
   cmake_minimum_required(VERSION 3.2)
 endif()
 
+# squelch the Policy CMP0074 warning without requiring an update to cmake 3.12.
+if ((${CMAKE_MAJOR_VERSION} EQUAL 3 AND ${CMAKE_MINOR_VERSION} GREATER 11) OR ${CMAKE_MAJOR_VERSION} GREATER 3)
+   cmake_policy(SET CMP0074 NEW)
+endif()
+
 project(hifi)
 
 include("cmake/init.cmake")

interface/resources/QtWebEngine/UIDelegates/Menu.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.5
 
-import "../../qml/controls-uit"
+import controlsUit 1.0
-import "../../qml/styles-uit"
+import stylesUit 1.0
 
 Item {
     id: menu

interface/resources/QtWebEngine/UIDelegates/MenuItem.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.5
 
-import "../../qml/controls-uit"
+import controlsUit 1.0
-import "../../qml/styles-uit"
+import stylesUit 1.0
 
 Item {
     id: root

interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.5
 
-import "../../qml/controls-uit"
+import controlsUit 1.0
-import "../../qml/styles-uit"
+import stylesUit 1.0
 import "../../qml/dialogs"
 
 QtObject {

interface/resources/qml/AudioScopeUI.qml

@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import "styles-uit"
+import stylesUit 1.0
-import "controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
 
 Item {
     id: root

interface/resources/qml/Browser.qml

@@ -2,9 +2,9 @@ import QtQuick 2.5
 import QtWebChannel 1.0
 import QtWebEngine 1.5
 
-import "controls-uit"
+import controlsUit 1.0
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"
 
 ScrollingWindow {

interface/resources/qml/CurrentAPI.qml

@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import "styles-uit"
+import stylesUit 1.0
-import "controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 
 Item {
     id: root

interface/resources/qml/InfoView.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import Hifi 1.0 as Hifi
 
-import "controls-uit"
+import controlsUit 1.0
 import "windows" as Windows
 
 Windows.ScrollingWindow {

interface/resources/qml/InteractiveWindow.qml

@@ -12,9 +12,9 @@ import QtQuick 2.3
 
 import "windows" as Windows
 import "controls"
-import "controls-uit" as Controls
+import controlsUit 1.0 as Controls
 import "styles"
-import "styles-uit"
+import stylesUit 1.0
 
 Windows.Window {
     id: root;

interface/resources/qml/LoginDialog.qml

@@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.4
 
-import "controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
-import "styles-uit" as HifiStylesUit
+import stylesUit 1.0 as HifiStylesUit
 import "windows" as Windows
 
 import "LoginDialog"

interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml

@@ -13,8 +13,8 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "../../controls-uit"
+import controlsUit 1.0
-import "../../styles-uit"
+import stylesUit 1.0
 
 Item {
     id: linkAccountBody

interface/resources/qml/LoginDialog/+android/SignUpBody.qml

@@ -13,8 +13,8 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "../../controls-uit"
+import controlsUit 1.0
-import "../../styles-uit"
+import stylesUit 1.0
 
 Item {
     id: signupBody

interface/resources/qml/LoginDialog/CompleteProfileBody.qml

@@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     id: completeProfileBody

interface/resources/qml/LoginDialog/LinkAccountBody.qml

@@ -13,8 +13,9 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "qrc:///qml//controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
-import "qrc:///qml//styles-uit" as HifiStylesUit
+import stylesUit 1.0 as HifiStylesUit
+
 Item {
     id: linkAccountBody
     clip: true

interface/resources/qml/LoginDialog/SignInBody.qml

@@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.7
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "qrc:///qml//controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
-import "qrc:///qml//styles-uit" as HifiStylesUit
+import stylesUit 1.0 as HifiStylesUit
 
 Item {
     id: signInBody

interface/resources/qml/LoginDialog/SignUpBody.qml

@@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.7
 import QtQuick.Controls 1.4
 
-import "qrc:///qml//controls-uit"
+import controlsUit 1.0
-import "qrc:///qml//styles-uit"
+import stylesUit 1.0
 
 Item {
     id: signupBody

interface/resources/qml/LoginDialog/UsernameCollisionBody.qml

@@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.4
 import QtQuick.Controls 1.4
 
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     id: usernameCollisionBody

interface/resources/qml/LoginDialog/WelcomeBody.qml

@@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.4
 
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     id: welcomeBody

interface/resources/qml/QmlWebWindow.qml

@@ -13,8 +13,8 @@ import QtWebEngine 1.1
 import QtWebChannel 1.0
 
 import "windows" as Windows
-import "controls-uit" as Controls
+import controlsUit 1.0 as Controls
-import "styles-uit"
+import stylesUit 1.0
 
 Windows.ScrollingWindow {
     id: root

interface/resources/qml/QmlWindow.qml

@@ -2,9 +2,9 @@ import QtQuick 2.3
 
 import "windows" as Windows
 import "controls"
-import "controls-uit" as Controls
+import controlsUit 1.0 as Controls
 import "styles"
-import "styles-uit"
+import stylesUit 1.0
 
 Windows.Window {
     id: root

interface/resources/qml/TabletBrowser.qml

@@ -3,9 +3,9 @@ import QtWebChannel 1.0
 import QtWebEngine 1.5
 
 import "controls"
-import "controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"
 
 Item {

interface/resources/qml/UpdateDialog.qml

@@ -4,9 +4,9 @@ import QtQuick.Controls 1.3
 import QtQuick.Controls.Styles 1.3
 import QtGraphicalEffects 1.0
 
-import "controls-uit"
+import controlsUit 1.0
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"
 
 ScrollingWindow {

interface/resources/qml/controls/Button.qml

@@ -3,7 +3,6 @@ import QtQuick.Controls 2.2 as Original
 
 import "."
 import "../styles"
-import "../controls-uit"
 
 Original.Button {
     id: control

interface/resources/qml/controls/FlickableWebViewCore.qml

@@ -4,7 +4,7 @@ import QtWebChannel 1.0
 
 import QtQuick.Controls 2.2
 
-import "../styles-uit" as StylesUIt
+import stylesUit 1.0 as StylesUIt
 
 Item {
     id: flick

interface/resources/qml/controls/TabletWebButton.qml

@@ -10,7 +10,7 @@
 
 import Hifi 1.0
 import QtQuick 2.4
-import "../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     property alias text: label.text

interface/resources/qml/controls/TabletWebScreen.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
 
 Item {
     id: root

interface/resources/qml/controls/TabletWebView.qml

@@ -1,8 +1,8 @@
 import QtQuick 2.7
 import QtWebEngine 1.5
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
 import "../styles" as HifiStyles
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     id: root

interface/resources/qml/controls/WebView.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
 
 Item {
     width: parent !== null ? parent.width : undefined

interface/resources/qml/controlsUit/+android/ImageButton.qml

@@ -1,6 +1,6 @@
 //
 //  ImageButton.qml
-//  interface/resources/qml/controls-uit
+//  interface/resources/qml/controlsUit
 //
 //  Created by Gabriel Calero & Cristian Duarte on 12 Oct 2017
 //  Copyright 2017 High Fidelity, Inc.
@@ -11,7 +11,7 @@
 
 import QtQuick 2.5
 import QtQuick.Layouts 1.3
-import "../styles-uit" as HifiStyles
+import "../stylesUit" as HifiStyles
 
 Item {
     id: button

interface/resources/qml/controlsUit/AttachmentsTable.qml

@@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.XmlListModel 2.0
 
-import "../styles-uit"
+import "../stylesUit"
-import "../controls-uit" as HifiControls
+import "." as HifiControls
 import "../windows"
 import "../hifi/models"
 

interface/resources/qml/controlsUit/Button.qml

@@ -12,7 +12,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.3 as Original
 import TabletScriptingInterface 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Original.Button {
     id: control;

interface/resources/qml/controlsUit/CheckBox.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
+import "../stylesUit"
 
 import TabletScriptingInterface 1.0
 

interface/resources/qml/controlsUit/CheckBoxQQC2.qml

@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
+import "../stylesUit"
-import "../controls-uit" as HiFiControls
+import "." as HiFiControls
 import TabletScriptingInterface 1.0
 
 CheckBox {

interface/resources/qml/controlsUit/ComboBox.qml

@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
+import "../stylesUit"
-import "../controls-uit" as HifiControls
+import "." as HifiControls
 
 FocusScope {
     id: root

interface/resources/qml/controlsUit/ContentSection.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Column {
     property string name: "Content Section"

interface/resources/qml/controlsUit/FilterBar.qml

@@ -12,8 +12,8 @@ import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
+import "../stylesUit"
-import "../controls-uit" as HifiControls
+import "." as HifiControls
 
 Item {
     id: root;

interface/resources/qml/controlsUit/GlyphButton.qml

@@ -12,7 +12,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2 as Original
 import TabletScriptingInterface 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Original.Button {
     id: control

interface/resources/qml/controlsUit/HorizontalSpacer.qml

@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: root

interface/resources/qml/controlsUit/ImageMessageBox.qml

@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: imageBox

interface/resources/qml/controlsUit/Label.qml

@@ -10,7 +10,7 @@
 
 import QtQuick 2.7
 
-import "../styles-uit"
+import "../stylesUit"
 
 RalewaySemiBold {
     HifiConstants { id: hifi }

interface/resources/qml/controlsUit/QueuedButton.qml

@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 import "." as HifiControls
 
 HifiControls.Button {

interface/resources/qml/controlsUit/RadioButton.qml

@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
+import "../stylesUit"
-import "../controls-uit" as HifiControls
+import "." as HifiControls
 
 import TabletScriptingInterface 1.0
 

interface/resources/qml/controlsUit/ScrollBar.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
+import "../stylesUit"
 
 ScrollBar {
     visible: size < 1.0

interface/resources/qml/controlsUit/Separator.qml

@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     property int colorScheme: 0;

interface/resources/qml/controlsUit/Slider.qml

@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
+import "../stylesUit"
-import "../controls-uit" as HifiControls
+import "." as HifiControls
 
 Slider {
     id: slider

interface/resources/qml/controlsUit/SpinBox.qml

@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
+import "../stylesUit"
-import "../controls-uit" as HifiControls
+import "." as HifiControls
 
 SpinBox {
     id: spinBox

interface/resources/qml/controlsUit/Switch.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: rootSwitch;

interface/resources/qml/controlsUit/Table.qml

@@ -13,7 +13,7 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls 2.3 as QQC2
 
-import "../styles-uit"
+import "../stylesUit"
 
 TableView {
     id: tableView

interface/resources/qml/controlsUit/TabletContentSection.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Column {
     property string name: "Content Section"

interface/resources/qml/controlsUit/TabletHeader.qml

@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 
 Rectangle {
 

interface/resources/qml/controlsUit/TextAction.qml

@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
-import "../controls-uit" as HifiControls
+import "." as HifiControls
 
 Item {
     property string icon: ""

interface/resources/qml/controlsUit/TextEdit.qml

@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"
 
 TextEdit {
 

interface/resources/qml/controlsUit/TextField.qml

@@ -12,8 +12,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 
-import "../styles-uit"
+import "../stylesUit"
-import "../controls-uit" as HifiControls
+import "." as HifiControls
 
 TextField {
     id: textField

interface/resources/qml/controlsUit/Tree.qml

@@ -15,7 +15,7 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls 2.2 as QQC2
 
 
-import "../styles-uit"
+import "../stylesUit"
 
 TreeView {
     id: treeView

interface/resources/qml/controlsUit/VerticalSpacer.qml

@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: root

interface/resources/qml/controlsUit/WebGlyphButton.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
+import "../stylesUit"
 
 Original.Button {
     id: control

interface/resources/qml/dialogs/AssetDialog.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import Qt.labs.settings 1.0
 
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "assetDialog"

interface/resources/qml/dialogs/CustomQueryDialog.qml

@@ -12,8 +12,8 @@ import QtQuick 2.7;
 import QtQuick.Dialogs 1.2 as OriginalDialogs;
 import QtQuick.Controls 2.3
 
-import "../controls-uit";
+import controlsUit 1.0
-import "../styles-uit";
+import stylesUit 1.0
 import "../windows";
 
 ModalWindow {

interface/resources/qml/dialogs/FileDialog.qml

@@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
 import QtQuick.Controls 2.3
 
 import ".."
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "fileDialog"

interface/resources/qml/dialogs/MessageDialog.qml

@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "messageDialog"

interface/resources/qml/dialogs/PreferencesDialog.qml

@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 import "preferences"
 

interface/resources/qml/dialogs/QueryDialog.qml

@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.3
 
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 ModalWindow {

interface/resources/qml/dialogs/TabletAssetDialog.qml

@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "assetDialog"

interface/resources/qml/dialogs/TabletCustomQueryDialog.qml

@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import QtQuick.Controls 2.3
 
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 TabletModalWindow {

interface/resources/qml/dialogs/TabletFileDialog.qml

@@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
 import QtQuick.Controls 2.3
 
 import ".."
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "fileDialog"

interface/resources/qml/dialogs/TabletLoginDialog.qml

@@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.5
 
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "../LoginDialog"

interface/resources/qml/dialogs/TabletMessageBox.qml

@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "messageDialog"

interface/resources/qml/dialogs/TabletQueryDialog.qml

@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import QtQuick.Controls 2.3
 
-import "../controls-uit"
+import controlsUit 1.0
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 TabletModalWindow {

interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml

@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.3
 import QtQuick.Controls 1.5 as QQC1
 
-import "../../controls-uit"
+import controlsUit 1.0
-import "../../styles-uit"
+import stylesUit 1.0
 
 import "../fileDialog"
 

interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml

@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 ComboBox {
     id: root

interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Button {
     property var dialog;

interface/resources/qml/dialogs/preferences/AvatarPreference.qml

@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 import "../../hifi/tablet/tabletWindows/preferences"
 
 Preference {

interface/resources/qml/dialogs/preferences/BrowsablePreference.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root

interface/resources/qml/dialogs/preferences/ButtonPreference.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import TabletScriptingInterface 1.0
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root

interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import TabletScriptingInterface 1.0
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root

interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml

@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
-import "../../styles-uit"
+import stylesUit 1.0
 
 Preference {
     id: root

interface/resources/qml/dialogs/preferences/EditablePreference.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root

interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml

@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root

interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml

@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
-import "../../styles-uit"
+import stylesUit 1.0
 
 Preference {
     id: root

interface/resources/qml/dialogs/preferences/Section.qml

@@ -12,8 +12,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import Hifi 1.0
 
-import "../../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
-import "../../styles-uit"
+import stylesUit 1.0
 import "."
 
 Preference {

interface/resources/qml/dialogs/preferences/SliderPreference.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root

interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml

@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root

interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml

@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root

interface/resources/qml/hifi/+android/ActionBar.qml

@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
+import stylesUit 1.0
-import "../../controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 

interface/resources/qml/hifi/+android/AudioBar.qml

@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
+import stylesUit 1.0
-import "../../controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 

interface/resources/qml/hifi/+android/AvatarOption.qml

@@ -11,7 +11,7 @@
 
 import QtQuick.Layouts 1.3
 import QtQuick 2.5
-import "../controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
 
 ColumnLayout {
     id: itemRoot

interface/resources/qml/hifi/+android/StatsBar.qml

@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
+import stylesUit 1.0
-import "../../controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 

interface/resources/qml/hifi/+android/WindowHeader.qml

@@ -16,8 +16,8 @@ import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
 import "."
 import "../styles" as HifiStyles
-import "../styles-uit"
+import stylesUit 1.0
-import "../controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
 import "../controls" as HifiControls
 import ".."
 

interface/resources/qml/hifi/+android/bottomHudOptions.qml

@@ -16,8 +16,8 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
 import "../../styles" as HifiStyles
-import "../../styles-uit"
+import stylesUit 1.0
-import "../../controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 import "."

interface/resources/qml/hifi/+android/modesbar.qml

@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
+import stylesUit 1.0
-import "../../controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 

interface/resources/qml/hifi/AssetServer.qml

@@ -14,8 +14,8 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
-import "../styles-uit"
+import stylesUit 1.0
-import "../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 import "../windows" as Windows
 import "../dialogs"