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

Try to be compatible with Qt 5.12

Browse source
This commit is contained in:
Nicolas Werner 2021-06-13 01:48:11 +02:00
parent e6878ee298
commit 8803908321
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
10 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -137,7 +137,7 @@ endif()
# #
# Discover Qt dependencies. # 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(Qt5QuickCompiler)
find_package(Qt5DBus) find_package(Qt5DBus)

2
resources/qml/ChatPage.qml
View file

@ -3,7 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.13 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "components" import "components"
import im.nheko 1.0 import im.nheko 1.0

6
resources/qml/CommunitiesList.qml
View file

@ -4,9 +4,9 @@
import "./dialogs" import "./dialogs"
import Qt.labs.platform 1.1 as Platform import Qt.labs.platform 1.1 as Platform
import QtQml 2.13 import QtQml 2.12
import QtQuick 2.13 import QtQuick 2.12
import QtQuick.Controls 2.13 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import im.nheko 1.0 import im.nheko 1.0

2
resources/qml/ElidedLabel.qml
View file

@ -3,7 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.13 import QtQuick.Controls 2.5
import im.nheko 1.0 import im.nheko 1.0
Label { Label {

6
resources/qml/RoomList.qml
View file

@ -4,9 +4,9 @@
import "./dialogs" import "./dialogs"
import Qt.labs.platform 1.1 as Platform import Qt.labs.platform 1.1 as Platform
import QtQml 2.13 import QtQml 2.12
import QtQuick 2.13 import QtQuick 2.12
import QtQuick.Controls 2.13 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import im.nheko 1.0 import im.nheko 1.0

2
resources/qml/Root.qml
View file

@ -9,7 +9,7 @@ import "./voip"
import Qt.labs.platform 1.1 as Platform import Qt.labs.platform 1.1 as Platform
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.13 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import im.nheko 1.0 import im.nheko 1.0

2
resources/qml/TimelineView.qml
View file

@ -9,7 +9,7 @@ import "./voip"
import Qt.labs.platform 1.1 as Platform import Qt.labs.platform 1.1 as Platform
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.13 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import im.nheko 1.0 import im.nheko 1.0

18
resources/qml/components/AdaptiveLayout.qml
View file

@ -2,8 +2,8 @@
// //
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.15 import QtQuick 2.12
import QtQuick.Controls 2.15 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import im.nheko 1.0 import im.nheko 1.0
@ -87,6 +87,13 @@ Container {
x: parent.preferredWidth x: parent.preferredWidth
z: 3 z: 3
CursorShape {
height: parent.height
width: container.splitterGrabMargin * 2
x: -container.splitterGrabMargin
cursorShape: Qt.SizeHorCursor
}
DragHandler { DragHandler {
id: dragHandler id: dragHandler
@ -96,9 +103,9 @@ Container {
xAxis.minimum: splitter.minimumWidth - 1 xAxis.minimum: splitter.minimumWidth - 1
xAxis.maximum: splitter.maximumWidth xAxis.maximum: splitter.maximumWidth
margin: container.splitterGrabMargin margin: container.splitterGrabMargin
dragThreshold: 0 //dragThreshold: 0
grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.ApprovesTakeOverByHandlersOfSameType grabPermissions: PointerHandler.CanTakeOverFromAnything | PointerHandler.ApprovesTakeOverByHandlersOfSameType
cursorShape: Qt.SizeHorCursor //cursorShape: Qt.SizeHorCursor
onActiveChanged: { onActiveChanged: {
if (!active) if (!active)
splitter.parent.preferredWidth = splitter.x; splitter.parent.preferredWidth = splitter.x;
@ -107,9 +114,10 @@ Container {
} }
HoverHandler { HoverHandler {
//cursorShape: Qt.SizeHorCursor
enabled: !container.singlePageMode enabled: !container.singlePageMode
margin: container.splitterGrabMargin margin: container.splitterGrabMargin
cursorShape: Qt.SizeHorCursor
} }
} }

4
resources/qml/components/AdaptiveLayoutElement.qml
View file

@ -2,8 +2,8 @@
// //
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.15 import QtQuick 2.12
import QtQuick.Controls 2.15 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
Item { Item {

4
resources/qml/dialogs/InputDialog.qml
View file

@ -3,8 +3,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import ".." import ".."
import QtQuick 2.13 import QtQuick 2.12
import QtQuick.Controls 2.13 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import im.nheko 1.0 import im.nheko 1.0