diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d9d793c..5e4b0f3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,7 +137,7 @@ endif()
#
# Discover Qt dependencies.
#
-find_package(Qt5 COMPONENTS Core Widgets LinguistTools Concurrent Svg Multimedia Qml QuickControls2 QuickWidgets REQUIRED)
+find_package(Qt5 5.12 COMPONENTS Core Widgets LinguistTools Concurrent Svg Multimedia Qml QuickControls2 QuickWidgets REQUIRED)
find_package(Qt5QuickCompiler)
find_package(Qt5DBus)
diff --git a/resources/qml/ChatPage.qml b/resources/qml/ChatPage.qml
index 1e03ef11..7a428019 100644
--- a/resources/qml/ChatPage.qml
+++ b/resources/qml/ChatPage.qml
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.9
-import QtQuick.Controls 2.13
+import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3
import "components"
import im.nheko 1.0
diff --git a/resources/qml/CommunitiesList.qml b/resources/qml/CommunitiesList.qml
index 6aab949c..491913be 100644
--- a/resources/qml/CommunitiesList.qml
+++ b/resources/qml/CommunitiesList.qml
@@ -4,9 +4,9 @@
import "./dialogs"
import Qt.labs.platform 1.1 as Platform
-import QtQml 2.13
-import QtQuick 2.13
-import QtQuick.Controls 2.13
+import QtQml 2.12
+import QtQuick 2.12
+import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3
import im.nheko 1.0
diff --git a/resources/qml/ElidedLabel.qml b/resources/qml/ElidedLabel.qml
index 1f4aeeea..bc90e479 100644
--- a/resources/qml/ElidedLabel.qml
+++ b/resources/qml/ElidedLabel.qml
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.9
-import QtQuick.Controls 2.13
+import QtQuick.Controls 2.5
import im.nheko 1.0
Label {
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index f31fce60..92073a37 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -4,9 +4,9 @@
import "./dialogs"
import Qt.labs.platform 1.1 as Platform
-import QtQml 2.13
-import QtQuick 2.13
-import QtQuick.Controls 2.13
+import QtQml 2.12
+import QtQuick 2.12
+import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3
import im.nheko 1.0
diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml
index 078281d4..5316e20d 100644
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@@ -9,7 +9,7 @@ import "./voip"
import Qt.labs.platform 1.1 as Platform
import QtGraphicalEffects 1.0
import QtQuick 2.9
-import QtQuick.Controls 2.13
+import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3
import QtQuick.Window 2.2
import im.nheko 1.0
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 095103fa..90e28166 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -9,7 +9,7 @@ import "./voip"
import Qt.labs.platform 1.1 as Platform
import QtGraphicalEffects 1.0
import QtQuick 2.9
-import QtQuick.Controls 2.13
+import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3
import QtQuick.Window 2.2
import im.nheko 1.0
diff --git a/resources/qml/components/AdaptiveLayout.qml b/resources/qml/components/AdaptiveLayout.qml
index eea85e38..1d44ba90 100644
--- a/resources/qml/components/AdaptiveLayout.qml
+++ b/resources/qml/components/AdaptiveLayout.qml
@@ -2,8 +2,8 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
-import QtQuick 2.15
-import QtQuick.Controls 2.15
+import QtQuick 2.12
+import QtQuick.Controls 2.5
import QtQuick.Layouts 1.15
import im.nheko 1.0
@@ -87,6 +87,13 @@ Container {
x: parent.preferredWidth
z: 3
+ CursorShape {
+ height: parent.height
+ width: container.splitterGrabMargin * 2
+ x: -container.splitterGrabMargin
+ cursorShape: Qt.SizeHorCursor
+ }
+
DragHandler {
id: dragHandler
@@ -96,9 +103,9 @@ Container {
xAxis.minimum: splitter.minimumWidth - 1
xAxis.maximum: splitter.maximumWidth
margin: container.splitterGrabMargin
- dragThreshold: 0
+ //dragThreshold: 0
grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.ApprovesTakeOverByHandlersOfSameType
- cursorShape: Qt.SizeHorCursor
+ //cursorShape: Qt.SizeHorCursor
onActiveChanged: {
if (!active)
splitter.parent.preferredWidth = splitter.x;
@@ -107,9 +114,10 @@ Container {
}
HoverHandler {
+ //cursorShape: Qt.SizeHorCursor
+
enabled: !container.singlePageMode
margin: container.splitterGrabMargin
- cursorShape: Qt.SizeHorCursor
}
}
diff --git a/resources/qml/components/AdaptiveLayoutElement.qml b/resources/qml/components/AdaptiveLayoutElement.qml
index 411f6c64..3922e27d 100644
--- a/resources/qml/components/AdaptiveLayoutElement.qml
+++ b/resources/qml/components/AdaptiveLayoutElement.qml
@@ -2,8 +2,8 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
-import QtQuick 2.15
-import QtQuick.Controls 2.15
+import QtQuick 2.12
+import QtQuick.Controls 2.5
import QtQuick.Layouts 1.15
Item {
diff --git a/resources/qml/dialogs/InputDialog.qml b/resources/qml/dialogs/InputDialog.qml
index 0cd6be1c..134b78a3 100644
--- a/resources/qml/dialogs/InputDialog.qml
+++ b/resources/qml/dialogs/InputDialog.qml
@@ -3,8 +3,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
import ".."
-import QtQuick 2.13
-import QtQuick.Controls 2.13
+import QtQuick 2.12
+import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3
import im.nheko 1.0
|
