Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:24:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cherry-picking

Browse source
This commit is contained in:
Alexander Ivash 2018-07-16 23:59:06 +03:00
parent 2296848fcb
commit c6764c6244
21 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/InteractiveWindow.qml
View file

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

4
interface/resources/qml/hifi/AvatarApp.qml
View file

@ -3,8 +3,8 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQml.Models 2.1 import QtQml.Models 2.1
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "../controls-uit" as HifiControls import controlsUit 1.0 as HifiControls
import "../styles-uit" import stylesUit 1.0
import "avatarapp" import "avatarapp"
Rectangle { Rectangle {

5
interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
View file

@ -1,9 +1,8 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../controls" as HifiControls
Rectangle { Rectangle {
id: root; id: root;

2
interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml
View file

@ -1,6 +1,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import "../../styles-uit" import stylesUit 1.0
ShadowRectangle { ShadowRectangle {
id: header id: header

2
interface/resources/qml/hifi/avatarapp/AvatarAppStyle.qml
View file

@ -10,7 +10,7 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import "../../styles-uit" import stylesUit 1.0
QtObject { QtObject {
readonly property QtObject colors: QtObject { readonly property QtObject colors: QtObject {

4
interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.9 import QtQuick 2.9
import "../../controls-uit" import controlsUit 1.0
import "../../styles-uit" import stylesUit 1.0
ShadowRectangle { ShadowRectangle {
property int wearablesCount: 0 property int wearablesCount: 0

4
interface/resources/qml/hifi/avatarapp/BlueButton.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
HifiControlsUit.Button { HifiControlsUit.Button {
HifiConstants { HifiConstants {

4
interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
View file

@ -1,7 +1,7 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../controls" as HifiControls import "../../controls" as HifiControls
Rectangle { Rectangle {

4
interface/resources/qml/hifi/avatarapp/InputField.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
TextField { TextField {
id: textField id: textField

4
interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml
View file

@ -1,5 +1,5 @@
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../styles-uit" import stylesUit 1.0
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2

4
interface/resources/qml/hifi/avatarapp/MessageBox.qml
View file

@ -1,7 +1,7 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../controls" as HifiControls import "../../controls" as HifiControls
Rectangle { Rectangle {

4
interface/resources/qml/hifi/avatarapp/Settings.qml
View file

@ -2,8 +2,8 @@ import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 2.2 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../controls" as HifiControls import "../../controls" as HifiControls
Rectangle { Rectangle {

2
interface/resources/qml/hifi/avatarapp/ShadowGlyph.qml
View file

@ -1,4 +1,4 @@
import "../../styles-uit" import stylesUit 1.0
import QtQuick 2.9 import QtQuick 2.9
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0

2
interface/resources/qml/hifi/avatarapp/ShadowImage.qml
View file

@ -1,4 +1,4 @@
import "../../styles-uit" import stylesUit 1.0
import QtQuick 2.9 import QtQuick 2.9
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0

2
interface/resources/qml/hifi/avatarapp/ShadowRectangle.qml
View file

@ -1,4 +1,4 @@
import "../../styles-uit" import stylesUit 1.0
import QtQuick 2.9 import QtQuick 2.9
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0

4
interface/resources/qml/hifi/avatarapp/SquareLabel.qml
View file

@ -1,5 +1,5 @@
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import QtQuick 2.9 import QtQuick 2.9
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0

4
interface/resources/qml/hifi/avatarapp/Vector3.qml
View file

@ -1,7 +1,7 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
import "../../controls" as HifiControls import "../../controls" as HifiControls
Row { Row {

4
interface/resources/qml/hifi/avatarapp/WhiteButton.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.5 import QtQuick 2.5
import "../../styles-uit" import stylesUit 1.0
import "../../controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit
HifiControlsUit.Button { HifiControlsUit.Button {
HifiConstants { HifiConstants {

5
interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
View file

@ -15,8 +15,9 @@ import QtQuick 2.10
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import "qrc:////qml//styles-uit" as HifiStylesUit import stylesUit 1.0 as HifiStylesUit
import "qrc:////qml//controls-uit" as HifiControlsUit import controlsUit 1.0 as HifiControlsUit

4
interface/resources/qml/hifi/tablet/EditEntityList.qml
View file

@ -4,8 +4,8 @@ import QtWebChannel 1.0
import "../../controls" import "../../controls"
import "../toolbars" import "../toolbars"
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "../../controls-uit" as HifiControls import controlsUit 1.0 as HifiControls
import "../../styles-uit" import stylesUit 1.0
WebView { WebView {

4
interface/resources/qml/hifi/tablet/EditToolsTabView.qml
View file

@ -4,8 +4,8 @@ import QtWebChannel 1.0
import "../../controls" import "../../controls"
import "../toolbars" import "../toolbars"
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "../../controls-uit" as HifiControls import controlsUit 1.0 as HifiControls
import "../../styles-uit" import stylesUit 1.0
TabBar { TabBar {
id: editTabView id: editTabView