d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Update QtQuick versions to match Qt 5.10"

Browse source 
This reverts commit 74e32dd96b.
This commit is contained in:
Nicolas Werner 2021-01-12 15:03:39 +01:00
parent 31881e14d9
commit 6090d00251
41 changed files with 78 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.ci/format.sh
View file

@ -8,16 +8,10 @@
set -eu set -eu
FILES=$(find src -type f -type f \( -iname "*.cpp" -o -iname "*.h" \)) FILES=$(find src -type f -type f \( -iname "*.cpp" -o -iname "*.h" \))
QML_FILES=$(find resources -type f -iname "*.qml")
for f in $FILES for f in $FILES
do do
clang-format -i "$f" clang-format -i "$f"
done; done;
for f in $QML_FILES
do
qmlformat -i $f
done;
git diff --exit-code git diff --exit-code

2
resources/qml/Avatar.qml
View file

@ -1,6 +1,6 @@
import "./ui" import "./ui"
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick 2.10 import QtQuick 2.6
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import im.nheko 1.0 import im.nheko 1.0

4
resources/qml/Completer.qml
View file

@ -1,7 +1,7 @@
import "./ui" import "./ui"
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Popup { Popup {

4
resources/qml/EncryptionIndicator.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.5
import QtQuick.Controls 2.3 import QtQuick.Controls 2.1
import im.nheko 1.0 import im.nheko 1.0
Rectangle { Rectangle {

2
resources/qml/ImageButton.qml
View file

@ -1,5 +1,5 @@
import "./ui" import "./ui"
import QtQuick 2.10 import QtQuick 2.3
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
AbstractButton { AbstractButton {

2
resources/qml/MatrixText.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.10 import QtQuick 2.5
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import im.nheko 1.0 import im.nheko 1.0

6
resources/qml/MessageInput.qml
View file

@ -1,8 +1,8 @@
import "./voip" import "./voip"
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import QtQuick.Window 2.10 import QtQuick.Window 2.2
import im.nheko 1.0 import im.nheko 1.0
Rectangle { Rectangle {

6
resources/qml/MessageView.qml
View file

@ -1,9 +1,9 @@
import "./delegates" import "./delegates"
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import QtQuick.Window 2.10 import QtQuick.Window 2.2
import im.nheko 1.0 import im.nheko 1.0
ListView { ListView {

4
resources/qml/NhekoBusyIndicator.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
BusyIndicator { BusyIndicator {
id: control id: control

4
resources/qml/Reactions.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.6
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import im.nheko 1.0 import im.nheko 1.0
// This class is for showing Reactions in the timeline row, not for // This class is for showing Reactions in the timeline row, not for

4
resources/qml/ReplyPopup.qml
View file

@ -1,7 +1,7 @@
import "./delegates/" import "./delegates/"
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Rectangle { Rectangle {

2
resources/qml/ScrollHelper.qml
View file

@ -28,7 +28,7 @@
* qquickwheelarea.cpp in qtquickcontrols * qquickwheelarea.cpp in qtquickcontrols
*/ */
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
MouseArea { MouseArea {

4
resources/qml/StatusIndicator.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.5
import QtQuick.Controls 2.3 import QtQuick.Controls 2.1
import im.nheko 1.0 import im.nheko 1.0
Rectangle { Rectangle {

6
resources/qml/TimelineRow.qml
View file

@ -1,9 +1,9 @@
import "./delegates" import "./delegates"
import "./emoji" import "./emoji"
import QtQuick 2.10 import QtQuick 2.6
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import QtQuick.Window 2.10 import QtQuick.Window 2.2
import im.nheko 1.0 import im.nheko 1.0
Item { Item {

6
resources/qml/TimelineView.qml
View file

@ -3,10 +3,10 @@ import "./device-verification"
import "./emoji" import "./emoji"
import "./voip" import "./voip"
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.3
import QtQuick.Window 2.10 import QtQuick.Window 2.2
import im.nheko 1.0 import im.nheko 1.0
import im.nheko.EmojiModel 1.0 import im.nheko.EmojiModel 1.0

4
resources/qml/TopBar.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Rectangle { Rectangle {

4
resources/qml/TypingIndicator.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Item { Item {

6
resources/qml/UserProfile.qml
View file

@ -1,8 +1,8 @@
import "./device-verification" import "./device-verification"
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import QtQuick.Window 2.10 import QtQuick.Window 2.3
import im.nheko 1.0 import im.nheko 1.0
ApplicationWindow { ApplicationWindow {

4
resources/qml/delegates/FileMessage.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.6
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Item { Item {

2
resources/qml/delegates/ImageMessage.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.10 import QtQuick 2.6
import im.nheko 1.0 import im.nheko 1.0
Item { Item {

2
resources/qml/delegates/MessageDelegate.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.10 import QtQuick 2.6
import im.nheko 1.0 import im.nheko 1.0
Item { Item {

2
resources/qml/delegates/Pill.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.10 import QtQuick 2.5
import QtQuick.Controls 2.1 import QtQuick.Controls 2.1
Label { Label {

8
resources/qml/delegates/PlayableMediaMessage.qml
View file

@ -1,7 +1,7 @@
import QtMultimedia 5.10 import QtMultimedia 5.6
import QtQuick 2.10 import QtQuick 2.6
import QtQuick.Controls 2.3 import QtQuick.Controls 2.1
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Rectangle { Rectangle {

6
resources/qml/delegates/Reply.qml
View file

@ -1,7 +1,7 @@
import QtQuick 2.10 import QtQuick 2.6
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import QtQuick.Window 2.10 import QtQuick.Window 2.2
import im.nheko 1.0 import im.nheko 1.0
Item { Item {

4
resources/qml/device-verification/AwaitingVerificationConfirmation.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.3
import QtQuick.Controls 2.3 import QtQuick.Controls 2.10
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.10
import im.nheko 1.0 import im.nheko 1.0

2
resources/qml/device-verification/DeviceVerification.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 2.3 import QtQuick.Controls 2.10
import QtQuick.Window 2.10 import QtQuick.Window 2.10
import im.nheko 1.0 import im.nheko 1.0

4
resources/qml/device-verification/DigitVerification.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.3
import QtQuick.Controls 2.3 import QtQuick.Controls 2.10
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.10
import im.nheko 1.0 import im.nheko 1.0

4
resources/qml/device-verification/EmojiElement.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.3
import QtQuick.Controls 2.3 import QtQuick.Controls 2.10
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.10
Rectangle { Rectangle {

4
resources/qml/device-verification/EmojiVerification.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.3
import QtQuick.Controls 2.3 import QtQuick.Controls 2.10
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.10
import im.nheko 1.0 import im.nheko 1.0

4
resources/qml/device-verification/Failed.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.3
import QtQuick.Controls 2.3 import QtQuick.Controls 2.10
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.10
import im.nheko 1.0 import im.nheko 1.0

4
resources/qml/device-verification/NewVerificationRequest.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.3
import QtQuick.Controls 2.3 import QtQuick.Controls 2.10
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.10
import im.nheko 1.0 import im.nheko 1.0

4
resources/qml/device-verification/Success.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.3
import QtQuick.Controls 2.3 import QtQuick.Controls 2.10
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.10
Pane { Pane {

4
resources/qml/device-verification/Waiting.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.10 import QtQuick 2.3
import QtQuick.Controls 2.3 import QtQuick.Controls 2.10
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.10
import im.nheko 1.0 import im.nheko 1.0

2
resources/qml/emoji/EmojiButton.qml
View file

@ -1,6 +1,6 @@
import "../" import "../"
import QtQuick 2.10 import QtQuick 2.10
import QtQuick.Controls 2.3 import QtQuick.Controls 2.1
import im.nheko 1.0 import im.nheko 1.0
import im.nheko.EmojiModel 1.0 import im.nheko.EmojiModel 1.0

4
resources/qml/emoji/EmojiPicker.qml
View file

@ -1,8 +1,8 @@
import "../" import "../"
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.3
import im.nheko 1.0 import im.nheko 1.0
import im.nheko.EmojiModel 1.0 import im.nheko.EmojiModel 1.0

4
resources/qml/voip/ActiveCallBar.qml
View file

@ -1,7 +1,7 @@
import "../" import "../"
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Rectangle { Rectangle {

4
resources/qml/voip/CallDevices.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Popup { Popup {

4
resources/qml/voip/CallInviteBar.qml
View file

@ -1,7 +1,7 @@
import "../" import "../"
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Rectangle { Rectangle {

4
resources/qml/voip/DeviceError.qml
View file

@ -1,6 +1,6 @@
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Popup { Popup {

4
resources/qml/voip/PlaceCall.qml
View file

@ -1,7 +1,7 @@
import "../" import "../"
import QtQuick 2.10 import QtQuick 2.9
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10 import QtQuick.Layouts 1.2
import im.nheko 1.0 import im.nheko 1.0
Popup { Popup {

2
resources/qml/voip/VideoCall.qml
View file

@ -1,4 +1,4 @@
import QtQuick 2.10 import QtQuick 2.9
import org.freedesktop.gstreamer.GLVideoItem 1.0 import org.freedesktop.gstreamer.GLVideoItem 1.0
GstGLVideoItem { GstGLVideoItem {