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

Remove unused QQC1 imports

Browse source
This commit is contained in:
vladest 2017-11-13 16:37:28 +01:00
parent ecf67cc331
commit 0c13c2b6e2
115 changed files with 2 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/QtWebEngine/UIDelegates/AlertDialog.qml
View file

@ -1,6 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.0
import "../../qml/dialogs" import "../../qml/dialogs"

2
interface/resources/QtWebEngine/UIDelegates/FilePicker.qml
View file

@ -1,6 +1,4 @@
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Dialogs 1.1
import QtQuick.Controls 1.4
import "../../qml/dialogs" import "../../qml/dialogs"

1
interface/resources/QtWebEngine/UIDelegates/Menu.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4 as Controls
import "../../qml/controls-uit" import "../../qml/controls-uit"
import "../../qml/styles-uit" import "../../qml/styles-uit"

2
interface/resources/QtWebEngine/UIDelegates/MenuItem.qml
View file

@ -1,6 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4 as Controls
import "../../qml/controls-uit" import "../../qml/controls-uit"
import "../../qml/styles-uit" import "../../qml/styles-uit"

2
interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml
View file

@ -1,6 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.0
import "../../qml/controls-uit" import "../../qml/controls-uit"
import "../../qml/styles-uit" import "../../qml/styles-uit"

3
interface/resources/qml/AvatarInputs.qml
View file

@ -8,9 +8,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Controls 1.3
import QtGraphicalEffects 1.0
import Qt.labs.settings 1.0
import "./hifi/audio" as HifiAudio import "./hifi/audio" as HifiAudio

1
interface/resources/qml/Browser.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.2
import QtWebChannel 1.0 import QtWebChannel 1.0
import QtWebEngine 1.2 import QtWebEngine 1.2

1
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -11,7 +11,6 @@
import Hifi 1.0 import Hifi 1.0
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 as OriginalStyles
import "../controls-uit" import "../controls-uit"
import "../styles-uit" import "../styles-uit"

1
interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
View file

@ -11,7 +11,6 @@
import Hifi 1.0 import Hifi 1.0
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 as OriginalStyles
import "../controls-uit" import "../controls-uit"
import "../styles-uit" import "../styles-uit"

1
interface/resources/qml/QmlWebWindow.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtWebEngine 1.1 import QtWebEngine 1.1
import QtWebChannel 1.0 import QtWebChannel 1.0

5
interface/resources/qml/QmlWindow.qml
View file

@ -1,9 +1,4 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.4
import QtWebChannel 1.0
import QtWebEngine 1.2
import QtWebSockets 1.0
import "windows" as Windows import "windows" as Windows
import "controls" import "controls"

1
interface/resources/qml/StatText.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2
Text { Text {
color: "white"; color: "white";

1
interface/resources/qml/Stats.qml
View file

@ -1,6 +1,5 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2
import '.' import '.'
Item { Item {

1
interface/resources/qml/TabletBrowser.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtWebChannel 1.0 import QtWebChannel 1.0
import QtWebEngine 1.5 import QtWebEngine 1.5

1
interface/resources/qml/Web3DOverlay.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "controls" as Controls import "controls" as Controls

3
interface/resources/qml/controller/AnalogButton.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
Item { Item {
id: root id: root

3
interface/resources/qml/controller/AnalogStick.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
Item { Item {
id: root id: root

3
interface/resources/qml/controller/Hydra.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
import "hydra" import "hydra"

3
interface/resources/qml/controller/Standard.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
import "xbox" import "xbox"

3
interface/resources/qml/controller/ToggleButton.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
Item { Item {
id: root id: root

3
interface/resources/qml/controller/Xbox.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
import "xbox" import "xbox"

3
interface/resources/qml/controller/hydra/HydraButtons.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
import ".." import ".."

3
interface/resources/qml/controller/hydra/HydraStick.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
import ".." import ".."

3
interface/resources/qml/controller/xbox/DPad.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
import ".." import ".."

3
interface/resources/qml/controller/xbox/LeftAnalogStick.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
import ".." import ".."

3
interface/resources/qml/controller/xbox/RightAnalogStick.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
import ".." import ".."

3
interface/resources/qml/controller/xbox/XboxButtons.qml
View file

@ -1,7 +1,4 @@
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Controls 1.0
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.0
import ".." import ".."

2
interface/resources/qml/controls-uit/HorizontalRule.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
Rectangle { Rectangle {
anchors.left: parent.left anchors.left: parent.left

1
interface/resources/qml/controls-uit/ImageMessageBox.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../styles-uit" import "../styles-uit"
Item { Item {

2
interface/resources/qml/controls-uit/QueuedButton.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4 as Original
import QtQuick.Controls.Styles 1.4
import "../styles-uit" import "../styles-uit"
import "." as HifiControls import "." as HifiControls

1
interface/resources/qml/controls-uit/TabletHeader.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../styles-uit" import "../styles-uit"

2
interface/resources/qml/controls-uit/TextAction.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import "../styles-uit" import "../styles-uit"
import "../controls-uit" as HifiControls import "../controls-uit" as HifiControls

2
interface/resources/qml/controls-uit/TextEdit.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import "../styles-uit" import "../styles-uit"
TextEdit { TextEdit {

2
interface/resources/qml/controls/FontAwesome.qml
View file

@ -1,6 +1,4 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Controls.Styles 1.3
Text { Text {
id: root id: root

1
interface/resources/qml/dialogs/AssetDialog.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../styles-uit" import "../styles-uit"

1
interface/resources/qml/dialogs/MessageDialog.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import "../controls-uit" import "../controls-uit"

1
interface/resources/qml/dialogs/PreferencesDialog.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../controls-uit" as HifiControls import "../controls-uit" as HifiControls
import "../styles-uit" import "../styles-uit"

1
interface/resources/qml/dialogs/TabletAssetDialog.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../styles-uit" import "../styles-uit"
import "../windows" import "../windows"

1
interface/resources/qml/dialogs/TabletConnectionFailureDialog.qml
View file

@ -10,7 +10,6 @@
import Hifi 1.0 import Hifi 1.0
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
Item { Item {

1
interface/resources/qml/dialogs/TabletLoginDialog.qml
View file

@ -10,7 +10,6 @@
import Hifi 1.0 import Hifi 1.0
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../controls-uit" import "../controls-uit"
import "../styles-uit" import "../styles-uit"

1
interface/resources/qml/dialogs/TabletMessageBox.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 as OriginalDialogs import QtQuick.Dialogs 1.2 as OriginalDialogs
import "../controls-uit" import "../controls-uit"

1
interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import "../../controls-uit" import "../../controls-uit"

1
interface/resources/qml/dialogs/preferences/AvatarBrowser.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtWebChannel 1.0 import QtWebChannel 1.0
import QtWebEngine 1.2 import QtWebEngine 1.2

2
interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
View file

@ -10,8 +10,6 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import "../../controls-uit" as HiFiControls import "../../controls-uit" as HiFiControls
import "../../styles-uit" import "../../styles-uit"

1
interface/resources/qml/dialogs/preferences/Preference.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
Item { Item {
id: root id: root

1
interface/resources/qml/hifi/ComboDialog.qml
View file

@ -10,7 +10,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../styles-uit" import "../styles-uit"
import "../controls-uit" import "../controls-uit"

1
interface/resources/qml/hifi/DesktopLetterboxMessage.qml
View file

@ -10,7 +10,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../styles-uit" import "../styles-uit"
Item { Item {

1
interface/resources/qml/hifi/LetterboxMessage.qml
View file

@ -10,7 +10,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../styles-uit" import "../styles-uit"
Item { Item {

2
interface/resources/qml/hifi/audio/InputPeak.qml
View file

@ -10,8 +10,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
Rectangle { Rectangle {

2
interface/resources/qml/hifi/audio/MicBar.qml
View file

@ -10,8 +10,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import TabletScriptingInterface 1.0 import TabletScriptingInterface 1.0

1
interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
View file

@ -14,7 +14,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
View file

@ -14,7 +14,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.7 import QtQuick 2.7
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
View file

@ -14,7 +14,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
View file

@ -13,7 +13,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -13,7 +13,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
View file

@ -13,7 +13,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
View file

@ -13,7 +13,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
View file

@ -13,7 +13,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
View file

@ -13,7 +13,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/wallet/Security.qml
View file

@ -14,7 +14,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
View file

@ -13,7 +13,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
View file

@ -13,7 +13,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/wallet/SendMoney.qml
View file

@ -13,7 +13,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/wallet/Wallet.qml
View file

@ -14,7 +14,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
View file

@ -14,7 +14,6 @@
import Hifi 1.0 as Hifi import Hifi 1.0 as Hifi
import QtQuick 2.5 import QtQuick 2.5
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControlsUit import "../../../controls-uit" as HifiControlsUit
import "../../../controls" as HifiControls import "../../../controls" as HifiControls

1
interface/resources/qml/hifi/dialogs/AttachmentsDialog.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../../styles-uit" import "../../styles-uit"

1
interface/resources/qml/hifi/dialogs/ModelBrowserDialog.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../windows" import "../../windows"
import "content" import "content"

1
interface/resources/qml/hifi/dialogs/TabletDCDialog.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../../styles-uit" import "../../styles-uit"

1
interface/resources/qml/hifi/dialogs/TabletEntityStatistics.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../../styles-uit" import "../../styles-uit"

2
interface/resources/qml/hifi/dialogs/TabletEntityStatisticsItem.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import Qt.labs.settings 1.0
import "../../styles-uit" import "../../styles-uit"
import "../../controls-uit" as HifiControls import "../../controls-uit" as HifiControls

2
interface/resources/qml/hifi/dialogs/TabletLODTools.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import Qt.labs.settings 1.0
import "../../styles-uit" import "../../styles-uit"
import "../../controls-uit" as HifiControls import "../../controls-uit" as HifiControls

4
interface/resources/qml/hifi/dialogs/attachments/Attachment.qml
View file

@ -1,8 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2 as OriginalDialogs
import Qt.labs.settings 1.0
import "." import "."
import ".." import ".."

1
interface/resources/qml/hifi/dialogs/attachments/Vector3.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../../styles-uit" import "../../../styles-uit"
import "../../../controls-uit" as HifiControls import "../../../controls-uit" as HifiControls

1
interface/resources/qml/hifi/overlays/ImageOverlay.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import "." import "."

1
interface/resources/qml/hifi/overlays/Overlay.qml
View file

@ -1,6 +1,5 @@
import Hifi 1.0 import Hifi 1.0
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2
Item { Item {
id: root id: root

1
interface/resources/qml/hifi/overlays/RectangleOverlay.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2
import "." import "."

1
interface/resources/qml/hifi/overlays/TextOverlay.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2
import "." import "."

5
interface/resources/qml/hifi/tablet/CalibratingScreen.qml
View file

@ -8,11 +8,8 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls.Styles 1.4
import "../../styles-uit" import "../../styles-uit"
import "../../controls" import "../../controls"
import "../../controls-uit" as HifiControls import "../../controls-uit" as HifiControls

2
interface/resources/qml/hifi/tablet/InputRecorder.qml
View file

@ -8,8 +8,6 @@
import QtQuick 2.5 import QtQuick 2.5
import Hifi 1.0 import Hifi 1.0
import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 as OriginalDialogs
import "../../styles-uit" import "../../styles-uit"
import "../../controls-uit" as HifiControls import "../../controls-uit" as HifiControls

1
interface/resources/qml/hifi/tablet/NewModelDialog.qml
View file

@ -10,7 +10,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../styles-uit" import "../../styles-uit"
import "../../controls-uit" import "../../controls-uit"

12
interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
View file

@ -7,10 +7,8 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls 1.4 as Original
import QtQuick.Controls.Styles 1.4
import "../../styles-uit" import "../../styles-uit"
import "../../controls" import "../../controls"
import "../../controls-uit" as HifiControls import "../../controls-uit" as HifiControls
@ -53,10 +51,6 @@ Rectangle {
} }
MouseArea { MouseArea {
id: mouseArea id: mouseArea
@ -593,9 +587,6 @@ Rectangle {
} }
} }
HiFiGlyphs { HiFiGlyphs {
id: glyphButton id: glyphButton
color: enabled ? hifi.buttons.textColor[calibrationButton.color] color: enabled ? hifi.buttons.textColor[calibrationButton.color]
@ -625,7 +616,6 @@ Rectangle {
} }
} }
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true

1
interface/resources/qml/hifi/tablet/TabletAttachmentsDialog.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../controls-uit" as HifiControls import "../../controls-uit" as HifiControls
import "../../styles-uit" import "../../styles-uit"

1
interface/resources/qml/hifi/tablet/TabletMenuItem.qml
View file

@ -10,7 +10,6 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import "../../controls-uit" import "../../controls-uit"
import "../../styles-uit" import "../../styles-uit"

2
interface/resources/qml/hifi/tablet/TabletMenuView.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import TabletScriptingInterface 1.0 import TabletScriptingInterface 1.0
import "../../styles-uit" import "../../styles-uit"

1
interface/resources/qml/hifi/tablet/TabletModelBrowserDialog.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import "../../controls-uit" as HifiControls import "../../controls-uit" as HifiControls
import "../../styles-uit" import "../../styles-uit"

1
interface/resources/qml/hifi/tablet/TabletRoot.qml
View file

@ -1,6 +1,5 @@
import QtQuick 2.0 import QtQuick 2.0
import Hifi 1.0 import Hifi 1.0
import QtQuick.Controls 1.4
import "../../dialogs" import "../../dialogs"
import "../../controls" import "../../controls"

4
interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
View file

@ -9,10 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0
import "." import "."
import "./preferences" import "./preferences"

1
interface/resources/qml/hifi/tablet/tabletWindows/preferences/Preference.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
Item { Item {
id: root id: root

1
interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import Hifi 1.0 import Hifi 1.0
import "../../../../dialogs/preferences" import "../../../../dialogs/preferences"

1
interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml
View file

@ -9,7 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtWebChannel 1.0 import QtWebChannel 1.0
import QtWebEngine 1.2 import QtWebEngine 1.2

1
interface/resources/qml/hifi/toolbars/StateImage.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
Item { Item {
property alias imageURL: image.source property alias imageURL: image.source

1
interface/resources/qml/hifi/toolbars/Toolbar.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "../../windows" import "../../windows"

1
interface/resources/qml/hifi/toolbars/ToolbarButton.qml
View file

@ -1,5 +1,4 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
StateImage { StateImage {
id: button id: button

2
interface/resources/qml/styles-uit/AnonymousProRegular.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
Text { Text {
id: root id: root

2
interface/resources/qml/styles-uit/ButtonLabel.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import "." import "."
RalewayBold { RalewayBold {

2
interface/resources/qml/styles-uit/FiraSansRegular.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
Text { Text {
id: root id: root

2
interface/resources/qml/styles-uit/FiraSansSemiBold.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
Text { Text {
id: root id: root

2
interface/resources/qml/styles-uit/IconButton.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import "." import "."
RalewayRegular { RalewayRegular {

2
interface/resources/qml/styles-uit/InfoItem.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import "." import "."
RalewaySemiBold { RalewaySemiBold {

2
interface/resources/qml/styles-uit/InputLabel.qml
View file

@ -9,8 +9,6 @@
// //
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import "." import "."
RalewaySemiBold { RalewaySemiBold {

Some files were not shown because too many files have changed in this diff Show more