mirror
/
nheko
mirror of https://github.com/Nheko-Reborn/nheko
2
0
Fork 1
Code Issues Releases Wiki Activity

Revert "Update QtQuick versions to match Qt 5.10"

Browse Source 
This reverts commit 74e32dd96b.
pull/374/head
Nicolas Werner 4 years ago
parent 31881e14d9
commit 6090d00251
41 changed files with 78 additions and 84 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      .ci/format.sh
  2. 2
      resources/qml/Avatar.qml
  3. 4
      resources/qml/Completer.qml
  4. 4
      resources/qml/EncryptionIndicator.qml
  5. 2
      resources/qml/ImageButton.qml
  6. 2
      resources/qml/MatrixText.qml
  7. 6
      resources/qml/MessageInput.qml
  8. 6
      resources/qml/MessageView.qml
  9. 4
      resources/qml/NhekoBusyIndicator.qml
  10. 4
      resources/qml/Reactions.qml
  11. 4
      resources/qml/ReplyPopup.qml
  12. 2
      resources/qml/ScrollHelper.qml
  13. 4
      resources/qml/StatusIndicator.qml
  14. 6
      resources/qml/TimelineRow.qml
  15. 6
      resources/qml/TimelineView.qml
  16. 4
      resources/qml/TopBar.qml
  17. 4
      resources/qml/TypingIndicator.qml
  18. 6
      resources/qml/UserProfile.qml
  19. 4
      resources/qml/delegates/FileMessage.qml
  20. 2
      resources/qml/delegates/ImageMessage.qml
  21. 2
      resources/qml/delegates/MessageDelegate.qml
  22. 2
      resources/qml/delegates/Pill.qml
  23. 8
      resources/qml/delegates/PlayableMediaMessage.qml
  24. 6
      resources/qml/delegates/Reply.qml
  25. 4
      resources/qml/device-verification/AwaitingVerificationConfirmation.qml
  26. 2
      resources/qml/device-verification/DeviceVerification.qml
  27. 4
      resources/qml/device-verification/DigitVerification.qml
  28. 4
      resources/qml/device-verification/EmojiElement.qml
  29. 4
      resources/qml/device-verification/EmojiVerification.qml
  30. 4
      resources/qml/device-verification/Failed.qml
  31. 4
      resources/qml/device-verification/NewVerificationRequest.qml
  32. 4
      resources/qml/device-verification/Success.qml
  33. 4
      resources/qml/device-verification/Waiting.qml
  34. 2
      resources/qml/emoji/EmojiButton.qml
  35. 4
      resources/qml/emoji/EmojiPicker.qml
  36. 4
      resources/qml/voip/ActiveCallBar.qml
  37. 4
      resources/qml/voip/CallDevices.qml
  38. 4
      resources/qml/voip/CallInviteBar.qml
  39. 4
      resources/qml/voip/DeviceError.qml
  40. 4
      resources/qml/voip/PlaceCall.qml
  41. 2
      resources/qml/voip/VideoCall.qml

6
.ci/format.sh
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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 {

Write Preview
Loading…
Cancel
Save