Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qtquick #963

Merged
merged 4 commits into from
Dec 7, 2021
Merged

Qtquick #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36da83a
unify qtquick version
Dec 6, 2021
2352b2d
unify qtquick.layouts and qtquick.controls version
Dec 6, 2021
307b034
unify QtGraphicalEffects
Dec 6, 2021
cf2cd38
use last qtquick.dialog
Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/ApplicationSelectionView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12

Item {
id:item1
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/Applications.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12

ListModel {
id: appsModel
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/BatteryIndicator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12

Item {
width: icon.width
Expand Down
4 changes: 2 additions & 2 deletions aseba/launcher/src/qml/BottomEasingStackView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.6
import QtQuick.Controls 2.4
import QtQuick 2.12
import QtQuick.Controls 2.12

StackView {
id: main_layout
Expand Down
6 changes: 3 additions & 3 deletions aseba/launcher/src/qml/DeviceContextMenu.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.0
import QtQuick.Controls 2.4
import QtGraphicalEffects 1.0
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtGraphicalEffects 1.12

Item {
id: component
Expand Down
6 changes: 3 additions & 3 deletions aseba/launcher/src/qml/EditableDeviceNameInput.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import QtQuick.Controls 2.2
import QtQuick.Controls 2.12
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0
import QtQuick 2.11
import QtGraphicalEffects 1.12
import QtQuick 2.12


TextField {
Expand Down
4 changes: 2 additions & 2 deletions aseba/launcher/src/qml/FirmwareUpdateDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.2
import QtQuick.Dialogs 1.1
import QtQuick 2.12
import QtQuick.Dialogs 1.3

MessageDialog {
property string oldVersion
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/InverseMouseArea.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
License: Apache
*/

import QtQuick 2.0
import QtQuick 2.12

Item {
id : component
Expand Down
4 changes: 2 additions & 2 deletions aseba/launcher/src/qml/SettingsMenu.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick.Controls 2.3
import QtQuick.Controls 2.12

import QtQuick 2.11
import QtQuick 2.12

Rectangle {
color: "#535353"
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/Style.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pragma Singleton
import QtQuick 2.0
import QtQuick 2.12

QtObject {
property int window_margin: 30
Expand Down
4 changes: 2 additions & 2 deletions aseba/launcher/src/qml/SvgButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.11
import QtGraphicalEffects 1.0
import QtQuick 2.12
import QtGraphicalEffects 1.12

Item {
id:button
Expand Down
4 changes: 2 additions & 2 deletions aseba/launcher/src/qml/ThymioSelectionDeviceDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.0
import QtQuick.Controls 2.3
import QtQuick 2.12
import QtQuick.Controls 2.12
import org.mobsya 1.0

Item {
Expand Down
6 changes: 3 additions & 3 deletions aseba/launcher/src/qml/ThymioSelectionView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.11
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import org.mobsya 1.0

Item {
Expand Down
4 changes: 2 additions & 2 deletions aseba/launcher/src/qml/WindowButtons.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.0
import QtQuick.Controls 2.4
import QtQuick 2.12
import QtQuick.Controls 2.12

Item {
anchors.topMargin: 30
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/components/Button.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12

Rectangle {
property alias text: text1.text
Expand Down
4 changes: 2 additions & 2 deletions aseba/launcher/src/qml/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.6
import QtQuick.Controls 2.4
import QtQuick 2.12
import QtQuick.Controls 2.12
import "wirelessconfigurator"

Item {
Expand Down
4 changes: 2 additions & 2 deletions aseba/launcher/src/qml/remoteconnection/RemoteConnectionDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import QtQuick 2.3
import QtQuick 2.12
import QtQuick.Layouts 1.12
import QtQuick.Controls 2.5
import QtQuick.Controls 2.12
import QtQuick.Controls.Styles 1.4
import "../components"
import ".."
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/remoteconnection/TitleBar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12
import ".."

Rectangle {
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/webview.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12
import QtWebEngine 1.7
import QtQuick.Window 2.12
import QtQml 2.12
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/webview_native.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12
import QtWebView 1.1
import QtQuick.Window 2.12
Window {
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/wirelessconfigurator/ChannelButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12
import ".."

Rectangle {
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/wirelessconfigurator/ChannelSelector.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12

ListView {
id:view
Expand Down
4 changes: 2 additions & 2 deletions aseba/launcher/src/qml/wirelessconfigurator/NetworkIdInput.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.0
import QtQuick.Controls 2.5
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Controls.Styles 1.4
import ".."

Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/wirelessconfigurator/TitleBar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.0
import QtQuick 2.12
import ".."

Rectangle {
Expand Down
2 changes: 1 addition & 1 deletion aseba/launcher/src/qml/wirelessconfigurator/WirelessConfigurator.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QtQuick 2.10
import QtQuick 2.12
import QtQuick.Layouts 1.12
import org.mobsya 1.0
import "../components"
Expand Down
4 changes: 2 additions & 2 deletions aseba/launcher/src/qml/wirelessconfigurator/WirelessWizardWarningDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.2
import QtQuick.Dialogs 1.1
import QtQuick 2.12
import QtQuick.Dialogs 1.3

MessageDialog {
property string oldVersion
Expand Down