Remove global menu support from Android
This pull out QtWidgets which we don't need
This commit is contained in:
@@ -238,7 +238,6 @@ ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
|
|||||||
qml/EmojiSas.qml
|
qml/EmojiSas.qml
|
||||||
qml/ConfirmDeactivateAccountDialog.qml
|
qml/ConfirmDeactivateAccountDialog.qml
|
||||||
qml/VerificationCanceled.qml
|
qml/VerificationCanceled.qml
|
||||||
qml/GlobalMenu.qml
|
|
||||||
qml/EditMenu.qml
|
qml/EditMenu.qml
|
||||||
qml/MessageDelegateContextMenu.qml
|
qml/MessageDelegateContextMenu.qml
|
||||||
qml/FileDelegateContextMenu.qml
|
qml/FileDelegateContextMenu.qml
|
||||||
@@ -307,7 +306,10 @@ add_subdirectory(login)
|
|||||||
add_subdirectory(chatbar)
|
add_subdirectory(chatbar)
|
||||||
|
|
||||||
if(NOT ANDROID AND NOT WIN32)
|
if(NOT ANDROID AND NOT WIN32)
|
||||||
qt_target_qml_sources(neochat QML_FILES qml/ShareAction.qml)
|
qt_target_qml_sources(neochat QML_FILES
|
||||||
|
qml/ShareAction.qml
|
||||||
|
qml/GlobalMenu.qml
|
||||||
|
)
|
||||||
else()
|
else()
|
||||||
set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
|
set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
|
||||||
QT_RESOURCE_ALIAS qml/ShareAction.qml
|
QT_RESOURCE_ALIAS qml/ShareAction.qml
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import org.kde.neochat.settings
|
|||||||
Labs.MenuBar {
|
Labs.MenuBar {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
required property NeoChatConnection connection
|
property NeoChatConnection connection
|
||||||
|
|
||||||
Labs.Menu {
|
Labs.Menu {
|
||||||
title: i18nc("menu", "NeoChat")
|
title: i18nc("menu", "NeoChat")
|
||||||
|
|||||||
@@ -64,8 +64,9 @@ Kirigami.ApplicationWindow {
|
|||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
active: Kirigami.Settings.hasPlatformMenuBar && !Kirigami.Settings.isMobile
|
active: Kirigami.Settings.hasPlatformMenuBar && !Kirigami.Settings.isMobile
|
||||||
sourceComponent: GlobalMenu {
|
sourceComponent: Qt.createComponent("org.kde.neochat", "GlobalMenu")
|
||||||
connection: root.connection
|
onActiveChanged: if (active) {
|
||||||
|
item.connection = root.connection;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user