rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Update QtQuick versions to match Qt 5.10" 

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
FILES=$(find src -type f -type f \( -iname "*.cpp" -o -iname "*.h" \))
QML_FILES=$(find resources -type f -iname "*.qml")
for f in $FILES
do
clang-format -i "$f"
done;
for f in $QML_FILES
do
qmlformat -i $f
done;
git diff --exit-code

2
resources/qml/Avatar.qml
View File

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

4
resources/qml/Completer.qml
View File

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

4
resources/qml/EncryptionIndicator.qml
View File

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

2
resources/qml/ImageButton.qml
View File

@ -1,5 +1,5 @@
import "./ui"
import QtQuick 2.10
import QtQuick 2.3
import QtQuick.Controls 2.3
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 im.nheko 1.0

6
resources/qml/MessageInput.qml
View File

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

6
resources/qml/MessageView.qml
View File

@ -1,9 +1,9 @@
import "./delegates"
import QtGraphicalEffects 1.0
import QtQuick 2.10
import QtQuick 2.9
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import QtQuick.Window 2.10
import QtQuick.Layouts 1.2
import QtQuick.Window 2.2
import im.nheko 1.0
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.Layouts 1.10
import QtQuick.Layouts 1.2
BusyIndicator {
id: control

4
resources/qml/Reactions.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick 2.6
import QtQuick.Controls 2.2
import im.nheko 1.0
// 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 QtQuick 2.10
import QtQuick 2.9
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import QtQuick.Layouts 1.2
import im.nheko 1.0
Rectangle {

2
resources/qml/ScrollHelper.qml
View File

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

4
resources/qml/StatusIndicator.qml
View File

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

6
resources/qml/TimelineRow.qml
View File

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

6
resources/qml/TimelineView.qml
View File

@ -3,10 +3,10 @@ import "./device-verification"
import "./emoji"
import "./voip"
import QtGraphicalEffects 1.0
import QtQuick 2.10
import QtQuick 2.9
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import QtQuick.Window 2.10
import QtQuick.Layouts 1.3
import QtQuick.Window 2.2
import im.nheko 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.Layouts 1.10
import QtQuick.Layouts 1.2
import im.nheko 1.0
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.Layouts 1.10
import QtQuick.Layouts 1.2
import im.nheko 1.0
Item {

6
resources/qml/UserProfile.qml
View File

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

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

@ -1,5 +1,5 @@
import QtQuick 2.10
import QtQuick.Layouts 1.10
import QtQuick 2.6
import QtQuick.Layouts 1.2
import im.nheko 1.0
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
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
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
Label {

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

@ -1,7 +1,7 @@
import QtMultimedia 5.10
import QtQuick 2.10
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import QtMultimedia 5.6
import QtQuick 2.6
import QtQuick.Controls 2.1
import QtQuick.Layouts 1.2
import im.nheko 1.0
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.Layouts 1.10
import QtQuick.Window 2.10
import QtQuick.Layouts 1.2
import QtQuick.Window 2.2
import im.nheko 1.0
Item {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,7 +1,7 @@
import "../"
import QtQuick 2.10
import QtQuick 2.9
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import QtQuick.Layouts 1.2
import im.nheko 1.0
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.Layouts 1.10
import QtQuick.Layouts 1.2
import im.nheko 1.0
Popup {

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

@ -1,7 +1,7 @@
import "../"
import QtQuick 2.10
import QtQuick 2.9
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import QtQuick.Layouts 1.2
import im.nheko 1.0
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.Layouts 1.10
import QtQuick.Layouts 1.2
import im.nheko 1.0
Popup {

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

@ -1,7 +1,7 @@
import "../"
import QtQuick 2.10
import QtQuick 2.9
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import QtQuick.Layouts 1.2
import im.nheko 1.0
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
GstGLVideoItem {