Merge branch 'qt_migration' into qmake-to-cmake-migration

This commit is contained in:
pokamest 2022-12-16 04:45:43 -08:00
commit 77124e098c
4 changed files with 4 additions and 4 deletions

1
.gitignore vendored
View file

@ -23,6 +23,7 @@ qrc_*.cpp
ui_*.h
Makefile*
*build-*
compile_commands.json
# fastlane
client/fastlane/report.xml

View file

@ -11,8 +11,6 @@ Drawer {
signal containerSelected(int c_index)
property int selectedIndex: -1
z: -3
y: 0
x: 0
edge: Qt.RightEdge
@ -117,6 +115,7 @@ Drawer {
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
tb.currentIndex = index
tb_other.currentIndex = -1
@ -181,6 +180,7 @@ Drawer {
MouseArea {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
tb_other.currentIndex = index
tb.currentIndex = -1

View file

@ -45,7 +45,7 @@ PageBase {
pageLoader.focus = true
}
onContainerSelected: {
onContainerSelected: function(c_index) {
var containerProto = ContainerProps.defaultProtocol(c_index)

View file

@ -285,7 +285,6 @@ Window {
Drawer {
id: drawer_log
z: -3
y: 0
x: 0
edge: Qt.BottomEdge