diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,13 @@ PURPOSE "Required for Find My Device plugin" ) +set_package_properties(KF5Kirigami2 PROPERTIES + DESCRIPTION "QtQuick plugins to build user interfaces based on KDE UX guidelines" + PURPOSE "Required for KDE Connect's QML-based GUI applications" + URL "https://www.kde.org/products/kirigami/" + TYPE RUNTIME +) + include_directories(${CMAKE_SOURCE_DIR}) configure_file(kdeconnect-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/kdeconnect-version.h) @@ -86,12 +93,6 @@ option(EXPERIMENTALAPP_ENABLED OFF) if(EXPERIMENTALAPP_ENABLED) find_package(KF5Kirigami2) - set_package_properties(KF5Kirigami2 PROPERTIES - DESCRIPTION "QtQuick plugins to build user interfaces based on KDE UX guidelines" - PURPOSE "Required for kcapp" - URL "https://www.kde.org/products/kirigami/" - TYPE RUNTIME -) add_subdirectory(app) endif() add_subdirectory(plugins) @@ -108,6 +109,7 @@ option(SMSAPP_ENABLED OFF) if(SMSAPP_ENABLED) + find_package(KF5Kirigami2) find_package(KF5People REQUIRED) find_package(KF5PeopleVCard) set_package_properties(KF5PeopleVCard PROPERTIES diff --git a/smsapp/conversationlistmodel.cpp b/smsapp/conversationlistmodel.cpp --- a/smsapp/conversationlistmodel.cpp +++ b/smsapp/conversationlistmodel.cpp @@ -31,7 +31,7 @@ : QStandardItemModel(parent) , m_conversationsInterface(nullptr) { - qCDebug(KDECONNECT_SMS_CONVERSATIONS_LIST_MODEL) << "Constructing" << this; + //qCDebug(KDECONNECT_SMS_CONVERSATIONS_LIST_MODEL) << "Constructing" << this; auto roles = roleNames(); roles.insert(FromMeRole, "fromMe"); roles.insert(AddressRole, "address"); @@ -187,7 +187,7 @@ bool matchingPhoneNumber = longerNumber.endsWith(shorterNumber) && shorterNumber.length() * 2 >= longerNumber.length(); if (address == email || matchingPhoneNumber) { - qCDebug(KDECONNECT_SMS_CONVERSATIONS_LIST_MODEL) << "Matched" << address << "to" << person->name(); + //qCDebug(KDECONNECT_SMS_CONVERSATIONS_LIST_MODEL) << "Matched" << address << "to" << person->name(); return person; } diff --git a/smsapp/qml/ConversationDisplay.qml b/smsapp/qml/ConversationDisplay.qml --- a/smsapp/qml/ConversationDisplay.qml +++ b/smsapp/qml/ConversationDisplay.qml @@ -19,7 +19,7 @@ */ import QtQuick 2.1 -import QtQuick.Controls 2.4 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.1 import org.kde.people 1.0 import org.kde.kirigami 2.4 as Kirigami @@ -52,7 +52,6 @@ } function sendMessage() { - console.log("sending sms", page.phoneNumber) model.sourceModel.sendReplyToConversation(message.text) message.text = "" }