summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2019-10-06 11:08:13 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2019-11-23 20:06:15 +0100
commite19645042891681231eb31554ae37a9262731118 (patch)
tree0d72e5c1a93ccd245dbd2c42bc6074087670a58d /resources
parenta1919d00d01504fa1d6ff21aa676a4276ffb8792 (diff)
Use QtQuick.Controls compatible with Qt 5.8
Diffstat (limited to 'resources')
-rw-r--r--resources/qml/EncryptionIndicator.qml2
-rw-r--r--resources/qml/StatusIndicator.qml2
-rw-r--r--resources/qml/TimelineView.qml2
-rw-r--r--resources/qml/delegates/PlayableMediaMessage.qml2
-rw-r--r--resources/qml/delegates/Redacted.qml2
-rw-r--r--resources/qml/delegates/placeholder.qml2
6 files changed, 6 insertions, 6 deletions
diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml
index 6cb5138a..0d0e86cf 100644
--- a/resources/qml/EncryptionIndicator.qml
+++ b/resources/qml/EncryptionIndicator.qml
@@ -1,5 +1,5 @@
import QtQuick 2.5
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.1
import QtGraphicalEffects 1.0
import com.github.nheko 1.0
diff --git a/resources/qml/StatusIndicator.qml b/resources/qml/StatusIndicator.qml
index 440a7e47..bc28456f 100644
--- a/resources/qml/StatusIndicator.qml
+++ b/resources/qml/StatusIndicator.qml
@@ -1,5 +1,5 @@
import QtQuick 2.5
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.1
import QtGraphicalEffects 1.0
import com.github.nheko 1.0
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index b641992d..65933124 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -1,5 +1,5 @@
import QtQuick 2.6
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.1
import QtQuick.Layouts 1.5
import QtGraphicalEffects 1.0
import QtQuick.Window 2.2
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index 7498d5b2..645ca102 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -1,6 +1,6 @@
import QtQuick 2.6
import QtQuick.Layouts 1.6
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.1
import QtMultimedia 5.6
import com.github.nheko 1.0
diff --git a/resources/qml/delegates/Redacted.qml b/resources/qml/delegates/Redacted.qml
index 53e95a83..42fb4835 100644
--- a/resources/qml/delegates/Redacted.qml
+++ b/resources/qml/delegates/Redacted.qml
@@ -1,5 +1,5 @@
import QtQuick 2.5
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.1
Label {
text: qsTr("redacted")
diff --git a/resources/qml/delegates/placeholder.qml b/resources/qml/delegates/placeholder.qml
index d17184f3..e64bc368 100644
--- a/resources/qml/delegates/placeholder.qml
+++ b/resources/qml/delegates/placeholder.qml
@@ -1,5 +1,5 @@
import QtQuick 2.5
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.1
Label {
text: qsTr("unimplemented event: ") + eventData.type