From kde-commits Sat Jun 11 18:40:47 2016 From: Martin Klapetek Date: Sat, 11 Jun 2016 18:40:47 +0000 To: kde-commits Subject: [spacebar] app/package/contents/ui: [app] Some leftovers Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=146567045625870 Git commit d5af32d85b8483ddc6b986fe937a98a3304c1fd1 by Martin Klapetek. Committed on 11/06/2016 at 18:40. Pushed by mklapetek into branch 'master'. [app] Some leftovers M +2 -1 app/package/contents/ui/ConversationPage.qml http://commits.kde.org/spacebar/d5af32d85b8483ddc6b986fe937a98a3304c1fd1 diff --git a/app/package/contents/ui/ConversationPage.qml b/app/package/con= tents/ui/ConversationPage.qml index c8a6e09..706bf34 100644 --- a/app/package/contents/ui/ConversationPage.qml +++ b/app/package/contents/ui/ConversationPage.qml @@ -20,7 +20,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.1 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.core 2.1 as PlasmaCore import org.kde.kirigami 1.0 as Kirigami import org.kde.plasma.extras 2.0 as PlasmaExtras // import org.kde.plasma.private.spacebar 1.0 @@ -218,6 +218,7 @@ Kirigami.Page { } = Kirigami.Label { + id: statusMessageLabel Layout.fillWidth: true Layout.maximumHeight: height text: conversation.isContactTyping ? i18nc("Contact is com= posing a message",