Lower Qt requirement.

This commit is contained in:
Black Hat 2018-07-12 09:44:41 +08:00
parent 144cb8385e
commit 775a04bbc4
19 changed files with 79 additions and 63 deletions

View File

@ -25,7 +25,6 @@ int main(int argc, char *argv[]) {
// proxy.setPort(1082); // proxy.setPort(1082);
// QNetworkProxy::setApplicationProxy(proxy); // QNetworkProxy::setApplicationProxy(proxy);
qmlRegisterType<Room>();
qRegisterMetaType<Room *>("Room*"); qRegisterMetaType<Room *>("Room*");
qmlRegisterType<Controller>("Matrique", 0, 1, "Controller"); qmlRegisterType<Controller>("Matrique", 0, 1, "Controller");

View File

@ -1,8 +1,8 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "qrc:/qml/component" import "qrc:/qml/component"

View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import Matrique 0.1 import Matrique 0.1
import "qrc:/qml/form" import "qrc:/qml/form"

View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
Row { Row {
spacing: 6 spacing: 6

View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
ItemDelegate { ItemDelegate {
id: itemDelegate id: itemDelegate

View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
Item { Item {
width: parent.width width: parent.width

View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
AvatarContainer { AvatarContainer {
DownloadableContent { DownloadableContent {

View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
AvatarContainer { AvatarContainer {
Rectangle { Rectangle {

View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Item { Item {
property bool opaqueBackground: false property bool opaqueBackground: false

View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Item { Item {
property alias icon: iconText.text property alias icon: iconText.text

View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
AvatarContainer { AvatarContainer {
readonly property bool isNotice: eventType === "notice" readonly property bool isNotice: eventType === "notice"

View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Item { Item {
id: messageDelegate id: messageDelegate

View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Item { Item {
Rectangle { Rectangle {

View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Item { Item {
property var page property var page

View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Rectangle { Rectangle {
readonly property bool isEmote: eventType === "emote" readonly property bool isEmote: eventType === "emote"
@ -16,6 +16,7 @@ Rectangle {
id: stateText id: stateText
text: "<b>" + author.displayName + "</b> " + display text: "<b>" + author.displayName + "</b> " + display
color: isEmote ? "white" : "black" color: isEmote ? "white" : "black"
linkColor: isEmote ? "white" : Material.accent
anchors.fill: parent anchors.fill: parent
anchors.margins: 12 anchors.margins: 12
wrapMode: Label.Wrap wrapMode: Label.Wrap

View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
import "qrc:/qml/component" import "qrc:/qml/component"
Item { Item {

View File

@ -1,9 +1,9 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
import QtQml.Models 2.4 import QtQml.Models 2.3
import Matrique 0.1 import Matrique 0.1
import "qrc:/qml/component" import "qrc:/qml/component"

View File

@ -1,8 +1,8 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import Matrique 0.1 import Matrique 0.1
import "qrc:/qml/component" import "qrc:/qml/component"
@ -97,7 +97,9 @@ Item {
id: messageEventModel id: messageEventModel
room: currentRoom room: currentRoom
onRoomChanged: if (room.timelineSize === 0) room.getPreviousContent(50) onRoomChanged: {
if (room.timelineSize === 0) room.getPreviousContent(50)
}
} }
delegate: MessageDelegate {} delegate: MessageDelegate {}
@ -110,6 +112,20 @@ Item {
PropertyAnimation { easing.type: Easing.InOutCubic; duration: 200 } PropertyAnimation { easing.type: Easing.InOutCubic; duration: 200 }
} }
// Popup {
// id: loadingPopup
// x: item.x + (item.width - width) / 2
// y: 90
// modal: true
// focus: true
// closePolicy: Popup.CloseOnEscape
// BusyIndicator { running: true }
// }
RoundButton { RoundButton {
id: goTopFab id: goTopFab
width: height width: height

View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import Qt.labs.platform 1.0 as Platform import Qt.labs.platform 1.0 as Platform